From 84f1169ed5c4368207692fbc37593f3d8ae37129 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 19 Mar 2025 20:53:22 +0800
Subject: [PATCH 1/7] =?UTF-8?q?add(dms):=20=E7=94=9F=E6=88=90=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E5=92=8C=E6=8A=A5=E8=AD=A6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加报警信息和报警详情的 API 接口
- 实现报警信息和报警详情的列表、新增、修改、删除等功能
---
 src/api/dms/baseAlarmDetail/index.ts    |  77 ++++
 src/api/dms/baseAlarmDetail/types.ts    | 152 ++++++++
 src/api/dms/baseAlarmInfo/index.ts      |  77 ++++
 src/api/dms/baseAlarmInfo/types.ts      | 235 +++++++++++
 src/views/dms/baseAlarmDetail/index.vue | 328 ++++++++++++++++
 src/views/dms/baseAlarmInfo/index.vue   | 492 ++++++++++++++++++++++++
 6 files changed, 1361 insertions(+)
 create mode 100644 src/api/dms/baseAlarmDetail/index.ts
 create mode 100644 src/api/dms/baseAlarmDetail/types.ts
 create mode 100644 src/api/dms/baseAlarmInfo/index.ts
 create mode 100644 src/api/dms/baseAlarmInfo/types.ts
 create mode 100644 src/views/dms/baseAlarmDetail/index.vue
 create mode 100644 src/views/dms/baseAlarmInfo/index.vue

diff --git a/src/api/dms/baseAlarmDetail/index.ts b/src/api/dms/baseAlarmDetail/index.ts
new file mode 100644
index 0000000..05af723
--- /dev/null
+++ b/src/api/dms/baseAlarmDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseAlarmDetailVO, BaseAlarmDetailForm, BaseAlarmDetailQuery } from '@/api/dms/baseAlarmDetail/types';
+
+/**
+ * 查询报警详情信息;列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseAlarmDetail = (query?: BaseAlarmDetailQuery): AxiosPromise<BaseAlarmDetailVO[]> => {
+  return request({
+    url: '/dms/baseAlarmDetail/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报警详情信息;详细
+ * @param alarmDetailId
+ */
+export const getBaseAlarmDetail = (alarmDetailId: string | number): AxiosPromise<BaseAlarmDetailVO> => {
+  return request({
+    url: '/dms/baseAlarmDetail/' + alarmDetailId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报警详情信息;
+ * @param data
+ */
+export const addBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
+  return request({
+    url: '/dms/baseAlarmDetail',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报警详情信息;
+ * @param data
+ */
+export const updateBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
+  return request({
+    url: '/dms/baseAlarmDetail',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报警详情信息;
+ * @param alarmDetailId
+ */
+export const delBaseAlarmDetail = (alarmDetailId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/baseAlarmDetail/' + alarmDetailId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询报警详情信息;列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseAlarmDetailList (query) {
+    return request({
+        url: '/dms/baseAlarmDetail/getBaseAlarmDetailList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/baseAlarmDetail/types.ts b/src/api/dms/baseAlarmDetail/types.ts
new file mode 100644
index 0000000..8622600
--- /dev/null
+++ b/src/api/dms/baseAlarmDetail/types.ts
@@ -0,0 +1,152 @@
+export interface BaseAlarmDetailVO {
+  /**
+   * 报警详细信息ID
+   */
+  alarmDetailId: string | number;
+
+  /**
+   * 关联hw_alarm_info的alarm_info_id
+   */
+  alarmInfoId: string | number;
+
+  /**
+   * 设备模型功能ID
+   */
+  modeFunctionId: string | number;
+
+  /**
+   * 功能名称
+   */
+  functionName: string;
+
+  /**
+   * 标识符
+   */
+  functionIdentifier: string | number;
+
+  /**
+   * 值
+   */
+  functionValue: string;
+
+  /**
+   * 监测时间
+   */
+  monitorTime: string;
+
+  /**
+   * 报警内容
+   */
+  alarmContent: string;
+
+  /**
+   * 设备模型功能
+   */
+  modeFunctionName: string;
+
+}
+
+export interface BaseAlarmDetailForm extends BaseEntity {
+  /**
+   * 报警详细信息ID
+   */
+  alarmDetailId?: string | number;
+
+  /**
+   * 关联hw_alarm_info的alarm_info_id
+   */
+  alarmInfoId?: string | number;
+
+  /**
+   * 设备模型功能ID
+   */
+  modeFunctionId?: string | number;
+
+  /**
+   * 功能名称
+   */
+  functionName?: string;
+
+  /**
+   * 标识符
+   */
+  functionIdentifier?: string | number;
+
+  /**
+   * 值
+   */
+  functionValue?: string;
+
+  /**
+   * 监测时间
+   */
+  monitorTime?: string;
+
+  /**
+   * 报警内容
+   */
+  alarmContent?: string;
+
+  /**
+   * 设备模型功能
+   */
+  modeFunctionName?: string;
+
+}
+
+export interface BaseAlarmDetailQuery extends PageQuery {
+
+  /**
+   * 报警详细信息ID
+   */
+  alarmDetailId?: string | number;
+
+  /**
+   * 关联hw_alarm_info的alarm_info_id
+   */
+  alarmInfoId?: string | number;
+
+  /**
+   * 设备模型功能ID
+   */
+  modeFunctionId?: string | number;
+
+  /**
+   * 功能名称
+   */
+  functionName?: string;
+
+  /**
+   * 标识符
+   */
+  functionIdentifier?: string | number;
+
+  /**
+   * 值
+   */
+  functionValue?: string;
+
+  /**
+   * 监测时间
+   */
+  monitorTime?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+
+  /**
+   * 报警内容
+   */
+  alarmContent?: string;
+
+  /**
+   * 设备模型功能
+   */
+  modeFunctionName?: string;
+}
+
+
+
diff --git a/src/api/dms/baseAlarmInfo/index.ts b/src/api/dms/baseAlarmInfo/index.ts
new file mode 100644
index 0000000..a07ff2a
--- /dev/null
+++ b/src/api/dms/baseAlarmInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseAlarmInfoVO, BaseAlarmInfoForm, BaseAlarmInfoQuery } from '@/api/dms/baseAlarmInfo/types';
+
+/**
+ * 查询报警信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseAlarmInfo = (query?: BaseAlarmInfoQuery): AxiosPromise<BaseAlarmInfoVO[]> => {
+  return request({
+    url: '/dms/baseAlarmInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报警信息详细
+ * @param alarmInfoId
+ */
+export const getBaseAlarmInfo = (alarmInfoId: string | number): AxiosPromise<BaseAlarmInfoVO> => {
+  return request({
+    url: '/dms/baseAlarmInfo/' + alarmInfoId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报警信息
+ * @param data
+ */
+export const addBaseAlarmInfo = (data: BaseAlarmInfoForm) => {
+  return request({
+    url: '/dms/baseAlarmInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报警信息
+ * @param data
+ */
+export const updateBaseAlarmInfo = (data: BaseAlarmInfoForm) => {
+  return request({
+    url: '/dms/baseAlarmInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报警信息
+ * @param alarmInfoId
+ */
+export const delBaseAlarmInfo = (alarmInfoId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/baseAlarmInfo/' + alarmInfoId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询报警信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseAlarmInfoList (query) {
+    return request({
+        url: '/dms/baseAlarmInfo/getBaseAlarmInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/baseAlarmInfo/types.ts b/src/api/dms/baseAlarmInfo/types.ts
new file mode 100644
index 0000000..f099d41
--- /dev/null
+++ b/src/api/dms/baseAlarmInfo/types.ts
@@ -0,0 +1,235 @@
+export interface BaseAlarmInfoVO {
+  /**
+   * 报警信息ID
+   */
+  alarmInfoId: string | number;
+
+  /**
+   * 报警信息类型（1、设备报警，3、离线报警）
+   */
+  alarmInfoType: string;
+
+  /**
+   * 报警信息类型是1关联表alarm_rule的字段alarm_rule_id；报警信息类型是3关联表hw_offline_rule的字段offline_rule_id；
+   */
+  alarmReleatedId: string | number;
+
+  /**
+   * 报警设备ID，关联hw_device表的device_id字段
+   */
+  deviceId: string | number;
+
+  /**
+   * 报警内容
+   */
+  alarmContent: string;
+
+  /**
+   * 报警级别，关联hw_alarm_level的字段alarm_level_id，报警信息类型为1、2和3时保存
+   */
+  alarmLevelId: string | number;
+
+  /**
+   * 报警类型，关联hw_alarm_type的字段alarm_type_id，报警信息类型为1和2时保存
+   */
+  alarmTypeId: string | number;
+
+  /**
+   * 报警方式（1云端处理，2终端上报）
+   */
+  alarmMode: string;
+
+  /**
+   * 报警状态（0、未处理（报警中）） 1、已处理 2已恢复）
+   */
+  alarmStatus: string;
+
+  /**
+   * 实际报警开始时间
+   */
+  alarmBeginTime: string;
+
+  /**
+   * 实际报警结束时间
+   */
+  alarmEndTime: string;
+
+  /**
+   * 人工处理时间
+   */
+  handleTime: string;
+
+  /**
+   * 报警类型名称
+   */
+  alarmTypeName: string;//join映射字段
+
+  /**
+   * 报警级别名称
+   */
+   alarmLevelName: string;//join映射字段
+
+
+   releateadContent: string;//join映射字段,预留字段
+
+}
+
+export interface BaseAlarmInfoForm extends BaseEntity {
+  /**
+   * 报警信息ID
+   */
+  alarmInfoId?: string | number;
+
+  /**
+   * 报警信息类型（1、设备报警，3、离线报警）
+   */
+  alarmInfoType?: string;
+
+  /**
+   * 报警信息类型是1关联表alarm_rule的字段alarm_rule_id；报警信息类型是3关联表hw_offline_rule的字段offline_rule_id；
+   */
+  alarmReleatedId?: string | number;
+
+  /**
+   * 报警设备ID，关联hw_device表的device_id字段
+   */
+  deviceId?: string | number;
+
+  /**
+   * 报警内容
+   */
+  alarmContent?: string;
+
+  /**
+   * 报警级别，关联hw_alarm_level的字段alarm_level_id，报警信息类型为1、2和3时保存
+   */
+  alarmLevelId?: string | number;
+
+  /**
+   * 报警类型，关联hw_alarm_type的字段alarm_type_id，报警信息类型为1和2时保存
+   */
+  alarmTypeId?: string | number;
+
+  /**
+   * 报警方式（1云端处理，2终端上报）
+   */
+  alarmMode?: string;
+
+  /**
+   * 报警状态（0、未处理（报警中）） 1、已处理 2已恢复）
+   */
+  alarmStatus?: string;
+
+  /**
+   * 实际报警开始时间
+   */
+  alarmBeginTime?: string;
+
+  /**
+   * 实际报警结束时间
+   */
+  alarmEndTime?: string;
+
+  /**
+   * 人工处理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 报警类型名称
+   */
+  alarmTypeName?: string;//join映射字段
+
+  /**
+   * 报警级别名称
+   */
+  alarmLevelName?: string;//join映射字段
+
+
+  releateadContent?: string;//join映射字段,预留字段
+
+}
+
+export interface BaseAlarmInfoQuery extends PageQuery {
+
+  /**
+   * 报警信息ID
+   */
+  alarmInfoId?: string | number;
+
+  /**
+   * 报警信息类型（1、设备报警，3、离线报警）
+   */
+  alarmInfoType?: string;
+
+  /**
+   * 报警信息类型是1关联表alarm_rule的字段alarm_rule_id；报警信息类型是3关联表hw_offline_rule的字段offline_rule_id；
+   */
+  alarmReleatedId?: string | number;
+
+  /**
+   * 报警设备ID，关联hw_device表的device_id字段
+   */
+  deviceId?: string | number;
+
+  /**
+   * 报警内容
+   */
+  alarmContent?: string;
+
+  /**
+   * 报警级别，关联hw_alarm_level的字段alarm_level_id，报警信息类型为1、2和3时保存
+   */
+  alarmLevelId?: string | number;
+
+  /**
+   * 报警类型，关联hw_alarm_type的字段alarm_type_id，报警信息类型为1和2时保存
+   */
+  alarmTypeId?: string | number;
+
+  /**
+   * 报警方式（1云端处理，2终端上报）
+   */
+  alarmMode?: string;
+
+  /**
+   * 报警状态（0、未处理（报警中）） 1、已处理 2已恢复）
+   */
+  alarmStatus?: string;
+
+  /**
+   * 实际报警开始时间
+   */
+  alarmBeginTime?: string;
+
+  /**
+   * 实际报警结束时间
+   */
+  alarmEndTime?: string;
+
+  /**
+   * 人工处理时间
+   */
+  handleTime?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 报警类型名称
+   */
+  alarmTypeName?: string;//join映射字段
+
+  /**
+   * 报警级别名称
+   */
+  alarmLevelName?: string;//join映射字段
+
+
+  releateadContent?: string;//join映射字段,预留字段
+}
+
+
+
diff --git a/src/views/dms/baseAlarmDetail/index.vue b/src/views/dms/baseAlarmDetail/index.vue
new file mode 100644
index 0000000..b4844a0
--- /dev/null
+++ b/src/views/dms/baseAlarmDetail/index.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="报警详细信息ID" prop="alarmDetailId">
+              <el-input v-model="queryParams.alarmDetailId" placeholder="请输入报警详细信息ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联hw_alarm_info的alarm_info_id" prop="alarmInfoId">
+              <el-input v-model="queryParams.alarmInfoId" placeholder="请输入关联hw_alarm_info的alarm_info_id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备模型功能ID" prop="modeFunctionId">
+              <el-input v-model="queryParams.modeFunctionId" placeholder="请输入设备模型功能ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="功能名称" prop="functionName">
+              <el-input v-model="queryParams.functionName" placeholder="请输入功能名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="标识符" prop="functionIdentifier">
+              <el-input v-model="queryParams.functionIdentifier" placeholder="请输入标识符" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="值" prop="functionValue">
+              <el-input v-model="queryParams.functionValue" placeholder="请输入值" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="监测时间" prop="monitorTime">
+              <el-date-picker clearable
+                v-model="queryParams.monitorTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择监测时间"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:baseAlarmDetail:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:baseAlarmDetail:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:baseAlarmDetail:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:baseAlarmDetail:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseAlarmDetailList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="报警详细信息" align="center" prop="alarmDetailId" v-if="columns[0].visible"/>
+        <el-table-column label="报警信息" align="center" prop="alarmContent" v-if="columns[1].visible"/>
+        <el-table-column label="设备模型功能" align="center" prop="modeFunctionName" v-if="columns[2].visible"/>
+        <el-table-column label="功能名称" align="center" prop="functionName" v-if="columns[3].visible"/>
+        <el-table-column label="标识符" align="center" prop="functionIdentifier" v-if="columns[4].visible"/>
+        <el-table-column label="值" align="center" prop="functionValue" v-if="columns[5].visible"/>
+        <el-table-column label="监测时间" align="center" prop="monitorTime" width="180" v-if="columns[6].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.monitorTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:baseAlarmDetail:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:baseAlarmDetail:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改报警详情信息;对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseAlarmDetailFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="报警详细信息ID" prop="alarmDetailId">
+          <el-input v-model="form.alarmDetailId" placeholder="请输入报警详细信息ID" />
+        </el-form-item>-->
+<!--        <el-form-item label="关联hw_alarm_info的alarm_info_id" prop="alarmInfoId">
+          <el-input v-model="form.alarmInfoId" placeholder="请输入关联hw_alarm_info的alarm_info_id" />
+        </el-form-item>-->
+        <el-form-item label="设备模型功能" prop="modeFunctionId">
+<!--          <el-input v-model="form.modeFunctionId" placeholder="请输入设备模型功能" />-->
+          <el-select v-model="form.modeFunctionId" placeholder="请选择设备模型功能">
+            <el-option v-for="item in modeFunctionOptions"
+                       :key="item.modeFunctionId"
+                       :label="item.modeFunctionName"
+                       :value="item.modeFunctionId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="功能名称" prop="functionName">
+          <el-input v-model="form.functionName" placeholder="请输入功能名称" />
+        </el-form-item>
+        <el-form-item label="标识符" prop="functionIdentifier">
+          <el-input v-model="form.functionIdentifier" placeholder="请输入标识符" />
+        </el-form-item>
+        <el-form-item label="值" prop="functionValue">
+          <el-input v-model="form.functionValue" placeholder="请输入值" />
+        </el-form-item>
+        <el-form-item label="监测时间" prop="monitorTime">
+          <el-date-picker clearable
+            v-model="form.monitorTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择监测时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup name="BaseAlarmDetail" lang="ts">
+import { listBaseAlarmDetail, getBaseAlarmDetail, delBaseAlarmDetail, addBaseAlarmDetail, updateBaseAlarmDetail } from '@/api/dms/baseAlarmDetail';
+import { BaseAlarmDetailVO, BaseAlarmDetailQuery, BaseAlarmDetailForm } from '@/api/dms/baseAlarmDetail/types';
+import {getDmsDeviceModeFunctionList} from "@/api/dms/deviceModeFunction";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const baseAlarmDetailList = ref<BaseAlarmDetailVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseAlarmDetailFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `报警详细信息ID`, visible: false },
+        { key: 1, label: `报警信息`, visible: false },
+        { key: 2, label: `设备模型功能`, visible: true },
+        { key: 3, label: `功能名称`, visible: true },
+        { key: 4, label: `标识符`, visible: true },
+        { key: 5, label: `值`, visible: true },
+        { key: 6, label: `监测时间`, visible: true },
+]);
+
+const initFormData: BaseAlarmDetailForm = {
+  alarmDetailId: undefined,
+  alarmInfoId: undefined,
+  modeFunctionId: undefined,
+  functionName: undefined,
+  functionIdentifier: undefined,
+  functionValue: undefined,
+  monitorTime: undefined,
+  alarmContent: undefined,
+  modeFunctionName: undefined,
+}
+const data = reactive<PageData<BaseAlarmDetailForm, BaseAlarmDetailQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    alarmDetailId: undefined,
+    alarmInfoId: undefined,
+    modeFunctionId: undefined,
+    functionName: undefined,
+    functionIdentifier: undefined,
+    functionValue: undefined,
+    monitorTime: undefined,
+    alarmContent: undefined,
+    modeFunctionName: undefined,
+    params: {
+    }
+  },
+  rules: {
+/*    alarmDetailId: [
+      { required: true, message: "报警详细信息ID不能为空", trigger: "blur" }
+    ],*/
+/*    alarmInfoId: [
+      { required: true, message: "报警信息", trigger: "blur" }
+    ],*/
+    modeFunctionId: [
+      { required: true, message: "设备模型功能不能为空", trigger: "blur" }
+    ],
+    functionName: [
+      { required: true, message: "功能名称不能为空", trigger: "blur" }
+    ],
+/*    functionIdentifier: [
+      { required: true, message: "标识符不能为空", trigger: "blur" }
+    ],
+    functionValue: [
+      { required: true, message: "值不能为空", trigger: "blur" }
+    ],
+    monitorTime: [
+      { required: true, message: "监测时间不能为空", trigger: "blur" }
+    ]*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询报警详情信息;列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseAlarmDetail(queryParams.value);
+  baseAlarmDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseAlarmDetailFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseAlarmDetailVO[]) => {
+  ids.value = selection.map(item => item.alarmDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加报警详情信息;";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseAlarmDetailVO) => {
+  reset();
+  const _alarmDetailId = row?.alarmDetailId || ids.value[0]
+  const res = await getBaseAlarmDetail(_alarmDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改报警详情信息;";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseAlarmDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.alarmDetailId) {
+        await updateBaseAlarmDetail(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseAlarmDetail(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseAlarmDetailVO) => {
+  const _alarmDetailIds = row?.alarmDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除报警详情信息;编号为"' + _alarmDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseAlarmDetail(_alarmDetailIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/baseAlarmDetail/export', {
+    ...queryParams.value
+  }, `baseAlarmDetail_${new Date().getTime()}.xlsx`)
+}
+
+//功能模型
+let modeFunctionOptions = ref([]);
+const getModeFunctionOptions = async () => {
+  const res = await getDmsDeviceModeFunctionList(null);
+  modeFunctionOptions.value = res.data;
+}
+
+onMounted(() => {
+  getModeFunctionOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/baseAlarmInfo/index.vue b/src/views/dms/baseAlarmInfo/index.vue
new file mode 100644
index 0000000..0ef02e9
--- /dev/null
+++ b/src/views/dms/baseAlarmInfo/index.vue
@@ -0,0 +1,492 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="报警信息ID" prop="alarmInfoId">
+              <el-input v-model="queryParams.alarmInfoId" placeholder="请输入报警信息ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="报警信息类型" prop="alarmInfoType">
+              <el-select v-model="queryParams.alarmInfoType" placeholder="请选择报警信息类型" clearable >
+                <el-option v-for="dict in alarm_info_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="报警信息类型" prop="alarmReleatedId">
+              <el-input v-model="queryParams.alarmReleatedId" placeholder="请输入报警信息类型" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="报警设备ID，关联hw_device表的device_id字段" prop="deviceId">
+              <el-input v-model="queryParams.deviceId" placeholder="请输入报警设备ID，关联hw_device表的device_id字段" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="报警级别" prop="alarmLevelId">
+              <el-input v-model="queryParams.alarmLevelId" placeholder="请输入报警级别" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="报警类型" prop="alarmTypeId">
+              <el-input v-model="queryParams.alarmTypeId" placeholder="请输入报警类型" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="报警方式" prop="alarmMode">
+              <el-select v-model="queryParams.alarmMode" placeholder="请选择报警方式" clearable >
+                <el-option v-for="dict in alarm_mode" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="报警状态" prop="alarmStatus">
+              <el-select v-model="queryParams.alarmStatus" placeholder="请选择报警状态" clearable >
+                <el-option v-for="dict in alarm_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="实际报警开始时间" prop="alarmBeginTime">
+              <el-date-picker clearable
+                v-model="queryParams.alarmBeginTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择实际报警开始时间"
+              />
+            </el-form-item>
+            <el-form-item label="实际报警结束时间" prop="alarmEndTime">
+              <el-date-picker clearable
+                v-model="queryParams.alarmEndTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择实际报警结束时间"
+              />
+            </el-form-item>-->
+<!--            <el-form-item label="人工处理时间" prop="handleTime">
+              <el-date-picker clearable
+                v-model="queryParams.handleTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择人工处理时间"
+              />
+            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:baseAlarmInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:baseAlarmInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:baseAlarmInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:baseAlarmInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseAlarmInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="报警信息" align="center" prop="alarmInfoId" v-if="columns[0].visible"/>
+        <el-table-column label="报警信息类型" align="center" prop="alarmInfoType" v-if="columns[1].visible">
+          <template #default="scope">
+            <dict-tag :options="alarm_info_type" :value="scope.row.alarmInfoType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="报警信息相关" align="center" prop="alarmReleatedId" v-if="columns[2].visible"/>
+        <el-table-column label="报警设备" align="center" prop="deviceId" v-if="columns[3].visible"/>
+        <el-table-column label="报警内容" align="center" prop="alarmContent" v-if="columns[4].visible"/>
+        <el-table-column label="报警级别" align="center" prop="alarmLevelName" v-if="columns[5].visible"/>
+        <el-table-column label="报警类型" align="center" prop="alarmTypeName" v-if="columns[6].visible"/>
+        <el-table-column label="报警方式" align="center" prop="alarmMode" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="alarm_mode" :value="scope.row.alarmMode"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="报警状态" align="center" prop="alarmStatus" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="alarm_status" :value="scope.row.alarmStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际报警开始时间" align="center" prop="alarmBeginTime" width="180" v-if="columns[9].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.alarmBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际报警结束时间" align="center" prop="alarmEndTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.alarmEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="人工处理时间" align="center" prop="handleTime" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:baseAlarmInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:baseAlarmInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改报警信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseAlarmInfoFormRef" :model="form" :rules="rules" label-width="130px">
+<!--        <el-form-item label="报警信息ID" prop="alarmInfoId">
+          <el-input v-model="form.alarmInfoId" placeholder="请输入报警信息ID" />
+        </el-form-item>-->
+        <el-form-item label="报警信息类型" prop="alarmInfoType">
+          <el-select v-model="form.alarmInfoType" placeholder="请选择报警信息类型">
+            <el-option
+                v-for="dict in alarm_info_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="报警信息相关；" prop="alarmReleatedId">
+          <el-input v-model="form.alarmReleatedId" placeholder="请输入报警信息类型是1关联表alarm_rule的字段alarm_rule_id；报警信息类型是3关联表hw_offline_rule的字段offline_rule_id；" />
+        </el-form-item>-->
+        <el-form-item label="报警设备" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入报警设备" />
+        </el-form-item>
+        <el-form-item label="报警内容">
+          <editor v-model="form.alarmContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="报警级别" prop="alarmLevelId">
+<!--          <el-input v-model="form.alarmLevelId" placeholder="请输入报警级别" />-->
+          <el-select v-model="form.alarmLevelId" placeholder="请选择报警级别">
+            <el-option
+                v-for="item in alarmLevelOptions"
+                :key="item.alarmLevelId"
+                :label="item.alarmLevelName"
+                :value="item.alarmLevelId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报警类型" prop="alarmTypeId">
+<!--          <el-input v-model="form.alarmTypeId" placeholder="请输入报警类型，" />-->
+          <el-select v-model="form.alarmTypeId" placeholder="请选择报警类型">
+            <el-option
+                v-for="item in alarmTypeOptions"
+                :key="item.alarmTypeId"
+                :label="item.alarmTypeName"
+                :value="item.alarmTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报警方式" prop="alarmMode">
+          <el-select v-model="form.alarmMode" placeholder="请选择报警方式">
+            <el-option
+                v-for="dict in alarm_mode"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报警状态" prop="alarmStatus">
+          <el-select v-model="form.alarmStatus" placeholder="请选择报警状态">
+            <el-option
+                v-for="dict in alarm_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实际报警开始时间" prop="alarmBeginTime">
+          <el-date-picker clearable
+            v-model="form.alarmBeginTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择实际报警开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="实际报警结束时间" prop="alarmEndTime">
+          <el-date-picker clearable
+            v-model="form.alarmEndTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择实际报警结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="人工处理时间" prop="handleTime">
+          <el-date-picker clearable
+            v-model="form.handleTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择人工处理时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseAlarmInfo" lang="ts">
+import {
+  listBaseAlarmInfo,
+  getBaseAlarmInfo,
+  delBaseAlarmInfo,
+  addBaseAlarmInfo,
+  updateBaseAlarmInfo,
+  getBaseAlarmInfoList
+} from '@/api/dms/baseAlarmInfo';
+import { BaseAlarmInfoVO, BaseAlarmInfoQuery, BaseAlarmInfoForm } from '@/api/dms/baseAlarmInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { alarm_mode, alarm_info_type, alarm_status } = toRefs<any>(proxy?.useDict('alarm_mode', 'alarm_info_type', 'alarm_status'));
+
+const baseAlarmInfoList = ref<BaseAlarmInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseAlarmInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `报警信息ID`, visible: false },
+        { key: 1, label: `报警信息类型`, visible: true },
+        { key: 2, label: `报警信息类型相关；`, visible: false },
+        { key: 3, label: `报警设备`, visible: true },
+        { key: 4, label: `报警内容`, visible: true },
+        { key: 5, label: `报警级别`, visible: true },
+        { key: 6, label: `报警类型，`, visible: true },
+        { key: 7, label: `报警方式`, visible: true },
+        { key: 8, label: `报警状态`, visible: true },
+        { key: 9, label: `实际报警开始时间`, visible: true },
+        { key: 10, label: `实际报警结束时间`, visible: true },
+        { key: 11, label: `人工处理时间`, visible: true },
+        { key: 12, label: `创建时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false },
+]);
+
+const initFormData: BaseAlarmInfoForm = {
+  alarmInfoId: undefined,
+  alarmInfoType: undefined,
+  alarmReleatedId: undefined,
+  deviceId: undefined,
+  alarmContent: undefined,
+  alarmLevelId: undefined,
+  alarmTypeId: undefined,
+  alarmMode: undefined,
+  alarmStatus: undefined,
+  alarmBeginTime: undefined,
+  alarmEndTime: undefined,
+  handleTime: undefined,
+  alarmTypeName: undefined,
+  alarmLevelName: undefined,
+  releateadContent: undefined
+}
+const data = reactive<PageData<BaseAlarmInfoForm, BaseAlarmInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    alarmInfoId: undefined,
+    alarmInfoType: undefined,
+    alarmReleatedId: undefined,
+    deviceId: undefined,
+    alarmContent: undefined,
+    alarmLevelId: undefined,
+    alarmTypeId: undefined,
+    alarmMode: undefined,
+    alarmStatus: undefined,
+    alarmBeginTime: undefined,
+    alarmEndTime: undefined,
+    handleTime: undefined,
+    alarmTypeName: undefined,
+    alarmLevelName: undefined,
+    releateadContent: undefined,
+    params: {
+    }
+  },
+  rules: {
+/*    alarmInfoId: [
+      { required: true, message: "报警信息ID不能为空", trigger: "blur" }
+    ],*/
+    alarmInfoType: [
+      { required: true, message: "报警信息类型不能为空", trigger: "change" }
+    ],
+    alarmReleatedId: [
+      { required: true, message: "报警相关不能为空", trigger: "blur" }
+    ],
+    deviceId: [
+      { required: true, message: "报警设备不能为空", trigger: "blur" }
+    ],
+    alarmContent: [
+      { required: true, message: "报警内容不能为空", trigger: "blur" }
+    ],
+    alarmLevelId: [
+      { required: true, message: "报警级别不能为空", trigger: "blur" }
+    ],
+    alarmTypeId: [
+      { required: true, message: "报警类型，不能为空", trigger: "blur" }
+    ],
+/*    alarmMode: [
+      { required: true, message: "报警方式不能为空", trigger: "change" }
+    ],
+    alarmStatus: [
+      { required: true, message: "报警状态不能为空", trigger: "change" }
+    ],
+    alarmBeginTime: [
+      { required: true, message: "实际报警开始时间不能为空", trigger: "blur" }
+    ],
+    alarmEndTime: [
+      { required: true, message: "实际报警结束时间不能为空", trigger: "blur" }
+    ],
+    handleTime: [
+      { required: true, message: "人工处理时间不能为空", trigger: "blur" }
+    ],*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询报警信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseAlarmInfo(queryParams.value);
+  baseAlarmInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseAlarmInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseAlarmInfoVO[]) => {
+  ids.value = selection.map(item => item.alarmInfoId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加报警信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseAlarmInfoVO) => {
+  reset();
+  const _alarmInfoId = row?.alarmInfoId || ids.value[0]
+  const res = await getBaseAlarmInfo(_alarmInfoId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改报警信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseAlarmInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.alarmInfoId) {
+        await updateBaseAlarmInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseAlarmInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseAlarmInfoVO) => {
+  const _alarmInfoIds = row?.alarmInfoId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除报警信息编号为"' + _alarmInfoIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseAlarmInfo(_alarmInfoIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/baseAlarmInfo/export', {
+    ...queryParams.value
+  }, `baseAlarmInfo_${new Date().getTime()}.xlsx`)
+}
+
+//报警级别
+let alarmLevelOptions = ref([]);
+const getAlarmLevelOptions = async () => {
+  const res = await getBaseAlarmInfoList(null);
+  alarmLevelOptions.value = res.rows;
+};
+
+//报警类型
+let alarmTypeOptions = ref([]);
+const getAlarmTypeOptions = async () => {
+  const res = await getBaseAlarmInfoList(null);
+  alarmTypeOptions.value = res.rows;
+};
+
+//报警设备
+let machineOptions = ref([]);
+/*const getMachineOptions = async () => {
+  const res = await (null);
+  machineOptions.value = res.rows;
+};*/
+
+onMounted(() => {
+  getAlarmLevelOptions();
+  getAlarmTypeOptions();
+  getList();
+});
+</script>

From 1aab02a0f879551edcd9fa03498f7aed90bb188b Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 20 Mar 2025 20:43:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?add(dms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87BOM=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E3=80=81=E8=BD=AC=E7=A7=BB=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E8=B4=AD=E3=80=81=E6=8A=98=E6=97=A7=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增相关信息列表页面
- 实现相关的查询、新增、修改和删除功能
- 添加设备BOM信息的树形结构展示
- 集成设备下拉框数据获取
---
 src/api/dms/dmsBaseDeviceBom/index.ts         |  77 ++++
 src/api/dms/dmsBaseDeviceBom/types.ts         | 136 +++++++
 .../dms/dmsBaseDeviceDepreciation/index.ts    |  77 ++++
 .../dms/dmsBaseDeviceDepreciation/types.ts    | 161 ++++++++
 src/api/dms/dmsBaseDeviceInstall/index.ts     |  77 ++++
 src/api/dms/dmsBaseDeviceInstall/types.ts     | 122 ++++++
 src/api/dms/dmsBaseDevicePurchase/index.ts    |  77 ++++
 src/api/dms/dmsBaseDevicePurchase/types.ts    | 131 +++++++
 src/api/dms/dmsBaseDeviceSupplier/index.ts    |  77 ++++
 src/api/dms/dmsBaseDeviceSupplier/types.ts    | 146 +++++++
 src/api/dms/dmsBaseOutsourcingInfo/index.ts   |  77 ++++
 src/api/dms/dmsBaseOutsourcingInfo/types.ts   | 131 +++++++
 src/api/dms/dmsBaseTransferInfo/index.ts      |  77 ++++
 src/api/dms/dmsBaseTransferInfo/types.ts      | 162 ++++++++
 src/views/dms/dmsBaseDeviceBom/index.vue      | 320 ++++++++++++++++
 .../dms/dmsBaseDeviceDepreciation/index.vue   | 355 ++++++++++++++++++
 src/views/dms/dmsBaseDeviceInstall/index.vue  | 320 ++++++++++++++++
 src/views/dms/dmsBaseDevicePurchase/index.vue | 307 +++++++++++++++
 src/views/dms/dmsBaseDeviceSupplier/index.vue | 334 ++++++++++++++++
 .../dms/dmsBaseOutsourcingInfo/index.vue      | 309 +++++++++++++++
 src/views/dms/dmsBaseTransferInfo/index.vue   | 350 +++++++++++++++++
 21 files changed, 3823 insertions(+)
 create mode 100644 src/api/dms/dmsBaseDeviceBom/index.ts
 create mode 100644 src/api/dms/dmsBaseDeviceBom/types.ts
 create mode 100644 src/api/dms/dmsBaseDeviceDepreciation/index.ts
 create mode 100644 src/api/dms/dmsBaseDeviceDepreciation/types.ts
 create mode 100644 src/api/dms/dmsBaseDeviceInstall/index.ts
 create mode 100644 src/api/dms/dmsBaseDeviceInstall/types.ts
 create mode 100644 src/api/dms/dmsBaseDevicePurchase/index.ts
 create mode 100644 src/api/dms/dmsBaseDevicePurchase/types.ts
 create mode 100644 src/api/dms/dmsBaseDeviceSupplier/index.ts
 create mode 100644 src/api/dms/dmsBaseDeviceSupplier/types.ts
 create mode 100644 src/api/dms/dmsBaseOutsourcingInfo/index.ts
 create mode 100644 src/api/dms/dmsBaseOutsourcingInfo/types.ts
 create mode 100644 src/api/dms/dmsBaseTransferInfo/index.ts
 create mode 100644 src/api/dms/dmsBaseTransferInfo/types.ts
 create mode 100644 src/views/dms/dmsBaseDeviceBom/index.vue
 create mode 100644 src/views/dms/dmsBaseDeviceDepreciation/index.vue
 create mode 100644 src/views/dms/dmsBaseDeviceInstall/index.vue
 create mode 100644 src/views/dms/dmsBaseDevicePurchase/index.vue
 create mode 100644 src/views/dms/dmsBaseDeviceSupplier/index.vue
 create mode 100644 src/views/dms/dmsBaseOutsourcingInfo/index.vue
 create mode 100644 src/views/dms/dmsBaseTransferInfo/index.vue

diff --git a/src/api/dms/dmsBaseDeviceBom/index.ts b/src/api/dms/dmsBaseDeviceBom/index.ts
new file mode 100644
index 0000000..49b3c4f
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceBom/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDeviceBomVO, DmsBaseDeviceBomForm, DmsBaseDeviceBomQuery } from '@/api/dms/dmsBaseDeviceBom/types';
+
+/**
+ * 查询设备BOM信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDeviceBom = (query?: DmsBaseDeviceBomQuery): AxiosPromise<DmsBaseDeviceBomVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDeviceBom/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备BOM信息详细
+ * @param deviceBomId
+ */
+export const getDmsBaseDeviceBom = (deviceBomId: string | number): AxiosPromise<DmsBaseDeviceBomVO> => {
+  return request({
+    url: '/dms/dmsBaseDeviceBom/' + deviceBomId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备BOM信息
+ * @param data
+ */
+export const addDmsBaseDeviceBom = (data: DmsBaseDeviceBomForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceBom',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备BOM信息
+ * @param data
+ */
+export const updateDmsBaseDeviceBom = (data: DmsBaseDeviceBomForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceBom',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备BOM信息
+ * @param deviceBomId
+ */
+export const delDmsBaseDeviceBom = (deviceBomId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDeviceBom/' + deviceBomId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备BOM信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDeviceBomList (query) {
+    return request({
+        url: '/dms/dmsBaseDeviceBom/getDmsBaseDeviceBomList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDeviceBom/types.ts b/src/api/dms/dmsBaseDeviceBom/types.ts
new file mode 100644
index 0000000..99747ff
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceBom/types.ts
@@ -0,0 +1,136 @@
+export interface DmsBaseDeviceBomVO {
+  /**
+   * 主键标识
+   */
+  deviceBomId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * BOM数量
+   */
+  bomAmount: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;//join
+
+    /**
+     * 子对象
+     */
+    children: DmsBaseDeviceBomVO[];
+}
+
+export interface DmsBaseDeviceBomForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  deviceBomId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * BOM数量
+   */
+  bomAmount?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+export interface DmsBaseDeviceBomQuery {
+
+  /**
+   * 主键标识
+   */
+  deviceBomId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * BOM数量
+   */
+  bomAmount?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+
+
diff --git a/src/api/dms/dmsBaseDeviceDepreciation/index.ts b/src/api/dms/dmsBaseDeviceDepreciation/index.ts
new file mode 100644
index 0000000..50d32bf
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceDepreciation/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDeviceDepreciationVO, DmsBaseDeviceDepreciationForm, DmsBaseDeviceDepreciationQuery } from '@/api/dms/dmsBaseDeviceDepreciation/types';
+
+/**
+ * 查询设备折旧信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDeviceDepreciation = (query?: DmsBaseDeviceDepreciationQuery): AxiosPromise<DmsBaseDeviceDepreciationVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDeviceDepreciation/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备折旧信息详细
+ * @param deviceDepreciationId
+ */
+export const getDmsBaseDeviceDepreciation = (deviceDepreciationId: string | number): AxiosPromise<DmsBaseDeviceDepreciationVO> => {
+  return request({
+    url: '/dms/dmsBaseDeviceDepreciation/' + deviceDepreciationId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备折旧信息
+ * @param data
+ */
+export const addDmsBaseDeviceDepreciation = (data: DmsBaseDeviceDepreciationForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceDepreciation',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备折旧信息
+ * @param data
+ */
+export const updateDmsBaseDeviceDepreciation = (data: DmsBaseDeviceDepreciationForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceDepreciation',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备折旧信息
+ * @param deviceDepreciationId
+ */
+export const delDmsBaseDeviceDepreciation = (deviceDepreciationId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDeviceDepreciation/' + deviceDepreciationId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备折旧信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDeviceDepreciationList (query) {
+    return request({
+        url: '/dms/dmsBaseDeviceDepreciation/getDmsBaseDeviceDepreciationList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDeviceDepreciation/types.ts b/src/api/dms/dmsBaseDeviceDepreciation/types.ts
new file mode 100644
index 0000000..14a8229
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceDepreciation/types.ts
@@ -0,0 +1,161 @@
+export interface DmsBaseDeviceDepreciationVO {
+  /**
+   * 主键标识
+   */
+  deviceDepreciationId: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * 维修次数
+   */
+  repairFrequency: number;
+
+  /**
+   * 维修费用
+   */
+  repairCosts: number;
+
+  /**
+   * 折旧费用
+   */
+  depreciationCost: number;
+
+  /**
+   * 投入时间
+   */
+  putIntoTime: string;
+
+  /**
+   * 使用年限
+   */
+  useLife: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;
+
+}
+
+export interface DmsBaseDeviceDepreciationForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  deviceDepreciationId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 维修次数
+   */
+  repairFrequency?: number;
+
+  /**
+   * 维修费用
+   */
+  repairCosts?: number;
+
+  /**
+   * 折旧费用
+   */
+  depreciationCost?: number;
+
+  /**
+   * 投入时间
+   */
+  putIntoTime?: string;
+
+  /**
+   * 使用年限
+   */
+  useLife?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+}
+
+export interface DmsBaseDeviceDepreciationQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  deviceDepreciationId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 维修次数
+   */
+  repairFrequency?: number;
+
+  /**
+   * 维修费用
+   */
+  repairCosts?: number;
+
+  /**
+   * 折旧费用
+   */
+  depreciationCost?: number;
+
+  /**
+   * 投入时间
+   */
+  putIntoTime?: string;
+
+  /**
+   * 使用年限
+   */
+  useLife?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+}
+
+
+
diff --git a/src/api/dms/dmsBaseDeviceInstall/index.ts b/src/api/dms/dmsBaseDeviceInstall/index.ts
new file mode 100644
index 0000000..dadad8b
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceInstall/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDeviceInstallVO, DmsBaseDeviceInstallForm, DmsBaseDeviceInstallQuery } from '@/api/dms/dmsBaseDeviceInstall/types';
+
+/**
+ * 查询设备安装信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDeviceInstall = (query?: DmsBaseDeviceInstallQuery): AxiosPromise<DmsBaseDeviceInstallVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDeviceInstall/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备安装信息详细
+ * @param deviceInstallId
+ */
+export const getDmsBaseDeviceInstall = (deviceInstallId: string | number): AxiosPromise<DmsBaseDeviceInstallVO> => {
+  return request({
+    url: '/dms/dmsBaseDeviceInstall/' + deviceInstallId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备安装信息
+ * @param data
+ */
+export const addDmsBaseDeviceInstall = (data: DmsBaseDeviceInstallForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceInstall',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备安装信息
+ * @param data
+ */
+export const updateDmsBaseDeviceInstall = (data: DmsBaseDeviceInstallForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceInstall',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备安装信息
+ * @param deviceInstallId
+ */
+export const delDmsBaseDeviceInstall = (deviceInstallId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDeviceInstall/' + deviceInstallId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备安装信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDeviceInstallList (query) {
+    return request({
+        url: '/dms/dmsBaseDeviceInstall/getDmsBaseDeviceInstallList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDeviceInstall/types.ts b/src/api/dms/dmsBaseDeviceInstall/types.ts
new file mode 100644
index 0000000..02eed78
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceInstall/types.ts
@@ -0,0 +1,122 @@
+export interface DmsBaseDeviceInstallVO {
+  /**
+   * 主键ID
+   */
+  deviceInstallId: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * 安装地点
+   */
+  installPosition: string;
+
+  /**
+   * 安装时间
+   */
+  installTime: string;
+
+  /**
+   * 安装人员
+   */
+  installPerson: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;//join
+
+}
+
+export interface DmsBaseDeviceInstallForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  deviceInstallId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 安装地点
+   */
+  installPosition?: string;
+
+  /**
+   * 安装时间
+   */
+  installTime?: string;
+
+  /**
+   * 安装人员
+   */
+  installPerson?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+export interface DmsBaseDeviceInstallQuery extends PageQuery {
+
+  /**
+   * 主键ID
+   */
+  deviceInstallId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 安装地点
+   */
+  installPosition?: string;
+
+  /**
+   * 安装时间
+   */
+  installTime?: string;
+
+  /**
+   * 安装人员
+   */
+  installPerson?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+
+
diff --git a/src/api/dms/dmsBaseDevicePurchase/index.ts b/src/api/dms/dmsBaseDevicePurchase/index.ts
new file mode 100644
index 0000000..4bd53a2
--- /dev/null
+++ b/src/api/dms/dmsBaseDevicePurchase/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDevicePurchaseVO, DmsBaseDevicePurchaseForm, DmsBaseDevicePurchaseQuery } from '@/api/dms/dmsBaseDevicePurchase/types';
+
+/**
+ * 查询设备采购信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDevicePurchase = (query?: DmsBaseDevicePurchaseQuery): AxiosPromise<DmsBaseDevicePurchaseVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDevicePurchase/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备采购信息详细
+ * @param devicePurchaseId
+ */
+export const getDmsBaseDevicePurchase = (devicePurchaseId: string | number): AxiosPromise<DmsBaseDevicePurchaseVO> => {
+  return request({
+    url: '/dms/dmsBaseDevicePurchase/' + devicePurchaseId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备采购信息
+ * @param data
+ */
+export const addDmsBaseDevicePurchase = (data: DmsBaseDevicePurchaseForm) => {
+  return request({
+    url: '/dms/dmsBaseDevicePurchase',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备采购信息
+ * @param data
+ */
+export const updateDmsBaseDevicePurchase = (data: DmsBaseDevicePurchaseForm) => {
+  return request({
+    url: '/dms/dmsBaseDevicePurchase',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备采购信息
+ * @param devicePurchaseId
+ */
+export const delDmsBaseDevicePurchase = (devicePurchaseId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDevicePurchase/' + devicePurchaseId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备采购信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDevicePurchaseList (query) {
+    return request({
+        url: '/dms/dmsBaseDevicePurchase/getDmsBaseDevicePurchaseList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDevicePurchase/types.ts b/src/api/dms/dmsBaseDevicePurchase/types.ts
new file mode 100644
index 0000000..4df553b
--- /dev/null
+++ b/src/api/dms/dmsBaseDevicePurchase/types.ts
@@ -0,0 +1,131 @@
+export interface DmsBaseDevicePurchaseVO {
+  /**
+   * 主键ID
+   */
+  devicePurchaseId: string | number;
+
+  /**
+   * 计划编号
+   */
+  workOrder: string;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * 采购人
+   */
+  purchasePerson: string;
+
+  /**
+   * 采购地点
+   */
+  purchasePosition: string;
+
+  /**
+   * 采购时间
+   */
+  purchaseTime: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+export interface DmsBaseDevicePurchaseForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  devicePurchaseId?: string | number;
+
+  /**
+   * 计划编号
+   */
+  workOrder?: string;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 采购人
+   */
+  purchasePerson?: string;
+
+  /**
+   * 采购地点
+   */
+  purchasePosition?: string;
+
+  /**
+   * 采购时间
+   */
+  purchaseTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+export interface DmsBaseDevicePurchaseQuery extends PageQuery {
+
+  /**
+   * 主键ID
+   */
+  devicePurchaseId?: string | number;
+
+  /**
+   * 计划编号
+   */
+  workOrder?: string;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 采购人
+   */
+  purchasePerson?: string;
+
+  /**
+   * 采购地点
+   */
+  purchasePosition?: string;
+
+  /**
+   * 采购时间
+   */
+  purchaseTime?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+}
+
+
+
diff --git a/src/api/dms/dmsBaseDeviceSupplier/index.ts b/src/api/dms/dmsBaseDeviceSupplier/index.ts
new file mode 100644
index 0000000..22c7c10
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceSupplier/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDeviceSupplierVO, DmsBaseDeviceSupplierForm, DmsBaseDeviceSupplierQuery } from '@/api/dms/dmsBaseDeviceSupplier/types';
+
+/**
+ * 查询设备供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDeviceSupplier = (query?: DmsBaseDeviceSupplierQuery): AxiosPromise<DmsBaseDeviceSupplierVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDeviceSupplier/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备供应商信息详细
+ * @param supplierId
+ */
+export const getDmsBaseDeviceSupplier = (supplierId: string | number): AxiosPromise<DmsBaseDeviceSupplierVO> => {
+  return request({
+    url: '/dms/dmsBaseDeviceSupplier/' + supplierId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备供应商信息
+ * @param data
+ */
+export const addDmsBaseDeviceSupplier = (data: DmsBaseDeviceSupplierForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceSupplier',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备供应商信息
+ * @param data
+ */
+export const updateDmsBaseDeviceSupplier = (data: DmsBaseDeviceSupplierForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceSupplier',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备供应商信息
+ * @param supplierId
+ */
+export const delDmsBaseDeviceSupplier = (supplierId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDeviceSupplier/' + supplierId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDeviceSupplierList (query) {
+    return request({
+        url: '/dms/dmsBaseDeviceSupplier/getDmsBaseDeviceSupplierList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDeviceSupplier/types.ts b/src/api/dms/dmsBaseDeviceSupplier/types.ts
new file mode 100644
index 0000000..3a4e1bb
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceSupplier/types.ts
@@ -0,0 +1,146 @@
+export interface DmsBaseDeviceSupplierVO {
+  /**
+   * 主键标识
+   */
+  supplierId: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName: string;
+
+  /**
+   * 供应商联系人
+   */
+  supplierPerson: string;
+
+  /**
+   * 供应商电话
+   */
+  supplierTel: string;
+
+  /**
+   * 供应商地址
+   */
+  supplierAddress: string;
+
+  /**
+   * 供应商状态
+   */
+  supplierStatus: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DmsBaseDeviceSupplierForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 供应商联系人
+   */
+  supplierPerson?: string;
+
+  /**
+   * 供应商电话
+   */
+  supplierTel?: string;
+
+  /**
+   * 供应商地址
+   */
+  supplierAddress?: string;
+
+  /**
+   * 供应商状态
+   */
+  supplierStatus?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DmsBaseDeviceSupplierQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * 供应商联系人
+   */
+  supplierPerson?: string;
+
+  /**
+   * 供应商电话
+   */
+  supplierTel?: string;
+
+  /**
+   * 供应商地址
+   */
+  supplierAddress?: string;
+
+  /**
+   * 供应商状态
+   */
+  supplierStatus?: number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/dms/dmsBaseOutsourcingInfo/index.ts b/src/api/dms/dmsBaseOutsourcingInfo/index.ts
new file mode 100644
index 0000000..7f4c375
--- /dev/null
+++ b/src/api/dms/dmsBaseOutsourcingInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseOutsourcingInfoVO, DmsBaseOutsourcingInfoForm, DmsBaseOutsourcingInfoQuery } from '@/api/dms/dmsBaseOutsourcingInfo/types';
+
+/**
+ * 查询外协信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseOutsourcingInfo = (query?: DmsBaseOutsourcingInfoQuery): AxiosPromise<DmsBaseOutsourcingInfoVO[]> => {
+  return request({
+    url: '/dms/dmsBaseOutsourcingInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询外协信息详细
+ * @param outsourcingId
+ */
+export const getDmsBaseOutsourcingInfo = (outsourcingId: string | number): AxiosPromise<DmsBaseOutsourcingInfoVO> => {
+  return request({
+    url: '/dms/dmsBaseOutsourcingInfo/' + outsourcingId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增外协信息
+ * @param data
+ */
+export const addDmsBaseOutsourcingInfo = (data: DmsBaseOutsourcingInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseOutsourcingInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改外协信息
+ * @param data
+ */
+export const updateDmsBaseOutsourcingInfo = (data: DmsBaseOutsourcingInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseOutsourcingInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除外协信息
+ * @param outsourcingId
+ */
+export const delDmsBaseOutsourcingInfo = (outsourcingId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseOutsourcingInfo/' + outsourcingId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询外协信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseOutsourcingInfoList (query) {
+    return request({
+        url: '/dms/dmsBaseOutsourcingInfo/getDmsBaseOutsourcingInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseOutsourcingInfo/types.ts b/src/api/dms/dmsBaseOutsourcingInfo/types.ts
new file mode 100644
index 0000000..99a2bdf
--- /dev/null
+++ b/src/api/dms/dmsBaseOutsourcingInfo/types.ts
@@ -0,0 +1,131 @@
+export interface DmsBaseOutsourcingInfoVO {
+  /**
+   * 主键标识
+   */
+  outsourcingId: string | number;
+
+  /**
+   * 外协编号
+   */
+  outsourcingCode: string;
+
+  /**
+   * 单位名称
+   */
+  outsourcingName: string;
+
+  /**
+   * 外协联系人
+   */
+  outsourcingPerson: string;
+
+  /**
+   * 外协电话
+   */
+  outsourcingTel: string;
+
+  /**
+   * 外协地址
+   */
+  outsourcingAddress: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DmsBaseOutsourcingInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  outsourcingId?: string | number;
+
+  /**
+   * 外协编号
+   */
+  outsourcingCode?: string;
+
+  /**
+   * 单位名称
+   */
+  outsourcingName?: string;
+
+  /**
+   * 外协联系人
+   */
+  outsourcingPerson?: string;
+
+  /**
+   * 外协电话
+   */
+  outsourcingTel?: string;
+
+  /**
+   * 外协地址
+   */
+  outsourcingAddress?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DmsBaseOutsourcingInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  outsourcingId?: string | number;
+
+  /**
+   * 外协编号
+   */
+  outsourcingCode?: string;
+
+  /**
+   * 单位名称
+   */
+  outsourcingName?: string;
+
+  /**
+   * 外协联系人
+   */
+  outsourcingPerson?: string;
+
+  /**
+   * 外协电话
+   */
+  outsourcingTel?: string;
+
+  /**
+   * 外协地址
+   */
+  outsourcingAddress?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/dms/dmsBaseTransferInfo/index.ts b/src/api/dms/dmsBaseTransferInfo/index.ts
new file mode 100644
index 0000000..79680d3
--- /dev/null
+++ b/src/api/dms/dmsBaseTransferInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseTransferInfoVO, DmsBaseTransferInfoForm, DmsBaseTransferInfoQuery } from '@/api/dms/dmsBaseTransferInfo/types';
+
+/**
+ * 查询设备转移信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseTransferInfo = (query?: DmsBaseTransferInfoQuery): AxiosPromise<DmsBaseTransferInfoVO[]> => {
+  return request({
+    url: '/dms/dmsBaseTransferInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备转移信息详细
+ * @param transferInfoId
+ */
+export const getDmsBaseTransferInfo = (transferInfoId: string | number): AxiosPromise<DmsBaseTransferInfoVO> => {
+  return request({
+    url: '/dms/dmsBaseTransferInfo/' + transferInfoId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备转移信息
+ * @param data
+ */
+export const addDmsBaseTransferInfo = (data: DmsBaseTransferInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseTransferInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备转移信息
+ * @param data
+ */
+export const updateDmsBaseTransferInfo = (data: DmsBaseTransferInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseTransferInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备转移信息
+ * @param transferInfoId
+ */
+export const delDmsBaseTransferInfo = (transferInfoId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseTransferInfo/' + transferInfoId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备转移信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseTransferInfoList (query) {
+    return request({
+        url: '/dms/dmsBaseTransferInfo/getDmsBaseTransferInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseTransferInfo/types.ts b/src/api/dms/dmsBaseTransferInfo/types.ts
new file mode 100644
index 0000000..b0a1a53
--- /dev/null
+++ b/src/api/dms/dmsBaseTransferInfo/types.ts
@@ -0,0 +1,162 @@
+export interface DmsBaseTransferInfoVO {
+  /**
+   * 主键ID
+   */
+  transferInfoId: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * 设备原位置
+   */
+  devicePosition: string;
+
+  /**
+   * 设备转移位置
+   */
+  devicePositionNew: string;
+
+  /**
+   * 设备转移人员
+   */
+  devicePositionOperator: string;
+
+  /**
+   * 设备转移原因
+   */
+  devicePositionReason: string;
+
+  /**
+   * 设备转移时间
+   */
+  deviceTransferTime: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;//join
+
+}
+
+export interface DmsBaseTransferInfoForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  transferInfoId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 设备原位置
+   */
+  devicePosition?: string;
+
+  /**
+   * 设备转移位置
+   */
+  devicePositionNew?: string;
+
+  /**
+   * 设备转移人员
+   */
+  devicePositionOperator?: string;
+
+  /**
+   * 设备转移原因
+   */
+  devicePositionReason?: string;
+
+  /**
+   * 设备转移时间
+   */
+  deviceTransferTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+}
+
+export interface DmsBaseTransferInfoQuery extends PageQuery {
+
+  /**
+   * 主键ID
+   */
+  transferInfoId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 设备原位置
+   */
+  devicePosition?: string;
+
+  /**
+   * 设备转移位置
+   */
+  devicePositionNew?: string;
+
+  /**
+   * 设备转移人员
+   */
+  devicePositionOperator?: string;
+
+  /**
+   * 设备转移原因
+   */
+  devicePositionReason?: string;
+
+  /**
+   * 设备转移时间
+   */
+  deviceTransferTime?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+}
+
+
+
diff --git a/src/views/dms/dmsBaseDeviceBom/index.vue b/src/views/dms/dmsBaseDeviceBom/index.vue
new file mode 100644
index 0000000..8edfe2f
--- /dev/null
+++ b/src/views/dms/dmsBaseDeviceBom/index.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="deviceBomId">
+              <el-input v-model="queryParams.deviceBomId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="父级标识" prop="parentId">
+              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="BOM数量" prop="bomAmount">
+              <el-input v-model="queryParams.bomAmount" placeholder="请输入BOM数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="祖级列表" prop="ancestors">
+              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+<!--              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['dms:dmsBaseDeviceBom:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="dmsBaseDeviceBomTableRef"
+        v-loading="loading"
+        :data="dmsBaseDeviceBomList"
+        row-key="deviceBomId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="主键" align="center" prop="deviceBomId" />
+        <el-table-column label="父级标识" align="center" prop="parentId" />-->
+        <el-table-column label="设备" align="center" prop="machineName" />
+        <el-table-column label="BOM数量" align="center" prop="bomAmount" />
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="激活标识" align="center" prop="activeFlag" >
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDeviceBom:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['dms:dmsBaseDeviceBom:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDeviceBom:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改设备BOM信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDeviceBomFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="deviceBomId">
+          <el-input v-model="form.deviceBomId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="父级标识" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="dmsBaseDeviceBomOptions"
+            :props="{ value: 'deviceBomId', label: 'machineName', children: 'children' }"
+            value-key="deviceBomId"
+            placeholder="请选择父级标识"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="BOM数量" prop="bomAmount">
+          <el-input v-model="form.bomAmount" placeholder="请输入BOM数量" />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">
+          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+        </el-form-item>-->
+        <el-form-item label="激活标识" prop="activeFlag">
+<!--          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />-->
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDeviceBom" lang="ts">
+import { listDmsBaseDeviceBom, getDmsBaseDeviceBom, delDmsBaseDeviceBom, addDmsBaseDeviceBom, updateDmsBaseDeviceBom } from "@/api/dms/dmsBaseDeviceBom";
+import { DmsBaseDeviceBomVO, DmsBaseDeviceBomQuery, DmsBaseDeviceBomForm } from '@/api/dms/dmsBaseDeviceBom/types';
+import { getDmsBaseMachineInfoList } from "@/api/dms/dmsBaseMachineInfo";
+
+
+type DmsBaseDeviceBomOption = {
+  deviceBomId: number;
+  machineName: string;
+  children?: DmsBaseDeviceBomOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseDeviceBomList = ref<DmsBaseDeviceBomVO[]>([]);
+const dmsBaseDeviceBomOptions = ref<DmsBaseDeviceBomOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceBomFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceBomTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: DmsBaseDeviceBomForm = {
+    deviceBomId: undefined,
+    parentId: undefined,
+    machineId: undefined,
+    bomAmount: undefined,
+    ancestors: undefined,
+    activeFlag: "1",
+    remark: undefined,
+  machineName: undefined,
+}
+
+const data = reactive<PageData<DmsBaseDeviceBomForm, DmsBaseDeviceBomQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    deviceBomId: undefined,
+    parentId: undefined,
+    machineId: undefined,
+    bomAmount: undefined,
+    ancestors: undefined,
+    activeFlag: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备BOM信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDeviceBom(queryParams.value);
+  const data = proxy?.handleTree<DmsBaseDeviceBomVO>(res.data, "deviceBomId", "parentId");
+  if (data) {
+    dmsBaseDeviceBomList.value = data;
+    loading.value = false;
+  }
+}
+
+/** 查询设备BOM信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listDmsBaseDeviceBom();
+  dmsBaseDeviceBomOptions.value = [];
+  const data: DmsBaseDeviceBomOption = { deviceBomId: 0, machineName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<DmsBaseDeviceBomOption>(res.data, "deviceBomId", "parentId");
+  dmsBaseDeviceBomOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  dmsBaseDeviceBomFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: DmsBaseDeviceBomVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.deviceBomId) {
+    form.value.parentId = row.deviceBomId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加设备BOM信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(dmsBaseDeviceBomList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: DmsBaseDeviceBomVO[], status: boolean) => {
+  data.forEach((item) => {
+    dmsBaseDeviceBomTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: DmsBaseDeviceBomVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getDmsBaseDeviceBom(row.deviceBomId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备BOM信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDeviceBomFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.deviceBomId) {
+        await updateDmsBaseDeviceBom(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addDmsBaseDeviceBom(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: DmsBaseDeviceBomVO) => {
+  await proxy?.$modal.confirm('是否确认删除设备BOM信息编号为"' + row.deviceBomId + '"的数据项？');
+  loading.value = true;
+  await delDmsBaseDeviceBom(row.deviceBomId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseDeviceDepreciation/index.vue b/src/views/dms/dmsBaseDeviceDepreciation/index.vue
new file mode 100644
index 0000000..c9f1fb6
--- /dev/null
+++ b/src/views/dms/dmsBaseDeviceDepreciation/index.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="deviceDepreciationId">
+              <el-input v-model="queryParams.deviceDepreciationId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备ID" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="维修次数" prop="repairFrequency">
+              <el-input v-model="queryParams.repairFrequency" placeholder="请输入维修次数" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="维修费用" prop="repairCosts">
+              <el-input v-model="queryParams.repairCosts" placeholder="请输入维修费用" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="折旧费用" prop="depreciationCost">
+              <el-input v-model="queryParams.depreciationCost" placeholder="请输入折旧费用" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="投入时间" prop="putIntoTime">
+              <el-date-picker clearable
+                v-model="queryParams.putIntoTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择投入时间"
+              />
+            </el-form-item>
+<!--            <el-form-item label="使用年限" prop="useLife">
+              <el-input v-model="queryParams.useLife" placeholder="请输入使用年限" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseDeviceDepreciation:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseDeviceDepreciation:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseDeviceDepreciation:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseDeviceDepreciation:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseDeviceDepreciationList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="deviceDepreciationId" v-if="columns[0].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/>
+        <el-table-column label="维修次数" align="center" prop="repairFrequency" v-if="columns[3].visible"/>
+        <el-table-column label="维修费用" align="center" prop="repairCosts" v-if="columns[4].visible"/>
+        <el-table-column label="折旧费用" align="center" prop="depreciationCost" v-if="columns[5].visible"/>
+        <el-table-column label="投入时间" align="center" prop="putIntoTime" width="180" v-if="columns[6].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.putIntoTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="使用年限" align="center" prop="useLife" v-if="columns[7].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDeviceDepreciation:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDeviceDepreciation:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改设备折旧信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDeviceDepreciationFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="deviceDepreciationId">
+          <el-input v-model="form.deviceDepreciationId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="维修次数" prop="repairFrequency">
+          <el-input-number v-model="form.repairFrequency"
+                           :min="0"
+                           :step="1"
+                           :precision="0"
+          />
+        </el-form-item>
+        <el-form-item label="维修费用" prop="repairCosts">
+          <el-input-number v-model="form.repairCosts"
+                           :min="0"
+                           :precision="2"
+          />
+        </el-form-item>
+        <el-form-item label="折旧费用" prop="depreciationCost">
+          <el-input-number v-model="form.depreciationCost"
+                           :min="0"
+                           :precision="2"
+          />
+        </el-form-item>
+        <el-form-item label="投入时间" prop="putIntoTime">
+          <el-date-picker clearable
+            v-model="form.putIntoTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择投入时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用年限" prop="useLife">
+          <el-input-number v-model="form.useLife":min="0" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDeviceDepreciation" lang="ts">
+import { listDmsBaseDeviceDepreciation, getDmsBaseDeviceDepreciation, delDmsBaseDeviceDepreciation, addDmsBaseDeviceDepreciation, updateDmsBaseDeviceDepreciation } from '@/api/dms/dmsBaseDeviceDepreciation';
+import { DmsBaseDeviceDepreciationVO, DmsBaseDeviceDepreciationQuery, DmsBaseDeviceDepreciationForm } from '@/api/dms/dmsBaseDeviceDepreciation/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseDeviceDepreciationList = ref<DmsBaseDeviceDepreciationVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceDepreciationFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `设备`, visible: true },
+        { key: 3, label: `维修次数`, visible: true },
+        { key: 4, label: `维修费用`, visible: true },
+        { key: 5, label: `折旧费用`, visible: true },
+        { key: 6, label: `投入时间`, visible: true },
+        { key: 7, label: `使用年限`, visible: true },
+        { key: 8, label: `备注`, visible: true },
+        { key: 9, label: `激活标识`, visible: false },
+        { key: 10, label: `创建部门`, visible: false },
+        { key: 11, label: `创建人`, visible: false },
+        { key: 12, label: `创建时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseDeviceDepreciationForm = {
+  deviceDepreciationId: undefined,
+  machineId: undefined,
+  repairFrequency: undefined,
+  repairCosts: undefined,
+  depreciationCost: undefined,
+  putIntoTime: undefined,
+  useLife: undefined,
+  remark: undefined,
+  activeFlag: "1",
+  machineName: undefined,
+}
+const data = reactive<PageData<DmsBaseDeviceDepreciationForm, DmsBaseDeviceDepreciationQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceDepreciationId: undefined,
+    machineId: undefined,
+    repairFrequency: undefined,
+    repairCosts: undefined,
+    depreciationCost: undefined,
+    putIntoTime: undefined,
+    useLife: undefined,
+    activeFlag: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "change" }
+    ],
+    repairFrequency: [
+      { type: "number", min: 0, message: "维修次数必须为非负整数", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备折旧信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDeviceDepreciation(queryParams.value);
+  dmsBaseDeviceDepreciationList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseDeviceDepreciationFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseDeviceDepreciationVO[]) => {
+  ids.value = selection.map(item => item.deviceDepreciationId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备折旧信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseDeviceDepreciationVO) => {
+  reset();
+  const _deviceDepreciationId = row?.deviceDepreciationId || ids.value[0]
+  const res = await getDmsBaseDeviceDepreciation(_deviceDepreciationId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备折旧信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDeviceDepreciationFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.deviceDepreciationId) {
+        await updateDmsBaseDeviceDepreciation(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseDeviceDepreciation(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseDeviceDepreciationVO) => {
+  const _deviceDepreciationIds = row?.deviceDepreciationId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备折旧信息编号为"' + _deviceDepreciationIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseDeviceDepreciation(_deviceDepreciationIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseDeviceDepreciation/export', {
+    ...queryParams.value
+  }, `dmsBaseDeviceDepreciation_${new Date().getTime()}.xlsx`)
+}
+
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseDeviceInstall/index.vue b/src/views/dms/dmsBaseDeviceInstall/index.vue
new file mode 100644
index 0000000..e33c386
--- /dev/null
+++ b/src/views/dms/dmsBaseDeviceInstall/index.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键ID" prop="deviceInstallId">
+              <el-input v-model="queryParams.deviceInstallId" placeholder="请输入主键ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="设备" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="安装地点" prop="installPosition">
+              <el-input v-model="queryParams.installPosition" placeholder="请输入安装地点" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="安装时间" prop="installTime">
+              <el-date-picker clearable
+                v-model="queryParams.installTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择安装时间"
+              />
+            </el-form-item>
+<!--            <el-form-item label="安装人员" prop="installPerson">
+              <el-input v-model="queryParams.installPerson" placeholder="请输入安装人员" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseDeviceInstall:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseDeviceInstall:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseDeviceInstall:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseDeviceInstall:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseDeviceInstallList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="deviceInstallId" v-if="columns[0].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/>
+        <el-table-column label="安装地点" align="center" prop="installPosition" v-if="columns[3].visible"/>
+        <el-table-column label="安装时间" align="center" prop="installTime" width="180" v-if="columns[4].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.installTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="安装人员" align="center" prop="installPerson" v-if="columns[5].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDeviceInstall:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDeviceInstall:remove']" ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备安装信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDeviceInstallFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键ID" prop="deviceInstallId">
+          <el-input v-model="form.deviceInstallId" placeholder="请输入主键ID" />
+        </el-form-item>-->
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <!--          <el-input v-model="form.machineId" placeholder="请输入设备,只允许新增不允许修改"
+                    :disabled="form.deviceInstallId != null"
+          />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="安装地点" prop="installPosition">
+          <el-input v-model="form.installPosition" placeholder="请输入安装地点" />
+        </el-form-item>
+        <el-form-item label="安装时间" prop="installTime">
+          <el-date-picker clearable
+            v-model="form.installTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择安装时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="安装人员" prop="installPerson">
+          <el-input v-model="form.installPerson" placeholder="请输入安装人员" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDeviceInstall" lang="ts">
+import { listDmsBaseDeviceInstall, getDmsBaseDeviceInstall, delDmsBaseDeviceInstall, addDmsBaseDeviceInstall, updateDmsBaseDeviceInstall } from '@/api/dms/dmsBaseDeviceInstall';
+import { DmsBaseDeviceInstallVO, DmsBaseDeviceInstallQuery, DmsBaseDeviceInstallForm } from '@/api/dms/dmsBaseDeviceInstall/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseDeviceInstallList = ref<DmsBaseDeviceInstallVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceInstallFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键ID`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `设备`, visible: true },
+        { key: 3, label: `安装地点`, visible: true },
+        { key: 4, label: `安装时间`, visible: true },
+        { key: 5, label: `安装人员`, visible: true },
+        { key: 6, label: `激活标识`, visible: true },
+        { key: 7, label: `创建部门`, visible: false },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseDeviceInstallForm = {
+  deviceInstallId: undefined,
+  machineId: undefined,
+  installPosition: undefined,
+  installTime: undefined,
+  installPerson: undefined,
+  activeFlag: undefined,
+  machineName: undefined,
+}
+const data = reactive<PageData<DmsBaseDeviceInstallForm, DmsBaseDeviceInstallQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceInstallId: undefined,
+    machineId: undefined,
+    installPosition: undefined,
+    installTime: undefined,
+    installPerson: undefined,
+    activeFlag: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    machineId: [
+      { required: true, message: "设备不能为空", trigger: "blur" }
+    ],
+    installTime: [
+      { required: true, message: "安装时间不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备安装信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDeviceInstall(queryParams.value);
+  dmsBaseDeviceInstallList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseDeviceInstallFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseDeviceInstallVO[]) => {
+  ids.value = selection.map(item => item.deviceInstallId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备安装信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseDeviceInstallVO) => {
+  reset();
+  const _deviceInstallId = row?.deviceInstallId || ids.value[0]
+  const res = await getDmsBaseDeviceInstall(_deviceInstallId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备安装信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDeviceInstallFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.deviceInstallId) {
+        await updateDmsBaseDeviceInstall(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseDeviceInstall(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseDeviceInstallVO) => {
+  const _deviceInstallIds = row?.deviceInstallId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备安装信息编号为"' + _deviceInstallIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseDeviceInstall(_deviceInstallIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseDeviceInstall/export', {
+    ...queryParams.value
+  }, `dmsBaseDeviceInstall_${new Date().getTime()}.xlsx`)
+}
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null)
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseDevicePurchase/index.vue b/src/views/dms/dmsBaseDevicePurchase/index.vue
new file mode 100644
index 0000000..3b7f6fa
--- /dev/null
+++ b/src/views/dms/dmsBaseDevicePurchase/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键ID" prop="devicePurchaseId">
+              <el-input v-model="queryParams.devicePurchaseId" placeholder="请输入主键ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="计划编号" prop="workOrder">
+              <el-input v-model="queryParams.workOrder" placeholder="请输入计划编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="设备" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="采购人" prop="purchasePerson">
+              <el-input v-model="queryParams.purchasePerson" placeholder="请输入采购人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="采购地点" prop="purchasePosition">
+              <el-input v-model="queryParams.purchasePosition" placeholder="请输入采购地点" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="采购时间" prop="purchaseTime">
+              <el-date-picker clearable
+                v-model="queryParams.purchaseTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择采购时间"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseDevicePurchase:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseDevicePurchase:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseDevicePurchase:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseDevicePurchase:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseDevicePurchaseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="devicePurchaseId" v-if="columns[0].visible"/>
+        <el-table-column label="计划编号" align="center" prop="workOrder" v-if="columns[2].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[3].visible"/>
+        <el-table-column label="采购人" align="center" prop="purchasePerson" v-if="columns[4].visible"/>
+        <el-table-column label="采购地点" align="center" prop="purchasePosition" v-if="columns[5].visible"/>
+        <el-table-column label="采购时间" align="center" prop="purchaseTime" width="180" v-if="columns[6].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.purchaseTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDevicePurchase:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDevicePurchase:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改设备采购信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDevicePurchaseFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键ID" prop="devicePurchaseId">
+          <el-input v-model="form.devicePurchaseId" placeholder="请输入主键ID" />
+        </el-form-item>-->
+        <el-form-item label="计划编号" prop="workOrder">
+          <el-input v-model="form.workOrder" placeholder="请输入计划编号" />
+        </el-form-item>
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="采购人" prop="purchasePerson">
+          <el-input v-model="form.purchasePerson" placeholder="请输入采购人" />
+        </el-form-item>
+        <el-form-item label="采购地点" prop="purchasePosition">
+          <el-input v-model="form.purchasePosition" placeholder="请输入采购地点" />
+        </el-form-item>
+        <el-form-item label="采购时间" prop="purchaseTime">
+          <el-date-picker clearable
+            v-model="form.purchaseTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择采购时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDevicePurchase" lang="ts">
+import { listDmsBaseDevicePurchase, getDmsBaseDevicePurchase, delDmsBaseDevicePurchase, addDmsBaseDevicePurchase, updateDmsBaseDevicePurchase } from '@/api/dms/dmsBaseDevicePurchase';
+import { DmsBaseDevicePurchaseVO, DmsBaseDevicePurchaseQuery, DmsBaseDevicePurchaseForm } from '@/api/dms/dmsBaseDevicePurchase/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const dmsBaseDevicePurchaseList = ref<DmsBaseDevicePurchaseVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDevicePurchaseFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键ID`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `计划编号`, visible: true },
+        { key: 3, label: `设备`, visible: true },
+        { key: 4, label: `采购人`, visible: true },
+        { key: 5, label: `采购地点`, visible: true },
+        { key: 6, label: `采购时间`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+        { key: 8, label: `创建部门`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { key: 10, label: `创建时间`, visible: false },
+        { key: 11, label: `更新人`, visible: false },
+        { key: 12, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseDevicePurchaseForm = {
+  devicePurchaseId: undefined,
+  workOrder: undefined,
+  machineId: undefined,
+  purchasePerson: undefined,
+  purchasePosition: undefined,
+  purchaseTime: undefined,
+  remark: undefined,
+  machineName: undefined,
+}
+const data = reactive<PageData<DmsBaseDevicePurchaseForm, DmsBaseDevicePurchaseQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    devicePurchaseId: undefined,
+    workOrder: undefined,
+    machineId: undefined,
+    purchasePerson: undefined,
+    purchasePosition: undefined,
+    purchaseTime: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    purchasePerson: [
+      { required: true, message: "采购人不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备采购信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDevicePurchase(queryParams.value);
+  dmsBaseDevicePurchaseList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseDevicePurchaseFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseDevicePurchaseVO[]) => {
+  ids.value = selection.map(item => item.devicePurchaseId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备采购信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseDevicePurchaseVO) => {
+  reset();
+  const _devicePurchaseId = row?.devicePurchaseId || ids.value[0]
+  const res = await getDmsBaseDevicePurchase(_devicePurchaseId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备采购信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDevicePurchaseFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.devicePurchaseId) {
+        await updateDmsBaseDevicePurchase(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseDevicePurchase(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseDevicePurchaseVO) => {
+  const _devicePurchaseIds = row?.devicePurchaseId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备采购信息编号为"' + _devicePurchaseIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseDevicePurchase(_devicePurchaseIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseDevicePurchase/export', {
+    ...queryParams.value
+  }, `dmsBaseDevicePurchase_${new Date().getTime()}.xlsx`)
+}
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseDeviceSupplier/index.vue b/src/views/dms/dmsBaseDeviceSupplier/index.vue
new file mode 100644
index 0000000..a86fe2c
--- /dev/null
+++ b/src/views/dms/dmsBaseDeviceSupplier/index.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="supplierId">
+              <el-input v-model="queryParams.supplierId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="供应商编号" prop="supplierCode" label-width="100px">
+              <el-input v-model="queryParams.supplierCode" placeholder="请输入供应商编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商名称" prop="supplierName" label-width="100px">
+              <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="供应商联系人" prop="supplierPerson">
+              <el-input v-model="queryParams.supplierPerson" placeholder="请输入供应商联系人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商电话" prop="supplierTel">
+              <el-input v-model="queryParams.supplierTel" placeholder="请输入供应商电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商地址" prop="supplierAddress">
+              <el-input v-model="queryParams.supplierAddress" placeholder="请输入供应商地址" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="供应商状态" prop="supplierStatus" label-width="100px">
+              <el-select v-model="queryParams.supplierStatus" placeholder="请选择供应商状态" clearable >
+                <el-option v-for="dict in supplier_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag" label-width="100px">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseDeviceSupplier:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseDeviceSupplier:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseDeviceSupplier:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseDeviceSupplier:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseDeviceSupplierList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="supplierId" v-if="columns[0].visible"/>
+        <el-table-column label="供应商编号" align="center" prop="supplierCode" v-if="columns[2].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[3].visible"/>
+        <el-table-column label="供应商联系人" align="center" prop="supplierPerson" v-if="columns[4].visible"/>
+        <el-table-column label="供应商电话" align="center" prop="supplierTel" v-if="columns[5].visible"/>
+        <el-table-column label="供应商地址" align="center" prop="supplierAddress" v-if="columns[6].visible"/>
+        <el-table-column label="供应商状态" align="center" prop="supplierStatus" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="supplier_status" :value="scope.row.supplierStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDeviceSupplier:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDeviceSupplier:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备供应商信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDeviceSupplierFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="供应商编号" prop="supplierCode">
+          <el-input v-model="form.supplierCode" placeholder="请输入供应商编号" />
+        </el-form-item>
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+        </el-form-item>
+        <el-form-item label="供应商联系人" prop="supplierPerson">
+          <el-input v-model="form.supplierPerson" placeholder="请输入供应商联系人" />
+        </el-form-item>
+        <el-form-item label="供应商电话" prop="supplierTel">
+          <el-input v-model="form.supplierTel" placeholder="请输入供应商电话" />
+        </el-form-item>
+        <el-form-item label="供应商地址" prop="supplierAddress">
+          <el-input v-model="form.supplierAddress" placeholder="请输入供应商地址" />
+        </el-form-item>
+        <el-form-item label="供应商状态" prop="supplierStatus">
+          <el-select v-model="form.supplierStatus" placeholder="请选择供应商状态">
+            <el-option
+                v-for="dict in supplier_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDeviceSupplier" lang="ts">
+import { listDmsBaseDeviceSupplier, getDmsBaseDeviceSupplier, delDmsBaseDeviceSupplier, addDmsBaseDeviceSupplier, updateDmsBaseDeviceSupplier } from '@/api/dms/dmsBaseDeviceSupplier';
+import { DmsBaseDeviceSupplierVO, DmsBaseDeviceSupplierQuery, DmsBaseDeviceSupplierForm } from '@/api/dms/dmsBaseDeviceSupplier/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { supplier_status, active_flag } = toRefs<any>(proxy?.useDict('supplier_status', 'active_flag'));
+
+const dmsBaseDeviceSupplierList = ref<DmsBaseDeviceSupplierVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceSupplierFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `供应商编号`, visible: true },
+        { key: 3, label: `供应商名称`, visible: true },
+        { key: 4, label: `供应商联系人`, visible: true },
+        { key: 5, label: `供应商电话`, visible: true },
+        { key: 6, label: `供应商地址`, visible: true },
+        { key: 7, label: `供应商状态`, visible: true },
+        { key: 8, label: `激活标识`, visible: true },
+        { key: 9, label: `备注`, visible: true },
+        { key: 10, label: `创建部门`, visible: false },
+        { key: 11, label: `创建人`, visible: false },
+        { key: 12, label: `创建时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseDeviceSupplierForm = {
+  supplierId: undefined,
+  supplierCode: undefined,
+  supplierName: undefined,
+  supplierPerson: undefined,
+  supplierTel: undefined,
+  supplierAddress: undefined,
+  supplierStatus: undefined,
+  activeFlag: "1",
+  remark: undefined,
+}
+const data = reactive<PageData<DmsBaseDeviceSupplierForm, DmsBaseDeviceSupplierQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    supplierId: undefined,
+    supplierCode: undefined,
+    supplierName: undefined,
+    supplierPerson: undefined,
+    supplierTel: undefined,
+    supplierAddress: undefined,
+    supplierStatus: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    supplierCode: [
+      { required: true, message: "供应商编号不能为空", trigger: "blur" }
+    ],
+    supplierName: [
+      { required: true, message: "供应商名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备供应商信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDeviceSupplier(queryParams.value);
+  dmsBaseDeviceSupplierList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseDeviceSupplierFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseDeviceSupplierVO[]) => {
+  ids.value = selection.map(item => item.supplierId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备供应商信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseDeviceSupplierVO) => {
+  reset();
+  const _supplierId = row?.supplierId || ids.value[0]
+  const res = await getDmsBaseDeviceSupplier(_supplierId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备供应商信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDeviceSupplierFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.supplierId) {
+        await updateDmsBaseDeviceSupplier(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseDeviceSupplier(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseDeviceSupplierVO) => {
+  const _supplierIds = row?.supplierId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseDeviceSupplier(_supplierIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseDeviceSupplier/export', {
+    ...queryParams.value
+  }, `dmsBaseDeviceSupplier_${new Date().getTime()}.xlsx`)
+}
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseOutsourcingInfo/index.vue b/src/views/dms/dmsBaseOutsourcingInfo/index.vue
new file mode 100644
index 0000000..065e0aa
--- /dev/null
+++ b/src/views/dms/dmsBaseOutsourcingInfo/index.vue
@@ -0,0 +1,309 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="outsourcingId">
+              <el-input v-model="queryParams.outsourcingId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="外协编号" prop="outsourcingCode">
+              <el-input v-model="queryParams.outsourcingCode" placeholder="请输入外协编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="单位名称" prop="outsourcingName">
+              <el-input v-model="queryParams.outsourcingName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="外协联系人" prop="outsourcingPerson">
+              <el-input v-model="queryParams.outsourcingPerson" placeholder="请输入外协联系人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="外协电话" prop="outsourcingTel">
+              <el-input v-model="queryParams.outsourcingTel" placeholder="请输入外协电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="外协地址" prop="outsourcingAddress">
+              <el-input v-model="queryParams.outsourcingAddress" placeholder="请输入外协地址" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseOutsourcingInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseOutsourcingInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseOutsourcingInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseOutsourcingInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseOutsourcingInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="outsourcingId" v-if="columns[0].visible"/>
+        <el-table-column label="外协编号" align="center" prop="outsourcingCode" v-if="columns[2].visible"/>
+        <el-table-column label="单位名称" align="center" prop="outsourcingName" v-if="columns[3].visible"/>
+        <el-table-column label="外协联系人" align="center" prop="outsourcingPerson" v-if="columns[4].visible"/>
+        <el-table-column label="外协电话" align="center" prop="outsourcingTel" v-if="columns[5].visible"/>
+        <el-table-column label="外协地址" align="center" prop="outsourcingAddress" v-if="columns[6].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseOutsourcingInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseOutsourcingInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改外协信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseOutsourcingInfoFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="outsourcingId">
+          <el-input v-model="form.outsourcingId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="外协编号" prop="outsourcingCode">
+          <el-input v-model="form.outsourcingCode" placeholder="请输入外协编号" />
+        </el-form-item>
+        <el-form-item label="单位名称" prop="outsourcingName">
+          <el-input v-model="form.outsourcingName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="外协联系人" prop="outsourcingPerson">
+          <el-input v-model="form.outsourcingPerson" placeholder="请输入外协联系人" />
+        </el-form-item>
+        <el-form-item label="外协电话" prop="outsourcingTel">
+          <el-input v-model="form.outsourcingTel" placeholder="请输入外协电话" />
+        </el-form-item>
+        <el-form-item label="外协地址" prop="outsourcingAddress">
+          <el-input v-model="form.outsourcingAddress" placeholder="请输入外协地址" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseOutsourcingInfo" lang="ts">
+import { listDmsBaseOutsourcingInfo, getDmsBaseOutsourcingInfo, delDmsBaseOutsourcingInfo, addDmsBaseOutsourcingInfo, updateDmsBaseOutsourcingInfo } from '@/api/dms/dmsBaseOutsourcingInfo';
+import { DmsBaseOutsourcingInfoVO, DmsBaseOutsourcingInfoQuery, DmsBaseOutsourcingInfoForm } from '@/api/dms/dmsBaseOutsourcingInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseOutsourcingInfoList = ref<DmsBaseOutsourcingInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseOutsourcingInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `外协编号`, visible: true },
+        { key: 3, label: `单位名称`, visible: true },
+        { key: 4, label: `外协联系人`, visible: true },
+        { key: 5, label: `外协电话`, visible: true },
+        { key: 6, label: `外协地址`, visible: true },
+        { key: 7, label: `激活标识`, visible: true },
+        { key: 8, label: `备注`, visible: true },
+        { key: 9, label: `创建部门`, visible: false },
+        { key: 10, label: `创建人`, visible: false },
+        { key: 11, label: `创建时间`, visible: false },
+        { key: 12, label: `更新人`, visible: false },
+        { key: 13, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseOutsourcingInfoForm = {
+  outsourcingId: undefined,
+  outsourcingCode: undefined,
+  outsourcingName: undefined,
+  outsourcingPerson: undefined,
+  outsourcingTel: undefined,
+  outsourcingAddress: undefined,
+  activeFlag: "1",
+  remark: undefined,
+}
+const data = reactive<PageData<DmsBaseOutsourcingInfoForm, DmsBaseOutsourcingInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    outsourcingId: undefined,
+    outsourcingCode: undefined,
+    outsourcingName: undefined,
+    outsourcingPerson: undefined,
+    outsourcingTel: undefined,
+    outsourcingAddress: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    outsourcingCode: [
+      { required: true, message: "外协编号不能为空", trigger: "blur" }
+    ],
+    outsourcingName: [
+      { required: true, message: "单位名称不能为空", trigger: "blur" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "change" }
+    ],
+/*    outsourcingTel: [
+      //手机号：匹配以1开头，第二位为3至9之间的数字，后续跟9位数字的字符串；触发校验的事件为失去焦点时。
+      { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur'}
+    ]*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询外协信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseOutsourcingInfo(queryParams.value);
+  dmsBaseOutsourcingInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseOutsourcingInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseOutsourcingInfoVO[]) => {
+  ids.value = selection.map(item => item.outsourcingId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加外协信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseOutsourcingInfoVO) => {
+  reset();
+  const _outsourcingId = row?.outsourcingId || ids.value[0]
+  const res = await getDmsBaseOutsourcingInfo(_outsourcingId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改外协信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseOutsourcingInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.outsourcingId) {
+        await updateDmsBaseOutsourcingInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseOutsourcingInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseOutsourcingInfoVO) => {
+  const _outsourcingIds = row?.outsourcingId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除外协信息编号为"' + _outsourcingIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseOutsourcingInfo(_outsourcingIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseOutsourcingInfo/export', {
+    ...queryParams.value
+  }, `dmsBaseOutsourcingInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsBaseTransferInfo/index.vue b/src/views/dms/dmsBaseTransferInfo/index.vue
new file mode 100644
index 0000000..f88f1ce
--- /dev/null
+++ b/src/views/dms/dmsBaseTransferInfo/index.vue
@@ -0,0 +1,350 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键ID" prop="transferInfoId">
+              <el-input v-model="queryParams.transferInfoId" placeholder="请输入主键ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="设备" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="设备原位置" prop="devicePosition">
+              <el-input v-model="queryParams.devicePosition" placeholder="请输入设备原位置" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备转移位置" prop="devicePositionNew">
+              <el-input v-model="queryParams.devicePositionNew" placeholder="请输入设备转移位置" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备转移人员" prop="devicePositionOperator">
+              <el-input v-model="queryParams.devicePositionOperator" placeholder="请输入设备转移人员" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备转移原因" prop="devicePositionReason">
+              <el-input v-model="queryParams.devicePositionReason" placeholder="请输入设备转移原因" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="设备转移时间" prop="deviceTransferTime" label-width="100px">
+              <el-date-picker clearable
+                v-model="queryParams.deviceTransferTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择设备转移时间"
+              />
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseTransferInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseTransferInfo:edit']">修改</el-button>
+          </el-col>
+<!--          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseTransferInfo:remove']">删除</el-button>
+          </el-col>-->
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseTransferInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseTransferInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键" align="center" prop="transferInfoId" v-if="columns[0].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/>
+        <el-table-column label="设备原位置" align="center" prop="devicePosition" v-if="columns[3].visible"/>
+        <el-table-column label="设备转移位置" align="center" prop="devicePositionNew" v-if="columns[4].visible"/>
+        <el-table-column label="设备转移人员" align="center" prop="devicePositionOperator" v-if="columns[5].visible"/>
+        <el-table-column label="设备转移原因" align="center" prop="devicePositionReason" v-if="columns[6].visible"/>
+        <el-table-column label="设备转移时间" align="center" prop="deviceTransferTime" width="180" v-if="columns[7].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.deviceTransferTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseTransferInfo:edit']"></el-button>
+            </el-tooltip>
+<!--            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseTransferInfo:remove']"></el-button>
+            </el-tooltip>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改设备转移信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseTransferInfoFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键ID" prop="transferInfoId">
+          <el-input v-model="form.transferInfoId" placeholder="请输入主键ID" />
+        </el-form-item>-->
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备原位置" prop="devicePosition">
+          <el-input v-model="form.devicePosition" placeholder="请输入设备原位置" />
+        </el-form-item>
+        <el-form-item label="设备转移位置" prop="devicePositionNew">
+          <el-input v-model="form.devicePositionNew" placeholder="请输入设备转移位置" />
+        </el-form-item>
+        <el-form-item label="设备转移人员" prop="devicePositionOperator">
+          <el-input v-model="form.devicePositionOperator" placeholder="请输入设备转移人员" />
+        </el-form-item>
+        <el-form-item label="设备转移原因" prop="devicePositionReason">
+          <el-input v-model="form.devicePositionReason" placeholder="请输入设备转移原因" />
+        </el-form-item>
+        <el-form-item label="设备转移时间" prop="deviceTransferTime">
+          <el-date-picker clearable
+            v-model="form.deviceTransferTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择设备转移时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseTransferInfo" lang="ts">
+import { listDmsBaseTransferInfo, getDmsBaseTransferInfo, delDmsBaseTransferInfo, addDmsBaseTransferInfo, updateDmsBaseTransferInfo } from '@/api/dms/dmsBaseTransferInfo';
+import { DmsBaseTransferInfoVO, DmsBaseTransferInfoQuery, DmsBaseTransferInfoForm } from '@/api/dms/dmsBaseTransferInfo/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseTransferInfoList = ref<DmsBaseTransferInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseTransferInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键ID`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `设备`, visible: true },
+        { key: 3, label: `设备原位置`, visible: true },
+        { key: 4, label: `设备转移位置`, visible: true },
+        { key: 5, label: `设备转移人员`, visible: true },
+        { key: 6, label: `设备转移原因`, visible: true },
+        { key: 7, label: `设备转移时间`, visible: true },
+        { key: 8, label: `备注`, visible: true },
+        { key: 9, label: `激活标识`, visible: true },
+        { key: 10, label: `创建部门`, visible: false },
+        { key: 11, label: `创建人`, visible: false },
+        { key: 12, label: `创建时间`, visible: false },
+        { key: 13, label: `更新人`, visible: false },
+        { key: 14, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseTransferInfoForm = {
+  transferInfoId: undefined,
+  machineId: undefined,
+  devicePosition: undefined,
+  devicePositionNew: undefined,
+  devicePositionOperator: undefined,
+  devicePositionReason: undefined,
+  deviceTransferTime: undefined,
+  remark: undefined,
+  activeFlag: "1",
+  machineName: undefined,
+}
+const data = reactive<PageData<DmsBaseTransferInfoForm, DmsBaseTransferInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    transferInfoId: undefined,
+    machineId: undefined,
+    devicePosition: undefined,
+    devicePositionNew: undefined,
+    devicePositionOperator: undefined,
+    devicePositionReason: undefined,
+    deviceTransferTime: undefined,
+    activeFlag: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    machineId: [
+      { required: true, message: "设备不能为空", trigger: "blur" }
+    ],
+    devicePositionNew: [
+      { required: true, message: "设备转移位置不能为空", trigger: "blur" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "blur" }
+    ],
+    deviceTransferTime: [
+      { required: true, message: "设备转移时间不能为空", trigger: "blur"}
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备转移信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseTransferInfo(queryParams.value);
+  dmsBaseTransferInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseTransferInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseTransferInfoVO[]) => {
+  ids.value = selection.map(item => item.transferInfoId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备转移信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseTransferInfoVO) => {
+  reset();
+  const _transferInfoId = row?.transferInfoId || ids.value[0]
+  const res = await getDmsBaseTransferInfo(_transferInfoId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备转移信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseTransferInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.transferInfoId) {
+        await updateDmsBaseTransferInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsBaseTransferInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseTransferInfoVO) => {
+  const _transferInfoIds = row?.transferInfoId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备转移信息编号为"' + _transferInfoIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseTransferInfo(_transferInfoIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseTransferInfo/export', {
+    ...queryParams.value
+  }, `dmsBaseTransferInfo_${new Date().getTime()}.xlsx`)
+}
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>

From 27fc40f7bc5bbc024017c3df64b45480c4faa47a Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 20 Mar 2025 20:44:27 +0800
Subject: [PATCH 3/7] =?UTF-8?q?add(dms):=20=E6=96=B0=E5=A2=9E=E4=BA=86?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=92=8C=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增了机台信息相关接口和类型定义
- 修改了报警详情信息相关去除了多余的分号
---
 src/api/dms/baseAlarmDetail/index.ts    |  12 +-
 src/api/dms/dmsBaseMachineInfo/index.ts |  77 ++++++++++
 src/api/dms/dmsBaseMachineInfo/types.ts | 193 ++++++++++++++++++++++++
 src/views/dms/baseAlarmDetail/index.vue |  10 +-
 4 files changed, 281 insertions(+), 11 deletions(-)
 create mode 100644 src/api/dms/dmsBaseMachineInfo/index.ts
 create mode 100644 src/api/dms/dmsBaseMachineInfo/types.ts

diff --git a/src/api/dms/baseAlarmDetail/index.ts b/src/api/dms/baseAlarmDetail/index.ts
index 05af723..59a4033 100644
--- a/src/api/dms/baseAlarmDetail/index.ts
+++ b/src/api/dms/baseAlarmDetail/index.ts
@@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
 import { BaseAlarmDetailVO, BaseAlarmDetailForm, BaseAlarmDetailQuery } from '@/api/dms/baseAlarmDetail/types';
 
 /**
- * 查询报警详情信息;列表
+ * 查询报警详情信息列表
  * @param query
  * @returns {*}
  */
@@ -17,7 +17,7 @@ export const listBaseAlarmDetail = (query?: BaseAlarmDetailQuery): AxiosPromise<
 };
 
 /**
- * 查询报警详情信息;详细
+ * 查询报警详情信息详细
  * @param alarmDetailId
  */
 export const getBaseAlarmDetail = (alarmDetailId: string | number): AxiosPromise<BaseAlarmDetailVO> => {
@@ -28,7 +28,7 @@ export const getBaseAlarmDetail = (alarmDetailId: string | number): AxiosPromise
 };
 
 /**
- * 新增报警详情信息;
+ * 新增报警详情信息
  * @param data
  */
 export const addBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
@@ -40,7 +40,7 @@ export const addBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
 };
 
 /**
- * 修改报警详情信息;
+ * 修改报警详情信息
  * @param data
  */
 export const updateBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
@@ -52,7 +52,7 @@ export const updateBaseAlarmDetail = (data: BaseAlarmDetailForm) => {
 };
 
 /**
- * 删除报警详情信息;
+ * 删除报警详情信息
  * @param alarmDetailId
  */
 export const delBaseAlarmDetail = (alarmDetailId: string | number | Array<string | number>) => {
@@ -64,7 +64,7 @@ export const delBaseAlarmDetail = (alarmDetailId: string | number | Array<string
 
 
 /**
- * 下拉框查询报警详情信息;列表
+ * 下拉框查询报警详情信息列表
  * @param query
  * @returns {*}
  */
diff --git a/src/api/dms/dmsBaseMachineInfo/index.ts b/src/api/dms/dmsBaseMachineInfo/index.ts
new file mode 100644
index 0000000..d4a87cd
--- /dev/null
+++ b/src/api/dms/dmsBaseMachineInfo/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery } from '@/api/dms/dmsBaseMachineInfo/types';
+
+/**
+ * 查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseMachineInfoIn = (query?: ProdBaseMachineInfoQuery): AxiosPromise<ProdBaseMachineInfoVO[]> => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机台信息详细
+ * @param machineId
+ */
+export const getDmsBaseMachineInfo  = (machineId: string | number): AxiosPromise<ProdBaseMachineInfoVO> => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/' + machineId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机台信息
+ * @param data
+ */
+/*export const addProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo',
+    method: 'post',
+    data: data
+  });
+};*/
+
+/**
+ * 修改机台信息
+ * @param data
+ */
+/*export const updateProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo',
+    method: 'put',
+    data: data
+  });
+};*/
+
+/**
+ * 删除机台信息
+ * @param machineId
+ */
+/*export const delDmsBaseMachineInfo  = (machineId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseMachineInfo/' + machineId,
+    method: 'delete'
+  });
+};*/
+
+
+/**
+ * 下拉框查询机台信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseMachineInfoList  (query) {
+    return request({
+        url: '/dms/dmsBaseMachineInfo/getDmsBaseMachineInfoList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseMachineInfo/types.ts b/src/api/dms/dmsBaseMachineInfo/types.ts
new file mode 100644
index 0000000..ebcfdb2
--- /dev/null
+++ b/src/api/dms/dmsBaseMachineInfo/types.ts
@@ -0,0 +1,193 @@
+export interface ProdBaseMachineInfoVO {
+  /**
+   * 主键标识
+   */
+  machineId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation: string;
+
+  /**
+   * 机台类型
+   */
+  machineType: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec: string;
+
+  /**
+   * 供应商
+   */
+  supplierId: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface ProdBaseMachineInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  baseMachineProcessList?: [];
+
+}
+
+export interface ProdBaseMachineInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  machineId?: string | number;
+
+  /**
+   * 机台编号
+   */
+  machineCode?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;
+
+  /**
+   * 资产编号
+   */
+  assetNumber?: string;
+
+  /**
+   * 机台位置
+   */
+  machineLocation?: string;
+
+  /**
+   * 机台类型
+   */
+  machineType?: string;
+
+  /**
+   * 机台规格
+   */
+  machineSpec?: string;
+
+  /**
+   * 供应商
+   */
+  supplierId?: string | number;
+
+  /**
+   * 机台状态(0停用 1启用 2报废)
+   */
+  machineStatus?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/dms/baseAlarmDetail/index.vue b/src/views/dms/baseAlarmDetail/index.vue
index b4844a0..464d97a 100644
--- a/src/views/dms/baseAlarmDetail/index.vue
+++ b/src/views/dms/baseAlarmDetail/index.vue
@@ -86,7 +86,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
-    <!-- 添加或修改报警详情信息;对话框 -->
+    <!-- 添加或修改报警详情信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="baseAlarmDetailFormRef" :model="form" :rules="rules" label-width="80px">
 <!--        <el-form-item label="报警详细信息ID" prop="alarmDetailId">
@@ -224,7 +224,7 @@ const data = reactive<PageData<BaseAlarmDetailForm, BaseAlarmDetailQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询报警详情信息;列表 */
+/** 查询报警详情信息列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listBaseAlarmDetail(queryParams.value);
@@ -268,7 +268,7 @@ const handleSelectionChange = (selection: BaseAlarmDetailVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加报警详情信息;";
+  dialog.title = "添加报警详情信息";
 }
 
 /** 修改按钮操作 */
@@ -278,7 +278,7 @@ const handleUpdate = async (row?: BaseAlarmDetailVO) => {
   const res = await getBaseAlarmDetail(_alarmDetailId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改报警详情信息;";
+  dialog.title = "修改报警详情信息";
 }
 
 /** 提交按钮 */
@@ -301,7 +301,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: BaseAlarmDetailVO) => {
   const _alarmDetailIds = row?.alarmDetailId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除报警详情信息;编号为"' + _alarmDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除报警详情信息编号为"' + _alarmDetailIds + '"的数据项？').finally(() => loading.value = false);
   await delBaseAlarmDetail(_alarmDetailIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();

From 99be271e6b0349bdfaed4b5a8ddd7e10e21bcacc Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 20 Mar 2025 20:47:56 +0800
Subject: [PATCH 4/7] =?UTF-8?q?add(dms):=20=E9=87=87=E8=B4=AD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在设备采购管理页面中添加了 getDmsBaseMachineInfoList 接口的引用
---
 src/views/dms/dmsBaseDevicePurchase/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/dms/dmsBaseDevicePurchase/index.vue b/src/views/dms/dmsBaseDevicePurchase/index.vue
index 3b7f6fa..0b8fcf0 100644
--- a/src/views/dms/dmsBaseDevicePurchase/index.vue
+++ b/src/views/dms/dmsBaseDevicePurchase/index.vue
@@ -132,6 +132,7 @@
 <script setup name="DmsBaseDevicePurchase" lang="ts">
 import { listDmsBaseDevicePurchase, getDmsBaseDevicePurchase, delDmsBaseDevicePurchase, addDmsBaseDevicePurchase, updateDmsBaseDevicePurchase } from '@/api/dms/dmsBaseDevicePurchase';
 import { DmsBaseDevicePurchaseVO, DmsBaseDevicePurchaseQuery, DmsBaseDevicePurchaseForm } from '@/api/dms/dmsBaseDevicePurchase/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 

From b3c4087b9f427399ccddb263fd8a72b70a8e3b7e Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 21 Mar 2025 10:18:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?change(dms):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=BD=AC=E7=A7=BB=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=E8=AE=BE=E5=A4=87=E5=8E=9F=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dms/dmsBaseTransferInfo/index.vue | 22 ++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/dms/dmsBaseTransferInfo/index.vue b/src/views/dms/dmsBaseTransferInfo/index.vue
index f88f1ce..bbab924 100644
--- a/src/views/dms/dmsBaseTransferInfo/index.vue
+++ b/src/views/dms/dmsBaseTransferInfo/index.vue
@@ -104,8 +104,7 @@
           <el-input v-model="form.transferInfoId" placeholder="请输入主键ID" />
         </el-form-item>-->
         <el-form-item label="设备" prop="machineId">
-<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
-          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable @change="handleMachineChange">
             <el-option v-for="item in machineOptions"
                        :key="item.machineId"
                        :label="item.machineName"
@@ -113,7 +112,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="设备原位置" prop="devicePosition">
-          <el-input v-model="form.devicePosition" placeholder="请输入设备原位置" />
+          <el-input v-model="form.devicePosition" placeholder="请输入设备原位置" :disabled="true" />
         </el-form-item>
         <el-form-item label="设备转移位置" prop="devicePositionNew">
           <el-input v-model="form.devicePositionNew" placeholder="请输入设备转移位置" />
@@ -289,6 +288,7 @@ const handleSelectionChange = (selection: DmsBaseTransferInfoVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  getMachineOptions();
   dialog.visible = true;
   dialog.title = "添加设备转移信息";
 }
@@ -296,6 +296,7 @@ const handleAdd = () => {
 /** 修改按钮操作 */
 const handleUpdate = async (row?: DmsBaseTransferInfoVO) => {
   reset();
+  getMachineOptions();
   const _transferInfoId = row?.transferInfoId || ids.value[0]
   const res = await getDmsBaseTransferInfo(_transferInfoId);
   Object.assign(form.value, res.data);
@@ -337,14 +338,25 @@ const handleExport = () => {
 }
 
 // 获取设备下拉框数据
-let machineOptions = ref<any[]>([]);
+let machineOptions = ref([]);
 const getMachineOptions = async () => {
   const res = await getDmsBaseMachineInfoList(null);
   machineOptions.value = res.data;
 }
 
+/** 设备选择变更处理 */
+const handleMachineChange = (machineId) => {
+  if (machineId) {
+    const selectedMachine = machineOptions.value.find(m => m.machineId === machineId);
+    if (selectedMachine) {
+      form.value.devicePosition = selectedMachine.machineLocation || '';
+    }
+  } else {
+    form.value.devicePosition = '';
+  }
+}
+
 onMounted(() => {
-  getMachineOptions();
   getList();
 });
 </script>

From 610003dcc4812d139b98cba8b4ca662de7c2261c Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 21 Mar 2025 14:52:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?add(dms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=A1=A3=E6=A1=88=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增设备档案信息相关实体类、控制器、服务接口及其实现类
- 添加设备档案信息的前端页面组件和API接口
- 获取设备下拉框数据
- 重点是提交时对文件路径的处理
---
 src/api/dms/dmsBaseDeviceFiles/index.ts    |  77 +++++
 src/api/dms/dmsBaseDeviceFiles/types.ts    | 140 +++++++++
 src/views/dms/dmsBaseDeviceFiles/index.vue | 319 +++++++++++++++++++++
 3 files changed, 536 insertions(+)
 create mode 100644 src/api/dms/dmsBaseDeviceFiles/index.ts
 create mode 100644 src/api/dms/dmsBaseDeviceFiles/types.ts
 create mode 100644 src/views/dms/dmsBaseDeviceFiles/index.vue

diff --git a/src/api/dms/dmsBaseDeviceFiles/index.ts b/src/api/dms/dmsBaseDeviceFiles/index.ts
new file mode 100644
index 0000000..b816598
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceFiles/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBaseDeviceFilesVO, DmsBaseDeviceFilesForm, DmsBaseDeviceFilesQuery } from '@/api/dms/dmsBaseDeviceFiles/types';
+
+/**
+ * 查询设备档案信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBaseDeviceFiles = (query?: DmsBaseDeviceFilesQuery): AxiosPromise<DmsBaseDeviceFilesVO[]> => {
+  return request({
+    url: '/dms/dmsBaseDeviceFiles/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备档案信息详细
+ * @param deviceFilesId
+ */
+export const getDmsBaseDeviceFiles = (deviceFilesId: string | number): AxiosPromise<DmsBaseDeviceFilesVO> => {
+  return request({
+    url: '/dms/dmsBaseDeviceFiles/' + deviceFilesId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备档案信息
+ * @param data
+ */
+export const addDmsBaseDeviceFiles = (data: DmsBaseDeviceFilesForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceFiles',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备档案信息
+ * @param data
+ */
+export const updateDmsBaseDeviceFiles = (data: DmsBaseDeviceFilesForm) => {
+  return request({
+    url: '/dms/dmsBaseDeviceFiles',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备档案信息
+ * @param deviceFilesId
+ */
+export const delDmsBaseDeviceFiles = (deviceFilesId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBaseDeviceFiles/' + deviceFilesId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询设备档案信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBaseDeviceFilesList (query) {
+    return request({
+        url: '/dms/dmsBaseDeviceFiles/getDmsBaseDeviceFilesList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBaseDeviceFiles/types.ts b/src/api/dms/dmsBaseDeviceFiles/types.ts
new file mode 100644
index 0000000..9bd90f7
--- /dev/null
+++ b/src/api/dms/dmsBaseDeviceFiles/types.ts
@@ -0,0 +1,140 @@
+export interface DmsBaseDeviceFilesVO {
+  /**
+   * 主键标识
+   */
+  deviceFilesId: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId: string | number;
+
+  /**
+   * 档案编号
+   */
+  filesCode: string;
+
+  /**
+   * 档案名称
+   */
+  filesName: string;
+
+  /**
+   * 档案路径
+   */
+  filesPath: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 机台名称
+   */
+  machineName: string;//join
+
+
+
+}
+
+export interface DmsBaseDeviceFilesForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  deviceFilesId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 档案编号
+   */
+  filesCode?: string;
+
+  /**
+   * 档案名称
+   */
+  filesName?: string;
+
+  /**
+   * 档案路径
+   */
+  filesPath?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+  /**
+   * 文件
+   */
+  file?: string | [];
+
+}
+
+export interface DmsBaseDeviceFilesQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  deviceFilesId?: string | number;
+
+  /**
+   * 设备ID，关联prod_base_machine_info的machine_id
+   */
+  machineId?: string | number;
+
+  /**
+   * 档案编号
+   */
+  filesCode?: string;
+
+  /**
+   * 档案名称
+   */
+  filesName?: string;
+
+  /**
+   * 档案路径
+   */
+  filesPath?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 机台名称
+   */
+  machineName?: string;//join
+
+
+}
+
+
+
diff --git a/src/views/dms/dmsBaseDeviceFiles/index.vue b/src/views/dms/dmsBaseDeviceFiles/index.vue
new file mode 100644
index 0000000..ed79c5e
--- /dev/null
+++ b/src/views/dms/dmsBaseDeviceFiles/index.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="deviceFilesId">
+              <el-input v-model="queryParams.deviceFilesId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备" prop="machineId">
+              <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="档案编号" prop="filesCode">
+              <el-input v-model="queryParams.filesCode" placeholder="请输入档案编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="档案名称" prop="filesName">
+              <el-input v-model="queryParams.filesName" placeholder="请输入档案名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBaseDeviceFiles:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBaseDeviceFiles:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBaseDeviceFiles:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBaseDeviceFiles:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="dmsBaseDeviceFilesList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="deviceFilesId" v-if="columns[0].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[2].visible"/>
+        <el-table-column label="档案编号" align="center" prop="filesCode" v-if="columns[3].visible"/>
+        <el-table-column label="档案名称" align="center" prop="filesName" v-if="columns[4].visible"/>
+        <el-table-column label="档案路径" align="center" prop="filesPath" v-if="columns[5].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBaseDeviceFiles:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBaseDeviceFiles:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备档案信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsBaseDeviceFilesFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="deviceFilesId">
+          <el-input v-model="form.deviceFilesId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="设备" prop="machineId">
+<!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+          <el-select v-model="form.machineId" placeholder="请选择设备" clearable filterable>
+            <el-option v-for="item in machineOptions"
+                       :key="item.machineId"
+                       :label="item.machineName"
+                       :value="item.machineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="档案编号" prop="filesCode">
+          <el-input v-model="form.filesCode" placeholder="请输入档案编号" />
+        </el-form-item>
+        <el-form-item label="档案名称" prop="filesName">
+          <el-input v-model="form.filesName" placeholder="请输入档案名称" />
+        </el-form-item>
+        <el-form-item label="档案路径" prop="filesPath">
+          <file-upload v-model="form.file"/>
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DmsBaseDeviceFiles" lang="ts">
+import { listDmsBaseDeviceFiles, getDmsBaseDeviceFiles, delDmsBaseDeviceFiles, addDmsBaseDeviceFiles, updateDmsBaseDeviceFiles } from '@/api/dms/dmsBaseDeviceFiles';
+import { DmsBaseDeviceFilesVO, DmsBaseDeviceFilesQuery, DmsBaseDeviceFilesForm } from '@/api/dms/dmsBaseDeviceFiles/types';
+import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const dmsBaseDeviceFilesList = ref<DmsBaseDeviceFilesVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const dmsBaseDeviceFilesFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `设备`, visible: true },
+        { key: 3, label: `档案编号`, visible: true },
+        { key: 4, label: `档案名称`, visible: true },
+        { key: 5, label: `档案路径`, visible: true },
+        { key: 6, label: `激活标识`, visible: true },
+        { key: 7, label: `备注`, visible: true },
+        { key: 8, label: `创建部门`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { key: 10, label: `创建时间`, visible: false },
+        { key: 11, label: `更新人`, visible: false },
+        { key: 12, label: `更新时间`, visible: false },
+]);
+
+const initFormData: DmsBaseDeviceFilesForm = {
+  deviceFilesId: undefined,
+  machineId: undefined,
+  filesCode: undefined,
+  filesName: undefined,
+  filesPath: undefined,
+  activeFlag: "1",
+  remark: undefined,
+  machineName: undefined,
+  file: undefined,
+}
+const data = reactive<PageData<DmsBaseDeviceFilesForm, DmsBaseDeviceFilesQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceFilesId: undefined,
+    machineId: undefined,
+    filesCode: undefined,
+    filesName: undefined,
+    filesPath: undefined,
+    activeFlag: undefined,
+    machineName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    filesCode: [
+      { required: true, message: "档案编号不能为空", trigger: "blur" }
+    ],
+    filesName: [
+      { required: true, message: "档案名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备档案信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsBaseDeviceFiles(queryParams.value);
+  dmsBaseDeviceFilesList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 *
+const reset = () => {
+  form.value = {...initFormData};
+  dmsBaseDeviceFilesFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsBaseDeviceFilesVO[]) => {
+  ids.value = selection.map(item => item.deviceFilesId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备档案信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsBaseDeviceFilesVO) => {
+  reset();
+  const _deviceFilesId = row?.deviceFilesId || ids.value[0]
+  const res = await getDmsBaseDeviceFiles(_deviceFilesId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备档案信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsBaseDeviceFilesFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.deviceFilesId) {
+        await updateDmsBaseDeviceFiles(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        if (form.value.file === null || form.value.file.length === 0) {
+          proxy?.$modal.warning('请上传！');
+          return;
+        }
+        for (let e of form.value.file){
+/*          form.value.oosId = e.ossId;
+          form.value.originalName = e.name;*/
+
+          form.value.filesPath = e.url;
+          await addDmsBaseDeviceFiles(form.value).finally(() =>  buttonLoading.value = false);
+        }
+
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsBaseDeviceFilesVO) => {
+  const _deviceFilesIds = row?.deviceFilesId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备档案信息编号为"' + _deviceFilesIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsBaseDeviceFiles(_deviceFilesIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsBaseDeviceFiles/export', {
+    ...queryParams.value
+  }, `dmsBaseDeviceFiles_${new Date().getTime()}.xlsx`)
+}
+
+
+// 获取设备下拉框数据
+let machineOptions = ref<any[]>([]);
+const getMachineOptions = async () => {
+  const res = await getDmsBaseMachineInfoList(null);
+  machineOptions.value = res.data;
+}
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>

From 03e463d2343e97c02273fcf4d521ba395b11b9f0 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 21 Mar 2025 15:35:03 +0800
Subject: [PATCH 7/7] =?UTF-8?q?change(hwmomui):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dms/dmsBaseDeviceFiles/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dms/dmsBaseDeviceFiles/index.vue b/src/views/dms/dmsBaseDeviceFiles/index.vue
index ed79c5e..f0f9b38 100644
--- a/src/views/dms/dmsBaseDeviceFiles/index.vue
+++ b/src/views/dms/dmsBaseDeviceFiles/index.vue
@@ -218,7 +218,7 @@ const cancel = () => {
   dialog.visible = false;
 }
 
-/** 表单重置 *
+/** 表单重置 */
 const reset = () => {
   form.value = {...initFormData};
   dmsBaseDeviceFilesFormRef.value?.resetFields();