diff --git a/gear-ui3/src/api/mes/dv/checkmachinery.js b/gear-ui3/src/api/mes/dv/checkmachinery.js
new file mode 100644
index 0000000..6062024
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/checkmachinery.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询点检设备列表
+export function listCheckmachinery(query) {
+  return request({
+    url: '/mes/dv/checkmachinery/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询点检设备详细
+export function getCheckmachinery(recordId) {
+  return request({
+    url: '/mes/dv/checkmachinery/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增点检设备
+export function addCheckmachinery(data) {
+  return request({
+    url: '/mes/dv/checkmachinery',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改点检设备
+export function updateCheckmachinery(data) {
+  return request({
+    url: '/mes/dv/checkmachinery',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除点检设备
+export function delCheckmachinery(recordId) {
+  return request({
+    url: '/mes/dv/checkmachinery/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/checkplan.js b/gear-ui3/src/api/mes/dv/checkplan.js
new file mode 100644
index 0000000..0e37cff
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/checkplan.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询设备点检计划头列表
+export function listCheckplan(query) {
+  return request({
+    url: '/mes/dv/checkplan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检计划头详细
+export function getCheckplan(planId) {
+  return request({
+    url: '/mes/dv/checkplan/' + planId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检计划头
+export function addCheckplan(data) {
+  return request({
+    url: '/mes/dv/checkplan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检计划头
+export function updateCheckplan(data) {
+  return request({
+    url: '/mes/dv/checkplan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检计划头
+export function delCheckplan(planId) {
+  return request({
+    url: '/mes/dv/checkplan/' + planId,
+    method: 'delete'
+  })
+}
+
+// 根据设备编码和计划类型查询设备点检计划头列表
+export function getCheckPlan(query) {
+  return request({
+    url: '/mes/dv/checkplan/getCheckPlan',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/checkrecord.js b/gear-ui3/src/api/mes/dv/checkrecord.js
new file mode 100644
index 0000000..f1cf9c9
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/checkrecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备点检记录列表
+export function listCheckrecord(query) {
+  return request({
+    url: '/mes/dv/checkrecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检记录详细
+export function getCheckrecord(recordId) {
+  return request({
+    url: '/mes/dv/checkrecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检记录
+export function addCheckrecord(data) {
+  return request({
+    url: '/mes/dv/checkrecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检记录
+export function updateCheckrecord(data) {
+  return request({
+    url: '/mes/dv/checkrecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检记录
+export function delCheckrecord(recordId) {
+  return request({
+    url: '/mes/dv/checkrecord/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/checkrecordline.js b/gear-ui3/src/api/mes/dv/checkrecordline.js
new file mode 100644
index 0000000..0fe9199
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/checkrecordline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备点检记录行列表
+export function listCheckrecordline(query) {
+  return request({
+    url: '/mes/dv/checkrecordline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检记录行详细
+export function getCheckrecordline(lineId) {
+  return request({
+    url: '/mes/dv/checkrecordline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检记录行
+export function addCheckrecordline(data) {
+  return request({
+    url: '/mes/dv/checkrecordline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检记录行
+export function updateCheckrecordline(data) {
+  return request({
+    url: '/mes/dv/checkrecordline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检记录行
+export function delCheckrecordline(lineId) {
+  return request({
+    url: '/mes/dv/checkrecordline/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/checksubject.js b/gear-ui3/src/api/mes/dv/checksubject.js
new file mode 100644
index 0000000..7aac373
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/checksubject.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询点检项目列表
+export function listChecksubject(query) {
+  return request({
+    url: '/mes/dv/checksubject/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询点检项目详细
+export function getChecksubject(recordId) {
+  return request({
+    url: '/mes/dv/checksubject/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增点检项目
+export function addChecksubject(data) {
+  return request({
+    url: '/mes/dv/checksubject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改点检项目
+export function updateChecksubject(data) {
+  return request({
+    url: '/mes/dv/checksubject',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除点检项目
+export function delChecksubject(recordId) {
+  return request({
+    url: '/mes/dv/checksubject/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/dvsubject.js b/gear-ui3/src/api/mes/dv/dvsubject.js
new file mode 100644
index 0000000..5d4f7ba
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/dvsubject.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备点检保养项目列表
+export function listDvsubject(query) {
+  return request({
+    url: '/mes/dv/dvsubject/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备点检保养项目详细
+export function getDvsubject(subjectId) {
+  return request({
+    url: '/mes/dv/dvsubject/' + subjectId,
+    method: 'get'
+  })
+}
+
+// 新增设备点检保养项目
+export function addDvsubject(data) {
+  return request({
+    url: '/mes/dv/dvsubject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备点检保养项目
+export function updateDvsubject(data) {
+  return request({
+    url: '/mes/dv/dvsubject',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备点检保养项目
+export function delDvsubject(subjectId) {
+  return request({
+    url: '/mes/dv/dvsubject/' + subjectId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/machinery.js b/gear-ui3/src/api/mes/dv/machinery.js
new file mode 100644
index 0000000..84f56a3
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/machinery.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备列表
+export function listMachinery(query) {
+  return request({
+    url: '/mes/dv/machinery/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备详细
+export function getMachinery(machineryId) {
+  return request({
+    url: '/mes/dv/machinery/' + machineryId,
+    method: 'get'
+  })
+}
+
+// 新增设备
+export function addMachinery(data) {
+  return request({
+    url: '/mes/dv/machinery',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备
+export function updateMachinery(data) {
+  return request({
+    url: '/mes/dv/machinery',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备
+export function delMachinery(machineryId) {
+  return request({
+    url: '/mes/dv/machinery/' + machineryId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/machinerytype.js b/gear-ui3/src/api/mes/dv/machinerytype.js
new file mode 100644
index 0000000..bc41ca4
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/machinerytype.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备类型列表
+export function listMachinerytype(query) {
+  return request({
+    url: '/mes/dv/machinerytype/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备类型详细
+export function getMachinerytype(machineryTypeId) {
+  return request({
+    url: '/mes/dv/machinerytype/' + machineryTypeId,
+    method: 'get'
+  })
+}
+
+// 新增设备类型
+export function addMachinerytype(data) {
+  return request({
+    url: '/mes/dv/machinerytype',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备类型
+export function updateMachinerytype(data) {
+  return request({
+    url: '/mes/dv/machinerytype',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备类型
+export function delMachinerytype(machineryTypeId) {
+  return request({
+    url: '/mes/dv/machinerytype/' + machineryTypeId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/maintenrecord.js b/gear-ui3/src/api/mes/dv/maintenrecord.js
new file mode 100644
index 0000000..597620b
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/maintenrecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备保养记录列表
+export function listMaintenrecord(query) {
+  return request({
+    url: '/mes/dv/maintenrecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备保养记录详细
+export function getMaintenrecord(recordId) {
+  return request({
+    url: '/mes/dv/maintenrecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增设备保养记录
+export function addMaintenrecord(data) {
+  return request({
+    url: '/mes/dv/maintenrecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备保养记录
+export function updateMaintenrecord(data) {
+  return request({
+    url: '/mes/dv/maintenrecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备保养记录
+export function delMaintenrecord(recordId) {
+  return request({
+    url: '/mes/dv/maintenrecord/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/maintenrecordline.js b/gear-ui3/src/api/mes/dv/maintenrecordline.js
new file mode 100644
index 0000000..f693337
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/maintenrecordline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备保养记录行列表
+export function listMaintenrecordline(query) {
+  return request({
+    url: '/mes/dv/maintenrecordline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备保养记录行详细
+export function getMaintenrecordline(lineId) {
+  return request({
+    url: '/mes/dv/maintenrecordline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增设备保养记录行
+export function addMaintenrecordline(data) {
+  return request({
+    url: '/mes/dv/maintenrecordline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备保养记录行
+export function updateMaintenrecordline(data) {
+  return request({
+    url: '/mes/dv/maintenrecordline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备保养记录行
+export function delMaintenrecordline(lineId) {
+  return request({
+    url: '/mes/dv/maintenrecordline/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/repair.js b/gear-ui3/src/api/mes/dv/repair.js
new file mode 100644
index 0000000..8268ff0
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/repair.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询设备维修单列表
+export function listRepair(query) {
+  return request({
+    url: '/mes/dv/repair/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备维修单详细
+export function getRepair(repairId) {
+  return request({
+    url: '/mes/dv/repair/' + repairId,
+    method: 'get'
+  })
+}
+
+// 新增设备维修单
+export function addRepair(data) {
+  return request({
+    url: '/mes/dv/repair',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备维修单
+export function updateRepair(data) {
+  return request({
+    url: '/mes/dv/repair',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备维修单
+export function delRepair(repairId) {
+  return request({
+    url: '/mes/dv/repair/' + repairId,
+    method: 'delete'
+  })
+}
+
+// 根据设备编码查询设备维修单列表
+export function getRepairList(query) {
+  return request({
+    url: '/mes/dv/repair/getRepairList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/repairline.js b/gear-ui3/src/api/mes/dv/repairline.js
new file mode 100644
index 0000000..a0f8b0c
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/repairline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备维修单行列表
+export function listRepairline(query) {
+  return request({
+    url: '/mes/dv/repairline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备维修单行详细
+export function getRepairline(lineId) {
+  return request({
+    url: '/mes/dv/repairline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增设备维修单行
+export function addRepairline(data) {
+  return request({
+    url: '/mes/dv/repairline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备维修单行
+export function updateRepairline(data) {
+  return request({
+    url: '/mes/dv/repairline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备维修单行
+export function delRepairline(lineId) {
+  return request({
+    url: '/mes/dv/repairline/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/api/mes/dv/specialEquipment.js b/gear-ui3/src/api/mes/dv/specialEquipment.js
new file mode 100644
index 0000000..7dec9d4
--- /dev/null
+++ b/gear-ui3/src/api/mes/dv/specialEquipment.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询特种设备（包含锅炉、压力管道、电梯等特种设备信息）列表
+export function listSpecialEquipment(query) {
+  return request({
+    url: '/mes/specialEquipment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询特种设备（包含锅炉、压力管道、电梯等特种设备信息）详细
+export function getSpecialEquipment(equipmentId) {
+  return request({
+    url: '/mes/specialEquipment/' + equipmentId,
+    method: 'get'
+  })
+}
+
+// 新增特种设备（包含锅炉、压力管道、电梯等特种设备信息）
+export function addSpecialEquipment(data) {
+  return request({
+    url: '/mes/specialEquipment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改特种设备（包含锅炉、压力管道、电梯等特种设备信息）
+export function updateSpecialEquipment(data) {
+  return request({
+    url: '/mes/specialEquipment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除特种设备（包含锅炉、压力管道、电梯等特种设备信息）
+export function delSpecialEquipment(equipmentId) {
+  return request({
+    url: '/mes/specialEquipment/' + equipmentId,
+    method: 'delete'
+  })
+}
diff --git a/gear-ui3/src/components/UserSelect/multi.vue b/gear-ui3/src/components/UserSelect/multi.vue
new file mode 100644
index 0000000..80febfd
--- /dev/null
+++ b/gear-ui3/src/components/UserSelect/multi.vue
@@ -0,0 +1,240 @@
+<template>
+  <el-dialog title="人员选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <KLPTable v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </KLPTable>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listUser } from "@/api/system/user";
+import { deptTreeSelect as treeselect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "UserMultiSelect",
+  components: { Treeselect },
+  data() {
+    return {
+      showFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { 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 }
+      ],
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        debugger;
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.selectedRows = selection;
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedRows == null || this.selectedRows.size == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/components/UserSelect/single.vue b/gear-ui3/src/components/UserSelect/single.vue
new file mode 100644
index 0000000..c0805ae
--- /dev/null
+++ b/gear-ui3/src/components/UserSelect/single.vue
@@ -0,0 +1,256 @@
+<template>
+  <el-dialog title="人员选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <KLPTable v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+            <el-table-column  width="55" align="center" >
+                <template v-slot="scope">
+                    <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+                </template>
+            </el-table-column>
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </KLPTable>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listUser } from "@/api/system/user";
+import { deptTreeSelect as treeselect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "UserSingleSelect",
+  components: { Treeselect },
+  data() {
+    return {
+      showFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      selectedId: null,
+      selectedRow: null,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { 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 }
+      ],
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        debugger;
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row){
+        if(row){
+            this.selectedRow = row;
+        }
+    },
+    //行双击选中
+    handleRowDbClick(row){
+      if(row){
+        this.selectedRow = row;
+        this.$emit('onSelected',this.selectedRow);
+        this.showFlag = false;
+      }
+    },
+    // 单选选中数据
+    handleRowChange(row) {
+      debugger;
+      if(row){
+        this.selectedRow = row;
+      }
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedId == null || this.selectedId == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRow);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/components/dvplanSelect/index.vue b/gear-ui3/src/components/dvplanSelect/index.vue
new file mode 100644
index 0000000..27b4658
--- /dev/null
+++ b/gear-ui3/src/components/dvplanSelect/index.vue
@@ -0,0 +1,221 @@
+<template>
+      <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="计划编号" prop="planCode">
+          <el-input
+            v-model="queryParams.planCode"
+            placeholder="请输入计划编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="计划名称" prop="planName">
+          <el-input
+            v-model="queryParams.planName"
+            placeholder="请输入计划名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <KLPTable v-loading="loading" :data="checkplanList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column  width="55" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedPlanId" :label="scope.row.planId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+        </el-table-column>
+        <el-table-column label="计划编码" align="center" prop="planCode" >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="handleView(scope.row)"
+            >{{scope.row.planCode}}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划名称" align="center" width="200px" prop="planName" />
+        <el-table-column label="计划类型" align="center" width="120px" prop="planType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.dv_plan_type" :value="scope.row.planType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始日期" align="center" prop="startDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="频率" align="center" prop="cycleType" width="120px">
+          <template slot-scope="scope">
+            {{scope.row.cycleCount}}<dict-tag :options="dict.type.mes_cycle_type" :value="scope.row.cycleType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status =='PREPARE'"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-if="scope.row.status =='PREPARE'"
+            >删除</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status =='FINISHED'"
+            >停用</el-button>
+          </template>
+        </el-table-column>
+      </KLPTable>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+
+      <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+</el-dialog>
+  </template>
+
+  <script>
+  import { listCheckplan } from "@/api/mes/dv/checkplan";
+
+  export default {
+    name: "CheckplanSelect",
+    dicts: ['mes_cycle_type','mes_order_status','dv_plan_type'],
+    props: {
+        planType: {
+            type: String,
+            default: 'CHECK'
+        }
+    },
+    data() {
+      return {
+        showFlag: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedPlanId: undefined,
+        selectedRow: undefined,
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 设备点检计划头表格数据
+        checkplanList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 20,
+          planCode: null,
+          planName: null,
+          planType: this.planType,
+          startDate: null,
+          endDate: null,
+          cycleType: null,
+          cycleCount: null,
+          status: 'FINISHED'
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+        /** 查询设备点检计划头列表 */
+        getList() {
+            this.loading = true;
+            listCheckplan(this.queryParams).then(response => {
+            this.checkplanList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+            });
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+
+        handleCurrent(row){
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+        //行双击选中
+        handleRowDbClick(row){
+        if(row){
+            this.selectedRow = row;
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+        }
+        },
+        // 单选选中数据
+        handleRowChange(row) {
+        if(row){
+            this.selectedRow = row;
+        }
+        },
+        //确定选中
+        confirmSelect(){
+            if(this.selectedPlanId ==null || this.selectedPlanId==0){
+                this.$notify({
+                    title:'提示',
+                    type:'warning',
+                    message: '请至少选择一条数据!'
+                });
+                return;
+            }
+            this.$emit('onSelected',this.selectedRow);
+            this.showFlag = false;
+        }
+    }
+  };
+  </script>
diff --git a/gear-ui3/src/components/dvsubjectSelect/multi.vue b/gear-ui3/src/components/dvsubjectSelect/multi.vue
new file mode 100644
index 0000000..dc58f33
--- /dev/null
+++ b/gear-ui3/src/components/dvsubjectSelect/multi.vue
@@ -0,0 +1,157 @@
+<template>
+  <el-dialog title="项目选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目编码" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入项目编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <KLPTable v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目编码" align="center" prop="subjectCode" />
+      <el-table-column label="项目类型" align="center" prop="subjectType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_dvsubject_type" :value="scope.row.subjectType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+    </KLPTable>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listDvsubject} from "@/api/mes/dv/dvsubject";
+export default {
+  name: "DvsubjectSelect",
+  dicts: ['sys_yes_no', 'mes_dvsubject_type'],
+  props:{
+      subjectType: null,
+  },
+  data() {
+    return {
+      showFlag:false,
+      // 遮罩层
+      loading: true,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: this.subjectType,
+        subjectContent: null,
+        subjectStandard: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      listDvsubject(this.queryParams).then(response => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {}
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.subjectType = this.subjectType
+      this.getList();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.subjectId)
+      this.selectedRows = selection;
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.ids ==[] || this.ids.length==0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/components/dvsubjectSelect/single.vue b/gear-ui3/src/components/dvsubjectSelect/single.vue
new file mode 100644
index 0000000..1e899e5
--- /dev/null
+++ b/gear-ui3/src/components/dvsubjectSelect/single.vue
@@ -0,0 +1,167 @@
+<template>
+    <el-dialog title="设备点检保养项目选择"
+      v-if="showFlag"
+      :visible.sync="showFlag"
+      :modal= false
+      width="80%"
+      center
+    >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="项目编码" prop="subjectCode">
+          <el-input
+            v-model="queryParams.subjectCode"
+            placeholder="请输入项目编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="subjectName">
+          <el-input
+            v-model="queryParams.subjectName"
+            placeholder="请输入项目名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <KLPTable v-loading="loading" :data="dvsubjectList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column  width="55" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedId" :label="scope.row.subjectId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+        </el-table-column>
+        <el-table-column label="项目编码" align="center" prop="subjectCode" />
+        <el-table-column label="项目名称" align="center" prop="subjectName" />
+        <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
+        <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
+        <el-table-column label="备注" align="center" prop="remark" />
+      </KLPTable>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirmSelect">确 定</el-button>
+          <el-button @click="showFlag=false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </template>
+
+  <script>
+  import { listDvsubject} from "@/api/mes/dv/dvsubject";
+  export default {
+    name: "DvsubjectSelect",
+    dicts: ['sys_yes_no', 'mes_dvsubject_type'],
+    props:{
+        subjectType: null,
+    },
+    data() {
+      return {
+        showFlag:false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        selectedId: undefined,
+        selectedRow: undefined,
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 设备点检保养项目表格数据
+        dvsubjectList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 20,
+          subjectCode: null,
+          subjectName: null,
+          subjectType: this.subjectType,
+          subjectContent: null,
+          subjectStandard: null,
+          enableFlag: null,
+        },
+        // 表单参数
+        form: {}
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询设备点检保养项目列表 */
+      getList() {
+        this.loading = true;
+        listDvsubject(this.queryParams).then(response => {
+          this.dvsubjectList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {}
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10;
+        this.queryParams.subjectType = this.subjectType
+        this.getList();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10;
+        this.getList();
+      },
+
+        handleCurrent(row){
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+        //行双击选中
+        handleRowDbClick(row){
+            if(row){
+                this.selectedRow = row;
+                this.$emit('onSelected',this.selectedRow);
+                this.showFlag = false;
+            }
+        },
+        // 单选选中数据
+        handleRowChange(row) {
+            if(row){
+                this.selectedRow = row;
+            }
+        },
+
+      //确定选中
+      confirmSelect(){
+          if(this.selectedId == null || this.selectedId == 0){
+              this.$notify({
+                  title:'提示',
+                  type:'warning',
+                  message: '请选择一条数据!'
+              });
+              return;
+          }
+          this.$emit('onSelected',this.selectedRow);
+          this.showFlag = false;
+      }
+    }
+  };
+  </script>
diff --git a/gear-ui3/src/components/machinerySelect/index.vue b/gear-ui3/src/components/machinerySelect/index.vue
new file mode 100644
index 0000000..3e93494
--- /dev/null
+++ b/gear-ui3/src/components/machinerySelect/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="machineryTypeName"
+            placeholder="请输入分类名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="machineryTypeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--设备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="设备编码" prop="machineryCode">
+            <el-input
+              v-model="queryParams.machineryCode"
+              placeholder="请输入设备编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="machineryName">
+            <el-input
+              v-model="queryParams.machineryName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <KLPTable v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
+          </el-table-column>
+          <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
+          <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName"  :show-overflow-tooltip="true" />
+          <el-table-column label="设备状态" align="center" key="status" prop="status" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </KLPTable>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+// import { listAllWorkshop } from "@/api/mes/md/workshop";
+
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MachinerySelect",
+  dicts: ['sys_yes_no','mes_machinery_status'],
+  components: { Treeselect },
+  data() {
+    return {
+      showFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      machineryList: [],
+      // 弹出层标题
+      title: "",
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      //车间选项
+      workshopOptions:[],
+      // 是否显示弹出层
+      open: false,
+      // 设备类型名称
+      machineryTypeName: undefined,
+      //自动生成物料编码标识
+      autoGenFlag: false,
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "machineryTypeName"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        status: null
+      }
+    };
+  },
+  watch: {
+    // 根据设备分类名称筛选分类树
+    machineryTypeName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listMachinery(this.queryParams).then(response => {
+          this.machineryList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /*getWorkshops(){
+      listAllWorkshop().then( response => {
+        debugger;
+        this.workshopOptions =response.data;
+      });
+    },*/
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children
+      };
+    },
+	/** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then(response => {
+        debugger;
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.machineryTypeName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.machineryTypeId = data.machineryTypeId;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.machineryId);
+      this.selectedRows = selection;
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.ids ==[] || this.ids.length==0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/components/machinerySelect/single.vue b/gear-ui3/src/components/machinerySelect/single.vue
new file mode 100644
index 0000000..6997940
--- /dev/null
+++ b/gear-ui3/src/components/machinerySelect/single.vue
@@ -0,0 +1,278 @@
+<template>
+  <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="machineryTypeName"
+            placeholder="请输入分类名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="machineryTypeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--设备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="设备编码" prop="machineryCode">
+            <el-input
+              v-model="queryParams.machineryCode"
+              placeholder="请输入设备编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="machineryName">
+            <el-input
+              v-model="queryParams.machineryName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属车间" prop="workshopName">
+            <el-input
+              v-model="queryParams.workshopName"
+              placeholder="请输入所属车间"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <KLPTable v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+          <el-table-column width="50" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedMachineryId" :label="scope.row.machineryId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
+          </el-table-column>
+          <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
+          <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
+          <el-table-column label="设备状态" align="center" key="status" prop="status" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </KLPTable>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+// import { listAllWorkshop } from "@/api/mes/md/workshop";
+
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MachinerySelectSingle",
+  dicts: ['sys_yes_no','mes_machinery_status'],
+  components: { Treeselect },
+  data() {
+    return {
+      showFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      selectedMachineryId: undefined,
+      selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      machineryList: [],
+      // 弹出层标题
+      title: "",
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      //车间选项
+      workshopOptions:[],
+      // 是否显示弹出层
+      open: false,
+      // 设备类型名称
+      machineryTypeName: undefined,
+      //自动生成物料编码标识
+      autoGenFlag: false,
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "machineryTypeName"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        status: null
+      }
+    };
+  },
+  watch: {
+    // 根据设备分类名称筛选分类树
+    machineryTypeName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    handleOpen(id) {
+      this.showFlag = true
+      this.selectedMachineryId = id
+    },
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listMachinery(this.queryParams).then(response => {
+          this.machineryList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /*getWorkshops(){
+      listAllWorkshop().then( response => {
+        this.workshopOptions =response.data;
+      });
+    },*/
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children
+      };
+    },
+	/** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then(response => {
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.machineryTypeName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.machineryTypeId = data.machineryTypeId;
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleCurrent(row){
+        if(row){
+            this.selectedRows = row;
+        }
+    },
+    //双击选中
+    handleRowDbClick(row){
+      if(row){
+        this.selectedRows = row;
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+      }
+    },
+    // 单选选中数据
+    handleRowChange(row) {
+      if(row){
+        this.selectedRows = row;
+      }
+    },
+    //确定选中
+    confirmSelect(){
+        if(this.selectedMachineryId == null || this.selectedMachineryId == 0){
+            this.$notify({
+                title:'提示',
+                type:'warning',
+                message: '请至少选择一条数据!'
+            });
+            return;
+        }
+        this.$emit('onSelected',this.selectedRows);
+        this.showFlag = false;
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/checkplan/index.vue b/gear-ui3/src/views/dv/checkplan/index.vue
new file mode 100644
index 0000000..1d0daa5
--- /dev/null
+++ b/gear-ui3/src/views/dv/checkplan/index.vue
@@ -0,0 +1,508 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="方案编号" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入方案编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="方案名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入方案名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="方案类型" prop="planType">
+        <el-select v-model="queryParams.planType" placeholder="请选择类型" clearable>
+          <el-option
+            v-for="dict in dv_plan_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in mes_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="方案编号" align="center" prop="planCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+          >{{scope.row.planCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="方案名称" align="center" prop="planName" />
+      <el-table-column label="方案类型" align="center" width="120px" prop="planType">
+        <template slot-scope="scope">
+          <dict-tag :options="dv_plan_type" :value="scope.row.planType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="开始日期" align="center" prop="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="频率" width="100px" align="center" prop="cycleType">
+        <template slot-scope="scope">
+          <span style="display: inline-flex;">
+            {{scope.row.cycleCount}}
+            <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status =='PREPARE'"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.status =='PREPARE'"
+          >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="VideoPause"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status =='FINISHED'"
+          >停用</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="方案编码" prop="planCode">
+              <el-input v-model="form.planCode" placeholder="请输入方案编码" />
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
+              </el-switch>
+            </el-form-item>
+          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="方案名称" prop="planName">
+              <el-input v-model="form.planName" placeholder="请输入方案名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="方案类型"  prop="planType" >
+                <el-select v-model="form.planType" placeholder="请选择方案类型">
+                  <el-option
+                    v-for="dict in dv_plan_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="频率" prop="cycleCount">
+              <el-tooltip content="这里的频率指的是每隔多长周期进行一次点检或保养，例如每隔1个月进行一次点检，则频率为1 月。">
+                <el-input-number :controls=false controls-position="right" :min="1" :max="99999999" :step="1" v-model="form.cycleCount" placeholder="请输入次数" />
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item  prop="cycleType" label-width="80">
+                <el-select v-model="form.cycleType" placeholder="请选择频率">
+                  <el-option
+                    v-for="dict in mes_cycle_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="开始日期" prop="startDate">
+              <el-date-picker clearable
+                v-model="form.startDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择开始日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结束日期" prop="endDate">
+              <el-date-picker clearable
+                v-model="form.endDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-tabs type="border-card" v-if="form.planId != null">
+        <el-tab-pane label="设备清单">
+          <Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId" ></Checkmachinery>
+        </el-tab-pane>
+        <el-tab-pane :label="form.planType=='CHECK'?'点检项目':'保养项目'">
+          <Checksubject ref="subjectlist" :optType="optType" :planId="form.planId" ></Checksubject>
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保存</el-button>
+        <el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view'  && form.planId !=null">启用</el-button>
+        <el-button type="success" @click="handleDeFinish" v-if="form.status =='FINISHED' && optType !='view'  && form.planId !=null">停用</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckplan, getCheckplan, delCheckplan, addCheckplan, updateCheckplan } from "@/api/mes/dv/checkplan";
+import Checkmachinery from "./machinery.vue"
+import Checksubject from "./subject.vue"
+// import {genCode} from "@/api/system/autocode/rule"
+export default {
+  name: "Checkplan",
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_cycle_type, mes_order_status, dv_plan_type } = proxy.useDict("mes_cycle_type", "mes_order_status", "dv_plan_type");
+    return {
+      mes_cycle_type,
+      mes_order_status,
+      dv_plan_type
+    }
+  },
+  components:{Checkmachinery,Checksubject},
+  data() {
+    return {
+      autoGenFlag: false,
+      optType: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检方案头表格数据
+      checkplanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        planCode: null,
+        planName: null,
+        startDate: null,
+        endDate: null,
+        cycleType: null,
+        cycleCount: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        planCode: [
+          { required: true, message: "方案编码不能为空", trigger: "blur" },
+          { max: 64, message: "字段过长", trigger: "blur" }
+        ],
+        planName: [
+          { required: true, message: "方案名称不能为空", trigger: "blur" },
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
+        planType:[
+          { required: true, message: "方案类型不能为空", trigger: "blur" }
+        ],
+        cycleType: [
+          { required: true, message: "请选择点检频率", trigger: "blur" }
+        ],
+        cycleCount: [
+          { required: true, message: "请输入点检次数", trigger: "blur" }
+        ],
+        remark: [
+          { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检方案头列表 */
+    getList() {
+      this.loading = true;
+      listCheckplan(this.queryParams).then(response => {
+        this.checkplanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        planId: null,
+        planCode: null,
+        planName: null,
+        planType: null,
+        startDate: null,
+        endDate: null,
+        cycleType: null,
+        cycleCount: null,
+        status: 'PREPARE',
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.planId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加方案";
+      this.optType = "add";
+    },
+    // 查询明细按钮操作
+    handleView(row){
+      this.reset();
+      const planId = row.planId || this.ids;
+      getCheckplan(planId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看方案信息";
+        this.optType = "view";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const planId = row.planId || this.ids
+      getCheckplan(planId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改方案";
+        this.optType = "edit";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.planId != null) {
+            updateCheckplan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckplan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleFinish(){
+      if(this.form.planId != null && this.form.status =='PREPARE'){
+        this.form.status='FINISHED';
+        updateCheckplan(this.form).then(response => {
+                this.$modal.msgSuccess("已启用");
+                this.open = false;
+                this.getList();
+        },err =>{
+          this.form.status='PREPARE';
+        });
+      }
+    },
+    handleDeFinish(){
+      if(this.form.planId != null && this.form.status =='FINISHED'){
+        this.form.status='PREPARE';
+        updateCheckplan(this.form).then(response => {
+                this.$modal.msgSuccess("已停用");
+                this.open = false;
+                this.getList();
+        },err =>{
+          this.form.status='FINISHED';
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const planIds = row.planId || this.ids;
+      this.$modal.confirm('是否确认删除方案编号为"' + planIds + '"的数据项？').then(function() {
+        return delCheckplan(planIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/dv/checkplan/export', {
+        ...this.queryParams
+      }, `checkplan_${new Date().getTime()}.xlsx`)
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        /*genCode('CHECKPLAN_CODE').then(response =>{
+          this.form.planCode = response;
+        });*/
+      }else{
+        this.form.planCode = null;
+      }
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/checkplan/machinery.vue b/gear-ui3/src/views/dv/checkplan/machinery.vue
new file mode 100644
index 0000000..72f9606
--- /dev/null
+++ b/gear-ui3/src/views/dv/checkplan/machinery.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          v-if="optType !='view'"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          v-if="optType !='view'"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <MachinerySelect ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelect>
+    <el-table v-loading="loading" :data="checkmachineryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备编码" align="center" prop="machineryCode" />
+      <el-table-column label="设备名称" align="center" prop="machineryName" />
+      <el-table-column label="品牌" align="center" prop="machineryBrand" />
+      <el-table-column label="规格型号" align="center" prop="machinerySpec" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            v-if="optType !='view'"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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"
+    />
+  </div>
+</template>
+
+<script>
+import { listCheckmachinery,  delCheckmachinery, addCheckmachinery } from "@/api/mes/dv/checkmachinery";
+import MachinerySelect from "@/components/machinerySelect/index.vue";
+export default {
+  name: "Checkmachinery",
+  components:{MachinerySelect},
+  props:{
+    planId: null,
+    optType: null
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 点检设备表格数据
+      checkmachineryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        planId: this.planId,
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+      },
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询点检设备列表 */
+    getList() {
+      this.loading = true;
+      listCheckmachinery(this.queryParams).then(response => {
+        this.checkmachineryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs.machinerySelect.showFlag = true;
+    },
+      //设备资源选择回调
+    onMachineryAdd(rows){
+      if(rows !=null && rows.length >0){
+         rows.forEach(row => {
+            row.planId = this.planId;
+            addCheckmachinery(row).then(response =>{
+              this.getList();
+            });
+         });
+      }
+
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除点检设备编号为"' + recordIds + '"的数据项？').then(function() {
+        return delCheckmachinery(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/checkplan/subject.vue b/gear-ui3/src/views/dv/checkplan/subject.vue
new file mode 100644
index 0000000..5af8bcb
--- /dev/null
+++ b/gear-ui3/src/views/dv/checkplan/subject.vue
@@ -0,0 +1,149 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+          v-if="optType !='view'"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-if="optType !='view'"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <DvsubjectSelect ref="subjectSelect" subjectType="CHECK" @onSelected="onSubjectSelected"></DvsubjectSelect>
+
+    <el-table v-loading="loading" :data="checksubjectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目名称" align="center" prop="subjectName" width="150px"/>
+      <el-table-column label="项目内容" align="center" width="350px" prop="subjectContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="标准" align="center" width="300px" prop="subjectStandard" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" v-if="optType !='view'" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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"
+    />
+  </div>
+</template>
+
+<script>
+import { listChecksubject, getChecksubject, delChecksubject, addChecksubject, updateChecksubject } from "@/api/mes/dv/checksubject";
+import DvsubjectSelect from "@/components/dvsubjectSelect/multi.vue"
+export default {
+  name: "Checksubject",
+  props:{
+      planId: null,
+      optType: null
+  },
+  components:{DvsubjectSelect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+        selectedRows: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 点检项目表格数据
+      checksubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        planId: this.planId,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+      },
+      // 表单参数
+      form: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询点检项目列表 */
+    getList() {
+      this.loading = true;
+      listChecksubject(this.queryParams).then(response => {
+        this.checksubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+        this.$refs.subjectSelect.showFlag = true;
+    },
+    onSubjectSelected(rows){
+        if(rows != null && rows.length >0){
+            rows.forEach(row => {
+                row.planId= this.planId;
+                addChecksubject(row).then(response => {
+                    this.getList();
+                });
+            });
+        }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除点检项目编号为"' + recordIds + '"的数据项？').then(function() {
+        return delChecksubject(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/checkrecord/index.vue b/gear-ui3/src/views/dv/checkrecord/index.vue
new file mode 100644
index 0000000..e84dde1
--- /dev/null
+++ b/gear-ui3/src/views/dv/checkrecord/index.vue
@@ -0,0 +1,470 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计划编码" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入计划编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备编码" prop="machineryCode">
+        <el-input
+          v-model="queryParams.machineryCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="machineryName">
+        <el-input
+          v-model="queryParams.machineryName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点检时间" prop="checkTime">
+        <el-date-picker clearable
+          v-model="queryParams.checkTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择点检时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checkrecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备编码" align="center" prop="machineryCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+          >{{scope.row.machineryCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" align="center" prop="machineryName" />
+      <el-table-column label="品牌" align="center" prop="machineryBrand" />
+      <el-table-column label="规格型号" align="center" prop="machinerySpec" />
+      <el-table-column label="计划编码" align="center" prop="planCode" />
+      <el-table-column label="计划名称" align="center" prop="planName" />
+      <el-table-column label="点检人" align="center" prop="nickName" />
+      <el-table-column label="点检时间" align="center" prop="checkTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            v-if="scope.row.status =='PREPARE'"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            v-if="scope.row.status =='PREPARE'"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="设备编码" prop="machineryCode">
+              <el-input v-model="form.machineryCode" placeholder="请选择设备" >
+                <el-button slot="append" @click="handleSelectMachinery" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <MachinerySelectSingle ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelectSingle>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="machineryName">
+              <el-input v-model="form.machineryName" readonly="readonly" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="machineryBrand">
+              <el-input v-model="form.machineryBrand" readonly="readonly" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="machinerySpec">
+              <el-input v-model="form.machinerySpec" readonly="readonly" type="textarea" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="点检计划" prop="planName">
+              <el-input v-model="form.planName" placeholder="请选择设备点检计划" >
+                <el-button slot="append" @click="handleSelectPlan" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <CheckplanSelect ref="checkplanSelect" planType="CHECK" @onSelected="onPlanAdd"></CheckplanSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="点检人" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请选择点检人" >
+                <el-button slot="append" @click="handleUserSelect" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="点检时间" prop="checkTime">
+              <el-date-picker clearable
+                v-model="form.checkTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择点检时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-divider v-if="form.recordId !=null" content-position="center">点检项目</el-divider>
+      <el-card shadow="always" v-if="form.recordId !=null" class="box-card">
+        <CheckRecordLine ref="checkRecordLine" :optType="optType" :recordId="form.recordId"></CheckRecordLine>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返 回</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType !=='view' && form.status =='PREPARE' " >保 存</el-button>
+        <el-button type="success" @click="handleFinish" v-if="optType !=='view' && form.status =='PREPARE' " >提 交</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckrecord, getCheckrecord, delCheckrecord, addCheckrecord, updateCheckrecord } from "@/api/mes/dv/checkrecord";
+import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
+import CheckplanSelect from "@/components/dvplanSelect/index.vue";
+import CheckRecordLine from "./line.vue";
+import UserSingleSelect from "@/components/userSelect/single.vue"
+import {formatDate} from "@/utils";
+export default {
+  name: "Checkrecord",
+  components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine, UserSingleSelect},
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_order_status } = proxy.useDict("mes_order_status");
+    return {
+      mes_order_status
+    }
+  },
+  data() {
+    return {
+      optType: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检记录表格数据
+      checkrecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        planId: null,
+        planCode: null,
+        planName: null,
+        planType: null,
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        checkTime: null,
+        nickName: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        machineryId: [
+          { required: true, message: "设备ID不能为空", trigger: "blur" }
+        ],        machineryCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" }
+        ],
+        checkTime: [
+          { required: true, message: "点检时间不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检记录列表 */
+    getList() {
+      this.loading = true;
+      listCheckrecord(this.queryParams).then(response => {
+        this.checkrecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordId: null,
+        planId: null,
+        planCode: null,
+        planName: null,
+        planType: null,
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        checkTime: formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"),
+        status: "PREPARE",
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.form.userId= this.$store.state.user.id;
+      this.form.nickName= this.$store.state.user.nick;
+      this.form.userName= this.$store.state.user.name;
+  },
+  created() {
+    this.getList();
+  },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备点检记录";
+      this.optType = "add";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getCheckrecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备点检记录";
+        this.optType = "edit";
+      });
+    },
+    handleView(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getCheckrecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看设备点检记录";
+        this.optType = "view";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordId != null) {
+            updateCheckrecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckrecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleFinish(){
+      if(this.form.recordId != null && this.form.status =='PREPARE'){
+        this.form.status='FINISHED';
+        updateCheckrecord(this.form).then(response => {
+                this.$modal.msgSuccess("已提交");
+                this.open = false;
+                this.getList();
+        },err =>{
+          this.form.status='PREPARE';
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除设备点检记录编号为"' + recordIds + '"的数据项？').then(function() {
+        return delCheckrecord(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleSelectMachinery(){
+      debugger;
+      this.$refs.machinerySelect.showFlag = true;
+    },
+
+    //设备资源选择回调
+    onMachineryAdd(obj){
+      if(obj !=null && obj != undefined){
+        this.form.machineryId = obj.machineryId;
+        this.form.machineryCode = obj.machineryCode;
+        this.form.machineryName = obj.machineryName;
+        this.form.machineryBrand = obj.machineryBrand;
+        this.form.machinerySpec = obj.machinerySpec;
+      }
+    },
+
+    handleSelectPlan(){
+      this.$refs.checkplanSelect.showFlag = true;
+    },
+
+    onPlanAdd(obj){
+      if(obj !=null && obj != undefined){
+        this.form.planId = obj.planId;
+        this.form.planCode = obj.planCode;
+        this.form.planName = obj.planName;
+        this.form.planType = obj.planType;
+      }
+    },
+
+    //点击人员选择按钮
+    handleUserSelect(){
+      this.$refs.userSelect.showFlag = true;
+    },
+    //人员选择返回
+    onUserSelected(row){
+      this.form.userId = row.userId;
+      this.form.nickName = row.nickName;
+      this.form.userName = row.userName;
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dv/checkrecord/export', {
+        ...this.queryParams
+      }, `checkrecord_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/checkrecord/line.vue b/gear-ui3/src/views/dv/checkrecord/line.vue
new file mode 100644
index 0000000..582c206
--- /dev/null
+++ b/gear-ui3/src/views/dv/checkrecord/line.vue
@@ -0,0 +1,278 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" v-if="optType !== 'view'" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checkrecordlineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目名称" align="center" prop="subjectName" />
+      <el-table-column label="检查内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="标准" align="center" prop="subjectStandard" />
+      <el-table-column label="点检结果" align="center" prop="checkStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dv_cm_result_status" :value="scope.row.checkStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常描述" align="center" prop="checkResult" :show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" v-if="optType !== 'view'" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="项目名称" prop="subjectName">
+              <el-input v-model="form.subjectName" placeholder="请选择检查项目" >
+                <el-button slot="append" @click="handleSelectSubject" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <DvSubjectSelect ref="subjectSelect" subjectType="CHECK" @onSelected="onSubjectSelected"></DvSubjectSelect>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="标准" prop="subjectStandard">
+              <el-input v-model="form.subjectStandard" placeholder="请输入标准" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="项目内容">
+              <el-input type="textarea" v-model="form.subjectContent" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="点检结果">
+          <el-radio-group v-model="form.checkStatus">
+            <el-radio label="Y">正常</el-radio>
+            <el-radio label="N">异常</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.checkStatus === 'N'" label="异常描述" prop="checkResult">
+          <el-input v-model="form.checkResult" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckrecordline, getCheckrecordline, delCheckrecordline, addCheckrecordline, updateCheckrecordline } from "@/api/mes/dv/checkrecordline";
+import DvSubjectSelect from "@/components/dvsubjectSelect/single.vue";
+export default {
+  name: "Checkrecordline",
+  props:{
+    optType: null,
+    recordId: null,
+  },
+  components:{ DvSubjectSelect },
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { dv_cm_result_status } = proxy.useDict("dv_cm_result_status");
+    return {
+      dv_cm_result_status
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检记录行表格数据
+      checkrecordlineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        recordId: this.recordId,        subjectId: null,        subjectCode: null,        subjectName: null,        subjectType: null,        subjectContent: null,        subjectStandard: null,        checkStatus: null,        checkResult: null,      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        recordId: [
+          { required: true, message: "计划ID不能为空", trigger: "blur" }
+        ],        subjectId: [
+          { required: true, message: "项目ID不能为空", trigger: "blur" }
+        ],        subjectCode: [
+          { required: true, message: "项目编码不能为空", trigger: "blur" }
+        ],        subjectContent: [
+          { required: true, message: "项目内容不能为空", trigger: "blur" }
+        ],        checkStatus: [
+          { required: true, message: "点检结果不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检记录行列表 */
+    getList() {
+      this.loading = true;
+      listCheckrecordline(this.queryParams).then(response => {
+        this.checkrecordlineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: null,        recordId: this.recordId,        subjectId: null,        subjectCode: null,        subjectName: null,        subjectType: null,        subjectContent: null,        subjectStandard: null,        checkStatus: "Y",        checkResult: null,        attr1: null,        attr2: null,        attr3: null,        attr4: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.lineId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备点检记录行";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const lineId = row.lineId || this.ids
+      getCheckrecordline(lineId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备点检记录行";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.lineId != null) {
+            updateCheckrecordline(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckrecordline(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lineIds = row.lineId || this.ids;
+      this.$modal.confirm('是否确认删除设备点检记录行编号为"' + lineIds + '"的数据项？').then(function() {
+        return delCheckrecordline(lineIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleSelectSubject(){
+      this.$refs.subjectSelect.showFlag = true;
+    },
+    onSubjectSelected(obj){
+      if(obj){
+        this.form.subjectId = obj.subjectId;
+        this.form.subjectCode = obj.subjectCode;
+        this.form.subjectName = obj.subjectName;
+        this.form.subjectType = obj.subjectType;
+        this.form.subjectContent = obj.subjectContent;
+        this.form.subjectStandard = obj.subjectStandard;
+      }
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/machinery/components/Checkplan.vue b/gear-ui3/src/views/dv/machinery/components/Checkplan.vue
new file mode 100644
index 0000000..47c7469
--- /dev/null
+++ b/gear-ui3/src/views/dv/machinery/components/Checkplan.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="loading" :data="checkplanList">
+      <el-table-column label="计划编码" align="center" prop="planCode" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="计划名称" align="center" width="200px" prop="planName" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始日期" align="center" prop="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束日期" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="频率" align="center" prop="cycleType">
+        <template slot-scope="scope">
+          {{scope.row.cycleCount}}
+          <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </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"-->
+<!--    />-->
+  </div>
+</template>
+
+<script>
+
+import {getCheckPlan} from "@/api/mes/dv/checkplan";
+
+export default {
+  name: "CheckPlan",
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_cycle_type, mes_order_status } = proxy.useDict("mes_cycle_type", "mes_order_status");
+    return {
+      mes_cycle_type,
+      mes_order_status
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      // 点检 / 保养数据
+      checkplanList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+      },
+    };
+  },
+
+  created() {
+  },
+  methods: {
+    getOpen(query) {
+      this.queryParams.planType = query.planType
+      this.queryParams.machineryCode = query.machineryCode
+      this.getList()
+    },
+    getList() {
+      this.loading = true;
+      getCheckPlan(this.queryParams).then(response => {
+        this.checkplanList = response.data;
+        // this.checkplanList = response.rows;
+        // this.total = response.total;
+        this.loading = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/machinery/components/Repair.vue b/gear-ui3/src/views/dv/machinery/components/Repair.vue
new file mode 100644
index 0000000..b789db3
--- /dev/null
+++ b/gear-ui3/src/views/dv/machinery/components/Repair.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="repairList">
+      <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
+      <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
+      <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修结果" align="center" prop="repairResult">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修人员" align="center" prop="acceptedBy" />
+      <el-table-column label="验收人员" align="center" prop="confirmBy" />
+      <el-table-column label="单据状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </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"-->
+    <!--    />-->
+  </div>
+</template>
+
+<script>
+import {getRepairList} from "@/api/mes/dv/repair";
+
+export default {
+  name: "Repair",
+  dicts: ['mes_repair_result', 'mes_order_status'],
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_repair_result, mes_order_status } = proxy.useDict("mes_repair_result", "mes_order_status");
+    return {
+      mes_repair_result,
+      mes_order_status
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 总条数
+      total: 0,
+      // 点检 / 保养数据
+      repairList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+      },
+    };
+  },
+  methods: {
+    getOpen(query) {
+      this.queryParams.machineryCode = query.machineryCode
+      this.getList()
+    },
+    getList() {
+      this.loading = true;
+      getRepairList(this.queryParams).then(response => {
+        this.repairList = response.data;
+        this.loading = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/machinery/index.vue b/gear-ui3/src/views/dv/machinery/index.vue
new file mode 100644
index 0000000..9da1a09
--- /dev/null
+++ b/gear-ui3/src/views/dv/machinery/index.vue
@@ -0,0 +1,745 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="machineryTypeName"
+            placeholder="请输入分类名称"
+            clearable
+            size="small"
+            prefix-icon="Search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="machineryTypeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--设备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="设备编码" prop="machineryCode">
+            <el-input
+              v-model="queryParams.machineryCode"
+              placeholder="请输入设备编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="machineryName">
+            <el-input
+              v-model="queryParams.machineryName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="Plus"
+              size="mini"
+              @click="handleAdd"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="Edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="Download"
+              size="mini"
+              @click="handleExport"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="handleView(scope.row)"
+                >{{scope.row.machineryCode}}</el-button>
+              </template>
+          </el-table-column>
+          <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
+          <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
+          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
+          <el-table-column label="设备状态" align="center" key="status" prop="status" >
+            <template slot-scope="scope">
+              <dict-tag :options="mes_machinery_status" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+              >删除</el-button>
+            </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-col>
+    </el-row>
+
+    <!-- 添加或修改设备对话框 -->
+    <el-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="14">
+            <el-row>
+              <el-col :span="16">
+                <el-form-item label="设备编码" prop="machineryCode">
+                  <el-input v-model="form.machineryCode" :disabled="optType != 'add'" readonly="readonly" maxlength="64" v-if="['view','edit'].indexOf(optType)> -1"/>
+                  <el-input v-model="form.machineryCode" :disabled="optType != 'add'" placeholder="请输入设备编码" maxlength="64" v-else/>
+                </el-form-item>
+              </el-col>
+<!--              <el-col :span="8">
+                <el-form-item  label-width="80">
+                  <el-switch v-model="autoGenFlag"
+                             active-color="#13ce66"
+                             active-text="自动生成"
+                             @change="handleAutoGenChange(autoGenFlag)" v-if="['view','edit'].indexOf(optType)< 0">
+                  </el-switch>
+                </el-form-item>
+              </el-col>-->
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="设备名称" prop="machineryName">
+                  <el-input v-model="form.machineryName"  maxlength="255" readonly="readonly" v-if="optType=='view'" />
+                  <el-input v-model="form.machineryName" placeholder="请输入设备名称" maxlength="255" v-else/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="品牌" prop="machineryBrand">
+                  <el-input v-model="form.machineryBrand"  maxlength="255" readonly="readonly" v-if="optType=='view'" />
+                  <el-input v-model="form.machineryBrand"  placeholder="请输入品牌" maxlength="255" v-else/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item  label="设备分类" prop="machineryTypeId">
+                  <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'"  />
+                  <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="所属车间" prop="workshopId">
+                  <el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间">
+                    <el-option
+                        v-for="item in workshopOptions"
+                        :key="item.workshopId"
+                        :label="item.workshopName"
+                        :value="item.workshopId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="设备状态" prop="status">
+                  <el-select v-model="form.status" placeholder="请选择设备状态">
+                    <el-option
+                      v-for="item in mes_machinery_status"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+<!--          <el-col :span="10">
+            <BarcodeImg ref="barcodeImg" :bussinessId="form.machineryId" :bussinessCode="form.machineryCode" barcodeType="MACHINERY"></BarcodeImg>
+          </el-col>-->
+        </el-row>
+        <el-row v-if="form.machineryId !=null">
+          <el-col :span="12">
+            <el-form-item label="最近点检时间" prop="lastCheckTime">
+              <el-date-picker clearable
+                v-model="form.lastCheckTime"
+                readonly
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="最近保养时间" prop="lastMaintenTime">
+              <el-date-picker clearable
+                v-model="form.lastMaintenTime"
+                readonly
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="machinerySpec">
+              <el-input v-model="form.machinerySpec" type="textarea" maxlength="255" readonly="readonly" v-if="optType=='view'" />
+              <el-input v-model="form.machinerySpec" type="textarea" placeholder="请输入规格型号" maxlength="255" v-else/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" readonly v-if="optType=='view'"></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" v-else></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-tabs type="border-card" v-model="activeName" v-if="optType != 'add'" @tab-click="handleActive">
+        <el-tab-pane label="点检记录" name="check">
+          <CheckPlan ref="checkList" />
+        </el-tab-pane>
+        <el-tab-pane label="保养记录" name="maintenance">
+          <CheckPlan ref="maintenanceList" />
+        </el-tab-pane>
+        <el-tab-pane label="维修记录" name="repair">
+          <Repair ref="repairList" />
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" v-if="optType !='view'">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 物料导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的设备数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import { listMachinerytype } from "@/api/mes/dv/machinerytype";
+// import { listAllWorkshop } from "@/api/mes/md/workshop";
+// import {genCode} from "@/api/system/autocode/rule"
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import BarcodeImg from "@/components/barcodeImg/index.vue";
+import CheckPlan from "./components/Checkplan.vue"
+import Repair from "./components/Repair.vue"
+// import {getBarcodeUrl} from "@/api/mes/wm/barcode";
+// import { hiprintMixin } from "../../../../mixins/hiprintMixin";
+// import {print} from "../../../../utils/print"
+// import {getByTemplateType} from "@/api/print/template";
+
+export default {
+  name: "Machinery",
+  components: { Treeselect, CheckPlan, Repair },
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { sys_yes_no, mes_machinery_status } = proxy.useDict("sys_yes_no", "mes_machinery_status");
+    return {
+      sys_yes_no,
+      mes_machinery_status
+    }
+  },
+  // mixins: [hiprintMixin],
+  data() {
+    return {
+      activeName: "check",
+      //自动生成编码
+      autoGenFlag:false,
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料产品表格数据
+      machineryList: [],
+      // 弹出层标题
+      title: "",
+      // 设备类型树选项
+      machineryTypeOptions: [],
+      //车间选项
+      workshopOptions:[],
+      // 是否显示弹出层
+      open: false,
+      // 设备类型名称
+      machineryTypeName: undefined,
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "machineryTypeName"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: import.meta.env.VITE_APP_BASE_API + "/mes/dv/machinery/importData"
+      },
+      //二维码查询参数
+      barcodeParams: {
+        bussinessId: null,
+        bussinessCode: null,
+        barcodeFormart: 'QR_CODE', //模式二维码
+        barcodeType: 'MACHINERY' //类型
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        status: null
+      },
+
+      // 表单校验
+      rules: {
+        machineryCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" },
+          { max: 64, message: '设备编码长度必须小于64个字符', trigger: 'blur' }
+        ],
+        machineryName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],
+        workshopId: [
+          { required: true, message: "车间不能为空",trigger: "blur"}
+        ],
+        machineryTypeId: [
+          { required: true, message: "设备分类不能为空", trigger: "blur" },
+        ],
+        remark: [
+          { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据设备分类名称筛选分类树
+    machineryTypeName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    // 使用HiPrint打印
+    async handleHiPrint(row) {
+      let printData = row
+      let printTemplate
+      // 处理数据 - 获取条形码图片地址
+      let barcodeParams = {
+        bussinessId: row.machineryId,
+        bussinessCode: row.machineryCode,
+        barcodeFormart: "QR_CODE",
+        barcodeType: "MACHINERY"
+      };
+      /*await getBarcodeUrl(barcodeParams).then(res => {
+        if (res.data) {
+          printData.barcodeContent = res.data.barcodeContent
+        } else {
+          printData.barcodeContent = ''
+        }
+      })*/
+      // 获取打印模板
+      let templateStatus = true
+      /*await getByTemplateType("MACHINERY").then(res => {
+        printTemplate = res.data.templateJson
+      }).catch(err => {
+        templateStatus = false
+      })*/
+      /*if (templateStatus) {
+        print(printTemplate, printData, this.hiprintTemplate, this.hiprintThis)
+      }*/
+
+    },
+    handleActive (tab) {
+      const query = {}
+      query.machineryCode = this.form.machineryCode
+      if (tab.name == "check") {
+        query.planType = "CHECK"
+        this.$refs.checkList.getOpen(query)
+      }
+      if (tab.name == "maintenance") {
+        query.planType = "MAINTEN"
+        this.$refs.maintenanceList.getOpen(query)
+      }
+      if (tab.name == "repair") {
+        this.$refs.repairList.getOpen(query)
+      }
+    },
+    changeWorkshop(val) {
+      const workshop = this.workshopOptions.filter(item => item.workshopId == val)
+      this.form.workshopId = workshop[0].workshopId
+      this.form.workshopName = workshop[0].workshopName
+      this.form.workshopCode = workshop[0].workshopCode
+    },
+    /** 查询物料编码列表 */
+    getList() {
+      this.loading = true;
+      listMachinery(this.queryParams).then(response => {
+          this.machineryList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /*getWorkshops(){
+      listAllWorkshop().then( response => {
+        this.workshopOptions =response.data;
+      });
+    },*/
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children
+      };
+    },
+	/** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then(response => {
+        debugger;
+        this.machineryTypeOptions = [];
+        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        this.machineryTypeOptions.push(data);
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.machineryTypeName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.machineryTypeId = data.machineryTypeId;
+      this.handleQuery();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        lastMaintenTime: null,
+        lastCheckTime: null,
+        status: "STOP",
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.machineryId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 查询明细按钮操作
+    handleView(row){
+      this.reset();
+      this.getTreeselect();
+      // this.getWorkshops();
+      const machineryId = row.machineryId || this.ids;
+      getMachinery(machineryId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看设备信息";
+        this.optType = "view";
+        this.activeName = "check"
+        const query = {
+          machineryCode: this.form.machineryCode,
+          planType: "CHECK"
+        }
+        this.$nextTick(()=>{
+          // this.$refs.barcodeImg.getBarcode();
+          this.$refs.checkList.getOpen(query)
+        })
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      debugger;
+      this.reset();
+      this.getTreeselect();
+      // this.getWorkshops();
+      if(this.queryParams.machineryTypeId != 0){
+        this.form.machineryTypeId = this.queryParams.machineryTypeId;
+      }
+      this.optType = "add";
+      this.open = true;
+      this.title = "新增设备";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      // this.getWorkshops();
+      const machineryId = row.machineryId || this.ids
+      getMachinery(machineryId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备";
+        this.optType = "edit";
+        this.activeName = "check"
+        const query = {
+          machineryCode: this.form.machineryCode,
+          planType: "CHECK"
+        }
+        this.$nextTick(()=>{
+          // this.$refs.barcodeImg.getBarcode();
+          this.$refs.checkList.getOpen(query)
+        })
+      });
+    },
+
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.machineryId != undefined) {
+            updateMachinery(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            debugger;
+            addMachinery(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const machineryIds = row.machineryId || this.ids;
+      this.$modal.confirm('确认删除数据项？').then(function() {
+        return delMachinery(machineryIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/dv/machinery/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "设备导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('mes/dv/machinery/importTemplate', {
+      }, `md_item_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    //自动生成编码
+    /*handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        genCode('MACHINERY_CODE').then(response =>{
+          this.form.machineryCode = response;
+        });
+      }else{
+        this.form.machineryCode = null;
+      }
+    }*/
+  }
+};
+</script>
+<style scoped>
+.flex-container{
+  display: flex;
+  justify-content: center; /* 水平居中 */
+  align-items: center; /* 垂直居中 */
+}
+.barcodeClass {
+  width: 200px;
+  height: 200px;
+  border: 1px dashed;
+  position: relative;
+  display: inline-block;
+}
+</style>
diff --git a/gear-ui3/src/views/dv/machinerytype/index.vue b/gear-ui3/src/views/dv/machinerytype/index.vue
new file mode 100644
index 0000000..1679413
--- /dev/null
+++ b/gear-ui3/src/views/dv/machinerytype/index.vue
@@ -0,0 +1,298 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="类型名称" prop="machineryTypeName">
+        <el-input
+          v-model="queryParams.machineryTypeName"
+          placeholder="请输入设备类型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select v-model="queryParams.enableFlag" placeholder="选择是或否" clearable>
+          <el-option
+            v-for="dict in sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="machinerytypeList"
+      row-key="machineryTypeId"
+      default-expand-all
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="设备类型编码" prop="machineryTypeCode" />
+      <el-table-column label="设备类型名称" align="center" prop="machineryTypeName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
+        </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 slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Plus"
+            @click="handleAdd(scope.row)"
+          >新增</el-button>
+          <el-button
+            v-if="scope.row.parentTypeId != 0"
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改设备类型对话框 -->
+    <el-dialog :title="title" v-model="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentTypeId !== 0">
+            <el-form-item label="父类型" prop="parentTypeId">
+              <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备类型名称" prop="machineryTypeName">
+              <el-input v-model="form.machineryTypeName" placeholder="请输入设备类型名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enableFlag" v-else>
+                <el-radio
+                  v-for="dict in sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Machinerytype",
+  dicts: ['sys_yes_no'],
+  components: {
+    Treeselect
+  },
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { sys_yes_no } = proxy.useDict("sys_yes_no");
+    return {
+      sys_yes_no
+    }
+  },
+  data() {
+    return {
+      optType:undefined,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 设备类型表格数据
+      machinerytypeList: [],
+      // 设备类型树选项
+      machinerytypeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        machineryTypeCode: null,
+        machineryTypeName: null,
+        parentTypeId: null,
+        ancestors: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentTypeId: [
+          { required: true, message: "父类型不能为空", trigger: "blur" }
+        ],
+        machineryTypeName: [
+          { required: true, message: "设备类型名称不能为空", trigger: "blur" },
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备类型列表 */
+    getList() {
+      this.loading = true;
+      listMachinerytype(this.queryParams).then(response => {
+        this.machinerytypeList = this.handleTree(response.data, "machineryTypeId", "parentTypeId");
+        this.loading = false;
+      });
+    },
+    /** 转换设备类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.machineryTypeId,
+        label: node.machineryTypeName,
+        children: node.children
+      };
+    },
+	/** 查询设备类型下拉树结构 */
+    getTreeselect() {
+      listMachinerytype().then(response => {
+        debugger;
+        this.machinerytypeOptions = [];
+        const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
+        this.machinerytypeOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        machineryTypeId: null,
+        machineryTypeName: null,
+        parentTypeId: 1,
+        ancestors: null,
+        enableFlag: 'Y',
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.machineryTypeId) {
+        this.form.parentTypeId = row.machineryTypeId;
+      } else {
+        this.form.parentTypeId = 0;
+      }
+      this.open = true;
+      this.title = "添加设备类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentTypeId = row.machineryTypeId;
+      }
+      getMachinerytype(row.machineryTypeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.machineryTypeId != null) {
+            updateMachinerytype(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMachinerytype(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除设备类型编号为"' + row.machineryTypeId + '"的数据项？').then(function() {
+        return delMachinerytype(row.machineryTypeId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/maintenrecord/index.vue b/gear-ui3/src/views/dv/maintenrecord/index.vue
new file mode 100644
index 0000000..41f305b
--- /dev/null
+++ b/gear-ui3/src/views/dv/maintenrecord/index.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="设备编码" prop="machineryCode">
+        <el-input
+          v-model="queryParams.machineryCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="machineryName">
+        <el-input
+          v-model="queryParams.machineryName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保养人" prop="nickName">
+        <el-input
+          v-model="queryParams.nickName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保养时间" prop="maintenTime">
+        <el-date-picker clearable
+          v-model="queryParams.maintenTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择保养时间">
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="maintenrecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备编码" align="center" prop="machineryCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+          >{{scope.row.machineryCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备名称" align="center" prop="machineryName" />
+      <el-table-column label="品牌" align="center" prop="machineryBrand" />
+      <el-table-column label="规格型号" align="center" prop="machinerySpec" />
+      <el-table-column label="计划名称" align="center" prop="planName" />
+      <el-table-column label="保养时间" align="center" prop="maintenTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.maintenTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="保养人" align="center" prop="nickName" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status === 'PREPARE'"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.status === 'PREPARE'"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="设备编码" prop="machineryCode">
+              <el-input v-model="form.machineryCode" placeholder="请选择设备" >
+                <el-button slot="append" @click="handleSelectMachinery" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <MachinerySelectSingle ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelectSingle>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="machineryName">
+              <el-input v-model="form.machineryName" readonly="readonly" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="machineryBrand">
+              <el-input v-model="form.machineryBrand" readonly="readonly" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="machinerySpec">
+              <el-input v-model="form.machinerySpec" readonly="readonly" type="textarea" placeholder="请选择设备" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="保养计划" prop="planName">
+              <el-input v-model="form.planName" placeholder="请选择设备保养计划" >
+                <el-button slot="append" @click="handleSelectPlan" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <CheckplanSelect ref="checkplanSelect" planType="MAINTEN" @onSelected="onPlanAdd"></CheckplanSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保养人" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请选择保养人" >
+                <el-button slot="append" @click="handleUserSelect" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <UserSingleSelect ref="userSelect" @onSelected="onUserSelected"></UserSingleSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保养时间" prop="maintenTime">
+              <el-date-picker clearable
+                v-model="form.maintenTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择保养时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-divider v-if="form.recordId !=null" content-position="center">保养项目</el-divider>
+      <el-card shadow="always" v-if="form.recordId !=null" class="box-card">
+        <MaintenRecordLine ref="maintenRecordLine" :optType="optType" :recordId="form.recordId"></MaintenRecordLine>
+      </el-card>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返 回</el-button>
+        <el-button type="primary" @click="submitForm" v-if="optType !=='view' && form.status =='PREPARE' " >保 存</el-button>
+        <el-button type="success" @click="handleFinish" v-if="optType !=='view' && form.status =='PREPARE' " >提 交</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaintenrecord, getMaintenrecord, delMaintenrecord, addMaintenrecord, updateMaintenrecord } from "@/api/mes/dv/maintenrecord";
+import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
+import CheckplanSelect from "@/components/dvplanSelect/index.vue";
+import UserSingleSelect from "@/components/userSelect/single.vue"
+import MaintenRecordLine from "./line.vue"
+export default {
+  name: "Maintenrecord",
+  components: {MachinerySelectSingle, CheckplanSelect, UserSingleSelect, MaintenRecordLine},
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_order_status } = proxy.useDict("mes_order_status");
+    return {
+      mes_order_status
+    }
+  },
+  data() {
+    return {
+      optType: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备保养记录表格数据
+      maintenrecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        planId: null,        planCode: null,        planName: null,        planType: null,        machineryId: null,        machineryCode: null,        machineryName: null,        machineryBrand: null,        machinerySpec: null,        maintenTime: null,        userId: null,        userName: null,        nickName: null,        status: null,      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        machineryId: [
+          { required: true, message: "设备ID不能为空", trigger: "blur" }
+        ],        machineryCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" }
+        ],        machineryName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],        maintenTime: [
+          { required: true, message: "保养时间不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备保养记录列表 */
+    getList() {
+      this.loading = true;
+      listMaintenrecord(this.queryParams).then(response => {
+        this.maintenrecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+      recordId: null,        planId: null,        planCode: null,        planName: null,        planType: null,        machineryId: null,        machineryCode: null,        machineryName: null,        machineryBrand: null,        machinerySpec: null,        maintenTime: null,        userId: null,        userName: null,        nickName: null,        status: "PREPARE",        remark: null,        attr1: null,        attr2: null,        attr3: null,        attr4: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+      this.form.userId= this.$store.state.user.id;
+      this.form.nickName= this.$store.state.user.nick;
+      this.form.userName= this.$store.state.user.name;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备保养记录";
+      this.optType = "add";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getMaintenrecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备保养记录";
+        this.optType = "edit";
+      });
+    },
+    handleView(row) {
+      this.reset();
+      const recordId = row.recordId || this.ids
+      getMaintenrecord(recordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看设备保养记录";
+        this.optType = "view";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordId != null) {
+            updateMaintenrecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaintenrecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleFinish(){
+      if(this.form.recordId != null && this.form.status =='PREPARE'){
+        this.form.status='FINISHED';
+        updateMaintenrecord(this.form).then(response => {
+                this.$modal.msgSuccess("已提交");
+                this.open = false;
+                this.getList();
+        },err =>{
+          this.form.status='PREPARE';
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除设备保养记录编号为"' + recordIds + '"的数据项？').then(function() {
+        return delMaintenrecord(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+    handleSelectMachinery(){
+      this.$refs.machinerySelect.showFlag = true;
+    },
+
+    //设备资源选择回调
+    onMachineryAdd(obj){
+      if(obj !=null && obj != undefined){
+        this.form.machineryId = obj.machineryId;
+        this.form.machineryCode = obj.machineryCode;
+        this.form.machineryName = obj.machineryName;
+        this.form.machineryBrand = obj.machineryBrand;
+        this.form.machinerySpec = obj.machinerySpec;
+      }
+    },
+
+    handleSelectPlan(){
+      this.$refs.checkplanSelect.showFlag = true;
+    },
+
+    onPlanAdd(obj){
+      if(obj !=null && obj != undefined){
+        this.form.planId = obj.planId;
+        this.form.planCode = obj.planCode;
+        this.form.planName = obj.planName;
+        this.form.planType = obj.planType;
+      }
+    },
+
+    //点击人员选择按钮
+    handleUserSelect(){
+      this.$refs.userSelect.showFlag = true;
+    },
+    //人员选择返回
+    onUserSelected(row){
+      this.form.userId = row.userId;
+      this.form.nickName = row.nickName;
+      this.form.userName = row.userName;
+    },
+
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/maintenrecord/line.vue b/gear-ui3/src/views/dv/maintenrecord/line.vue
new file mode 100644
index 0000000..0765e3c
--- /dev/null
+++ b/gear-ui3/src/views/dv/maintenrecord/line.vue
@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" v-if="optType != 'view'" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="maintenrecordlineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目名称" align="center" prop="subjectName" />
+      <el-table-column label="项目内容" align="center" prop="subjectContent" />
+      <el-table-column label="标准" align="center" prop="subjectStandard" />
+      <el-table-column label="保养结果" align="center" prop="maintenStatus" />
+      <el-table-column label="异常描述" align="center" prop="maintenResult" />
+      <el-table-column label="操作" align="center" v-if="optType != 'view'" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="计划ID" prop="recordId">
+          <el-input v-model="form.recordId" placeholder="请输入计划ID" />
+        </el-form-item>
+        <el-form-item label="项目ID" prop="subjectId">
+          <el-input v-model="form.subjectId" placeholder="请输入项目ID" />
+        </el-form-item>
+        <el-form-item label="项目编码" prop="subjectCode">
+          <el-input v-model="form.subjectCode" placeholder="请输入项目编码" />
+        </el-form-item>
+        <el-form-item label="项目名称" prop="subjectName">
+          <el-input v-model="form.subjectName" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="项目类型" prop="subjectType">
+          <el-select v-model="form.subjectType" placeholder="请选择项目类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="项目内容" prop="subjectContent">
+          <editor v-model="form.subjectContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="标准" prop="subjectStandard">
+          <el-input v-model="form.subjectStandard" placeholder="请输入标准" />
+        </el-form-item>
+        <el-form-item label="保养结果">
+          <el-radio-group v-model="form.maintenStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="异常描述" prop="maintenResult">
+          <el-input v-model="form.maintenResult" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaintenrecordline, getMaintenrecordline, delMaintenrecordline, addMaintenrecordline, updateMaintenrecordline } from "@/api/mes/dv/maintenrecordline";
+import DvSubjectSelect from "@/components/dvsubjectSelect/single.vue";
+export default {
+  name: "Maintenrecordline",
+  props:{
+    optType: null,
+    recordId: null,
+  },
+  dicts: ['dv_cm_result_status'],
+  components:{ DvSubjectSelect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备保养记录行表格数据
+      maintenrecordlineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        recordId: null,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        maintenStatus: null,
+        maintenResult: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        recordId: [
+          { required: true, message: "计划ID不能为空", trigger: "blur" }
+        ],        subjectId: [
+          { required: true, message: "项目ID不能为空", trigger: "blur" }
+        ],        subjectCode: [
+          { required: true, message: "项目编码不能为空", trigger: "blur" }
+        ],        subjectContent: [
+          { required: true, message: "项目内容不能为空", trigger: "blur" }
+        ],        maintenStatus: [
+          { required: true, message: "保养结果不能为空", trigger: "blur" }
+        ],      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备保养记录行列表 */
+    getList() {
+      this.loading = true;
+      listMaintenrecordline(this.queryParams).then(response => {
+        this.maintenrecordlineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: null,
+        recordId: null,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        maintenStatus: "0",
+        maintenResult: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.lineId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备保养记录行";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const lineId = row.lineId || this.ids
+      getMaintenrecordline(lineId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备保养记录行";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.lineId != null) {
+            updateMaintenrecordline(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaintenrecordline(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lineIds = row.lineId || this.ids;
+      this.$modal.confirm('是否确认删除设备保养记录行编号为"' + lineIds + '"的数据项？').then(function() {
+        return delMaintenrecordline(lineIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dv/maintenrecordline/export', {
+        ...this.queryParams
+      }, `maintenrecordline_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/repair/index.vue b/gear-ui3/src/views/dv/repair/index.vue
new file mode 100644
index 0000000..85fcb31
--- /dev/null
+++ b/gear-ui3/src/views/dv/repair/index.vue
@@ -0,0 +1,511 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="维修单编号" prop="repairCode">
+        <el-input
+          v-model="queryParams.repairCode"
+          placeholder="请输入维修单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修单名称" prop="repairName">
+        <el-input
+          v-model="queryParams.repairName"
+          placeholder="请输入维修单名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="设备编码" prop="machineryCode">
+        <el-input
+          v-model="queryParams.machineryCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="machineryName">
+        <el-input
+          v-model="queryParams.machineryName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修结果" prop="repairResult">
+        <el-select v-model="queryParams.repairResult" placeholder="请选择维修结果" clearable>
+          <el-option
+            v-for="dict in mes_repair_result"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option
+            v-for="dict in mes_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="repairList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
+      <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备编码" align="center" prop="machineryCode" />
+      <el-table-column label="设备名称" align="center" prop="machineryName" />
+      <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修结果" align="center" prop="repairResult">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修人员" align="center" prop="acceptedBy" />
+      <el-table-column label="验收人员" align="center" prop="confirmBy" />
+      <el-table-column label="单据状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="维修单编号" prop="repairCode">
+              <el-input v-model="form.repairCode" placeholder="请输入维修单编号" />
+            </el-form-item>
+          </el-col>
+<!--           <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
+              </el-switch>
+            </el-form-item>
+          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="维修单名称" prop="repairName">
+              <el-input v-model="form.repairName" placeholder="请输入维修单名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="设备编号" prop="machineryCode">
+              <el-input v-model="form.machineryCode" placeholder="请选择设备" disabled >
+                <el-button style="border-color: #46a6ff; background-color: #46a6ff;color: white;" slot="append" @click="handleMachineryAdd" icon="Search"></el-button>
+              </el-input>
+            </el-form-item>
+            <MachinerySelectSingle ref="machinerySelect" @onSelected="onMachineryAdd"></MachinerySelectSingle>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称" prop="machineryName">
+              <el-input v-model="form.machineryName" placeholder="请选择设备" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="machineryBrand">
+              <el-input v-model="form.machineryBrand" placeholder="请选择设备" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="报修日期" prop="requireDate">
+              <el-date-picker clearable
+                v-model="form.requireDate"
+                style="width: 187px"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择报修日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="维修完成日期" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' " prop="finishDate">
+              <el-date-picker clearable
+                v-model="form.finishDate"
+                style="width: 187px"
+                type="date"
+                value-format="yyyy-MM-dd "
+                placeholder="请选择维修完成日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="验收日期" v-if="form.status=='FINISHED' || form.status=='CONFIRMED' " prop="confirmDate">
+              <el-date-picker clearable
+                v-model="form.confirmDate"
+                style="width: 187px"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择验收日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="维修结果" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' ">
+              <el-radio-group v-model="form.repairResult">
+                <el-radio
+                  v-for="dict in mes_repair_result"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="维修人员" prop="acceptedName" v-if="form.status =='APPROVING' || form.status=='FINISHED' || form.status=='CONFIRMED' ">
+              <el-input v-model="form.acceptedName" readonly="readonly"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="验收人员" prop="confirmName" v-if="form.status=='FINISHED' || form.status=='CONFIRMED' ">
+              <el-input v-model="form.confirmName" readonly="readonly"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-divider v-if="form.repairId !=null" content-position="center">维修内容</el-divider>
+      <el-card shadow="always" v-if="form.repairId !=null" class="box-card">
+        <Repairline ref="line" :repairId="form.repairId" :optType="optType"></Repairline>
+      </el-card>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">提 交</el-button>
+<!--        <el-button type="primary" v-if="form.status =='PREPARE' && optType !='view'" @click="submitForm">提 交</el-button>
+        <el-button type="primary" v-if="form.status == 'APPROVING' && optType !='view'" @click="finish">完成维修</el-button>
+        <el-button type="success" v-if="form.status == 'FINISHED' && optType !='view'" @click="confirm">验收通过</el-button>
+        <el-button type="danger" v-if="form.status == 'FINISHED' && optType !='view'" @click="unconfirm">不通过</el-button>-->
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRepair, getRepair, delRepair, addRepair, updateRepair } from "@/api/mes/dv/repair";
+import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
+import Repairline from './line.vue'
+// import {genCode} from "@/api/system/autocode/rule"
+export default {
+  name: "Repair",
+  components: {Repairline,MachinerySelectSingle},
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { mes_repair_result, mes_order_status } = proxy.useDict("mes_repair_result", "mes_order_status");
+    return {
+      mes_repair_result,
+      mes_order_status
+    }
+  },
+  data() {
+    return {
+      autoGenFlag:false,
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备维修单表格数据
+      repairList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        repairCode: null,
+        repairName: null,
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        requireDate: null,
+        finishDate: null,
+        confirmDate: null,
+        repairResult: null,
+        acceptedBy: null,
+        confirmBy: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        repairCode: [
+          { required: true, message: "维修单编号不能为空", trigger: "blur" },
+          { max: 64, message: "字段过长", trigger: "blur" }
+        ],
+        repairName: [
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
+        machineryId: [
+          { required: true, message: "设备ID不能为空", trigger: "blur" }
+        ],
+        machineryCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" }
+        ],
+        machineryName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],
+        requireDate: [
+          { required: true, message: "请选择报修日期", trigger: "blur" }
+        ],
+        remark: [
+          { max: 250, message: '长度必须小于250个字符', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备维修单列表 */
+    getList() {
+      this.loading = true;
+      listRepair(this.queryParams).then(response => {
+        this.repairList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        repairId: null,
+        repairCode: null,
+        repairName: null,
+        machineryId: null,
+        machineryCode: null,
+        machineryName: null,
+        machineryBrand: null,
+        machinerySpec: null,
+        machineryTypeId: null,
+        requireDate: null,
+        finishDate: null,
+        confirmDate: null,
+        repairResult: "",
+        acceptedBy: null,
+        confirmBy: null,
+        status: 'PREPARE',
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag= false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.repairId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备维修单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const repairId = row.repairId || this.ids
+      getRepair(repairId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备维修单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.repairId != null) {
+            updateRepair(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRepair(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const repairIds = row.repairId || this.ids;
+      this.$modal.confirm('是否确认删除设备维修单编号为"' + repairIds + '"的数据项？').then(function() {
+        return delRepair(repairIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dv/repair/export', {
+        ...this.queryParams
+      }, `repair_${new Date().getTime()}.xlsx`)
+    },
+    //设备资源选择弹出
+    handleMachineryAdd(){
+      this.$refs.machinerySelect.handleOpen(this.form.machineryId)
+    },
+    //设备资源选择回调
+    onMachineryAdd(row){
+      this.form.machineryId = row.machineryId;
+      this.form.machineryTypeId = row.machineryTypeId;
+      this.form.machineryCode = row.machineryCode;
+      this.form.machineryName = row.machineryName;
+      this.form.machineryBrand = row.machineryBrand;
+    },
+        //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        /*genCode('DV_REPAIR_CODE').then(response =>{
+          this.form.repairCode = response;
+        });*/
+      }else{
+        this.form.repairCode = null;
+      }
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/repair/line.vue b/gear-ui3/src/views/dv/repair/line.vue
new file mode 100644
index 0000000..ce6e18b
--- /dev/null
+++ b/gear-ui3/src/views/dv/repair/line.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="repairlineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目名称" align="center" prop="subjectName" />
+      <el-table-column label="故障描述" align="center" prop="malfunction" >
+<!--        <template slot-scope="scope">-->
+<!--          <el-input type="textarea">{{scope.row.malfunction}}</el-input>-->
+<!--        </template>-->
+      </el-table-column>
+      <el-table-column label="故障描述资源" align="center" prop="malfunctionUrl" >
+
+      </el-table-column>
+      <el-table-column label="维修情况" align="center" prop="repairDes" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="项目名称" prop="subjectCode">
+          <el-select v-model="form.subjectName" @change="changeSubject" filterable placeholder="请输入项目名称" style="width: 100%">
+            <el-option
+              v-for="item in dvsubjectList"
+              :key="item.subjectId"
+              :label="item.subjectName"
+              :value="item.subjectCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障描述" prop="malfunction">
+          <el-input v-model="form.malfunction" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="故障描述资源" prop="malfunctionUrl">
+          <el-input type="textarea" v-model="form.malfunctionUrl" placeholder="请输入故障描述资源" />
+        </el-form-item>
+        <el-form-item label="维修情况" prop="repairDes">
+          <el-input  v-model="form.repairDes" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRepairline, getRepairline, delRepairline, addRepairline, updateRepairline } from "@/api/mes/dv/repairline";
+import { listDvsubject } from "@/api/mes/dv/dvsubject";
+
+export default {
+  name: "Repairline",
+  props: {
+    repairId: null,
+    optType: undefined
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 项目选择
+      dvsubjectList: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备维修单行表格数据
+      repairlineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        repairId: this.repairId,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        malfunction: null,
+        malfunctionUrl: null,
+        repairDes: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        subjectCode: [
+          { required: true, message: "项目名称不能为空", trigger: "blur" }
+        ],
+        malfunction: [
+          { required: true, message: "故障描述不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    listDvsubject({pageNum: 1, pageSize: 99999}).then(res =>{
+      this.dvsubjectList = res.rows
+    })
+  },
+  methods: {
+    // 选择项目
+    changeSubject(val) {
+      let data = (this.dvsubjectList.filter(item => item.subjectCode == val))[0]
+      this.form.subjectId = data.subjectId
+      this.form.subjectName = data.subjectName
+      this.form.subjectCode = data.subjectCode
+      this.form.subjectContent = data.subjectContent
+    },
+    /** 查询设备维修单行列表 */
+    getList() {
+      this.loading = true;
+      listRepairline(this.queryParams).then(response => {
+        this.repairlineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: null,
+        repairId: this.repairId,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        malfunction: null,
+        malfunctionUrl: null,
+        repairDes: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.lineId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备维修单行";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const lineId = row.lineId || this.ids
+      getRepairline(lineId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备维修单行";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.lineId != null) {
+            updateRepairline(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRepairline(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lineIds = row.lineId || this.ids;
+      this.$modal.confirm('是否确认删除当前数据项？').then(function() {
+        return delRepairline(lineIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dv/repairline/export', {
+        ...this.queryParams
+      }, `repairline_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue b/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
new file mode 100644
index 0000000..f81196c
--- /dev/null
+++ b/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
@@ -0,0 +1,483 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="specificationModel">
+        <el-input
+          v-model="queryParams.specificationModel"
+          placeholder="请输入规格型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="制造单位" prop="manufacturer">
+        <el-input
+          v-model="queryParams.manufacturer"
+          placeholder="请输入制造单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="制造日期" prop="productionDate">
+        <el-date-picker clearable
+          v-model="queryParams.productionDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择制造日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="安装日期" prop="installationDate">
+        <el-date-picker clearable
+          v-model="queryParams.installationDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择安装日期">
+        </el-date-picker>
+      </el-form-item>-->
+      <el-form-item label="使用日期" prop="useStartDate">
+        <el-date-picker clearable
+          v-model="queryParams.useStartDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择投入使用日期">
+        </el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="注册编号" prop="registrationNo">
+        <el-input
+          v-model="queryParams.registrationNo"
+          placeholder="请输入特种设备注册编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="负责人" prop="safetyManager">
+        <el-input
+          v-model="queryParams.safetyManager"
+          placeholder="请输入安全负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="当前状态" prop="currentStatus">
+        <el-select v-model="queryParams.currentStatus" placeholder="请选择当前状态" clearable>
+          <el-option
+            v-for="dict in special_equipment_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="specialEquipmentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备ID" align="center" prop="equipmentId" v-if="false"/>
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column label="规格型号" align="center" prop="specificationModel" />
+      <el-table-column label="制造单位" align="center" prop="manufacturer" />
+<!--      <el-table-column label="制造日期" align="center" prop="productionDate" width="98">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装日期" align="center" prop="installationDate" width="98">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.installationDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="投入使用日期" align="center" prop="useStartDate" width="98">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="注册编号" align="center" prop="registrationNo" />
+      <el-table-column label="安全负责人" align="center" prop="safetyManager" />
+<!--      <el-table-column label="附件路径" align="center" prop="attachment" />-->
+      <el-table-column label="检验周期" align="center" prop="inspectionCycle" />
+      <el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="98">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lastInspectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="98">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nextInspectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="当前状态" align="center" prop="currentStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="special_equipment_type" :value="scope.row.currentStatus"/>
+        </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 slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备编码" prop="equipmentCode">
+          <el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="equipmentName">
+          <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="规格型号" prop="specificationModel">
+          <el-input v-model="form.specificationModel" placeholder="请输入规格型号" />
+        </el-form-item>
+        <el-form-item label="制造单位" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入制造单位" />
+        </el-form-item>
+        <el-form-item label="制造日期" prop="productionDate">
+          <el-date-picker clearable
+            v-model="form.productionDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择制造日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="安装日期" prop="installationDate">
+          <el-date-picker clearable
+            v-model="form.installationDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择安装日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用日期" prop="useStartDate">
+          <el-date-picker clearable
+            v-model="form.useStartDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择投入使用日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="注册编号" prop="registrationNo">
+          <el-input v-model="form.registrationNo" placeholder="请输入特种设备注册编号" />
+        </el-form-item>
+        <el-form-item label="检验周期" prop="inspectionCycle">
+          <el-input v-model="form.inspectionCycle" placeholder="请输入检验周期" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="safetyManager">
+          <el-input v-model="form.safetyManager" placeholder="请输入安全负责人" />
+        </el-form-item>
+        <el-form-item label="上次检验时间" prop="lastInspectionTime" label-width="107px">
+          <el-date-picker clearable
+            v-model="form.lastInspectionTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择上次检验时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="下次检验时间" prop="nextInspectionTime" label-width="107px">
+          <el-date-picker clearable
+            v-model="form.nextInspectionTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择下次检验时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="附件" prop="attachment">
+          <file-upload v-model="form.attachment" :limit="1" :fileType="fileType" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="当前状态" prop="currentStatus">
+          <el-radio-group v-model="form.currentStatus">
+            <el-radio
+              v-for="dict in special_equipment_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSpecialEquipment, getSpecialEquipment, delSpecialEquipment, addSpecialEquipment, updateSpecialEquipment } from "@/api/mes/dv/specialEquipment";
+
+export default {
+  name: "SpecialEquipment",
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { special_equipment_type } = proxy.useDict("special_equipment_type");
+    return {
+      special_equipment_type
+    }
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 特种设备（包含锅炉、压力管道、电梯等特种设备信息）表格数据
+      specialEquipmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        equipmentCode: undefined,
+        equipmentName: undefined,
+        specificationModel: undefined,
+        manufacturer: undefined,
+        productionDate: undefined,
+        installationDate: undefined,
+        useStartDate: undefined,
+        registrationNo: undefined,
+        safetyManager: undefined,
+        attachment: undefined,
+        inspectionCycle: undefined,
+        lastInspectionTime: undefined,
+        nextInspectionTime: undefined,
+        currentStatus: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        equipmentCode: [
+          { required: true, message: "设备编码不能为空", trigger: "blur" }
+        ],
+        equipmentName: [
+          { required: true, message: "设备名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询特种设备（包含锅炉、压力管道、电梯等特种设备信息）列表 */
+    getList() {
+      this.loading = true;
+      listSpecialEquipment(this.queryParams).then(response => {
+        this.specialEquipmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        equipmentId: undefined,
+        equipmentCode: undefined,
+        equipmentName: undefined,
+        specificationModel: undefined,
+        manufacturer: undefined,
+        productionDate: undefined,
+        installationDate: undefined,
+        useStartDate: undefined,
+        registrationNo: undefined,
+        safetyManager: undefined,
+        attachment: undefined,
+        inspectionCycle: undefined,
+        lastInspectionTime: undefined,
+        nextInspectionTime: undefined,
+        currentStatus: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.equipmentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加特种设备";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const equipmentId = row.equipmentId || this.ids
+      getSpecialEquipment(equipmentId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改特种设备";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.equipmentId != null) {
+            updateSpecialEquipment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addSpecialEquipment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const equipmentIds = row.equipmentId || this.ids;
+      this.$modal.confirm('是否确认删除特种设备编号为"' + equipmentIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delSpecialEquipment(equipmentIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/specialEquipment/export', {
+        ...this.queryParams
+      }, `specialEquipment_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/dv/subject/index.vue b/gear-ui3/src/views/dv/subject/index.vue
new file mode 100644
index 0000000..d4448b5
--- /dev/null
+++ b/gear-ui3/src/views/dv/subject/index.vue
@@ -0,0 +1,374 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目编码" prop="subjectCode">
+        <el-input
+          v-model="queryParams.subjectCode"
+          placeholder="请输入项目编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="subjectName">
+        <el-input
+          v-model="queryParams.subjectName"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目类型" prop="subjectType">
+        <el-select v-model="queryParams.subjectType" placeholder="请选择项目类型" clearable>
+          <el-option
+            v-for="dict in mes_dvsubject_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目编码" align="center" prop="subjectCode" />
+      <el-table-column label="项目类型" align="center" prop="subjectType">
+        <template slot-scope="scope">
+          <dict-tag :options="mes_dvsubject_type" :value="scope.row.subjectType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="subjectName" />
+      <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
+        </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 slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="Delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="项目编码" prop="subjectCode">
+              <el-input v-model="form.subjectCode" placeholder="请输入项目编码" />
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
+              </el-switch>
+            </el-form-item>
+          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="subjectName">
+              <el-input v-model="form.subjectName" placeholder="请输入项目名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目类型" prop="subjectType">
+              <el-radio-group v-model="form.subjectType">
+                <el-radio
+                  v-for="dict in mes_dvsubject_type"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用">
+              <el-radio-group v-model="form.enableFlag">
+                <el-radio
+                  v-for="dict in sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="项目内容" prop="subjectContent">
+          <el-input type="textarea" v-model="form.subjectContent" placeholder="请输入项目内容" />
+        </el-form-item>
+        <el-form-item label="标准" prop="subjectStandard">
+          <el-input type="textarea" v-model="form.subjectStandard" placeholder="请输入标准" autosize/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDvsubject, getDvsubject, delDvsubject, addDvsubject, updateDvsubject } from "@/api/mes/dv/dvsubject";
+// import {genCode} from "@/api/system/autocode/rule"
+export default {
+  name: "Dvsubject",
+  setup() {
+    const { proxy } = getCurrentInstance();
+    const { sys_yes_no, mes_dvsubject_type } = proxy.useDict("sys_yes_no", "mes_dvsubject_type");
+    return {
+      sys_yes_no,
+      mes_dvsubject_type
+    }
+  },
+  data() {
+    return {
+      autoGenFlag: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组s
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备点检保养项目表格数据
+      dvsubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        subjectCode: [
+          { required: true, message: "项目编码不能为空", trigger: "blur" },
+          { max: 64, message: "字段过长", trigger: "blur" }
+        ],
+        subjectType: [
+          { required: true, message: "请选择项目类型", trigger: "blur" }
+        ],
+        subjectName: [
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
+        subjectContent: [
+          { required: true, message: "项目内容不能为空", trigger: "blur" },
+          { max: 250, message: "字段过长", trigger: "blur" }
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备点检保养项目列表 */
+    getList() {
+      this.loading = true;
+      listDvsubject(this.queryParams).then(response => {
+        this.dvsubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+        enableFlag: "Y",
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.subjectId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备点检保养项目";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const subjectId = row.subjectId || this.ids
+      getDvsubject(subjectId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备点检保养项目";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.subjectId != null) {
+            updateDvsubject(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDvsubject(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subjectIds = row.subjectId || this.ids;
+      this.$modal.confirm('是否确认删除设备点检保养项目编号为"' + subjectIds + '"的数据项？').then(function() {
+        return delDvsubject(subjectIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/dv/dvsubject/export', {
+        ...this.queryParams
+      }, `dvsubject_${new Date().getTime()}.xlsx`)
+    },
+        //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        /*genCode('SUBJECT_CODE').then(response =>{
+          this.form.subjectCode = response;
+        });*/
+      }else{
+        this.form.subjectCode = null;
+      }
+    }
+  }
+};
+</script>
diff --git a/gear-ui3/src/views/finance/dashboard/index.vue b/gear-ui3/src/views/finance/dashboard/index.vue
index 5ce5bf6..45ea1bf 100644
--- a/gear-ui3/src/views/finance/dashboard/index.vue
+++ b/gear-ui3/src/views/finance/dashboard/index.vue
@@ -33,7 +33,7 @@
             <el-card class="indicator-card net-cashflow">
               <div class="card-header">
                 <span>净收益</span>
-                <i class="el-icon-refresh"></i>
+                <i class="Refresh"></i>
               </div>
               <div class="card-value">{{ netCashflow | formatCurrency }}</div>
               <!-- <div class="card-desc">较上期 <span class="rise">+8.0%</span></div> -->
diff --git a/gear-ui3/src/views/info/report/index.vue b/gear-ui3/src/views/info/report/index.vue
index ea82273..143e32c 100644
--- a/gear-ui3/src/views/info/report/index.vue
+++ b/gear-ui3/src/views/info/report/index.vue
@@ -43,7 +43,6 @@
           icon="Plus"
           size="small"
           @click="handleAdd"
-          v-hasPermi="['oa:projectReport:add']"
         >新增
         </el-button>
       </el-col>
@@ -55,7 +54,6 @@
           size="small"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:projectReport:edit']"
         >修改
         </el-button>
       </el-col>
@@ -67,7 +65,6 @@
           size="small"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:projectReport:remove']"
         >删除
         </el-button>
       </el-col>
@@ -78,7 +75,6 @@
           icon="Download"
           size="small"
           @click="handleExport"
-          v-hasPermi="['oa:projectReport:export']"
         >导出
         </el-button>
       </el-col>
diff --git a/gear-ui3/src/views/oms/otherIncome/index.vue b/gear-ui3/src/views/oms/otherIncome/index.vue
index 4e6de00..c393a02 100644
--- a/gear-ui3/src/views/oms/otherIncome/index.vue
+++ b/gear-ui3/src/views/oms/otherIncome/index.vue
@@ -1,11 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="收入来源" prop="source">
-        <el-input v-model="queryParams.source" placeholder="请输入收入来源" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="收支来源" prop="source">
+        <el-input v-model="queryParams.source" placeholder="请输入收支来源" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="收入类型" prop="incomeType">
-        <el-input v-model="queryParams.incomeType" placeholder="请输入收入类型" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="收支分类" prop="incomeType">
+        <el-input v-model="queryParams.incomeType" placeholder="请输入收支分类" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="收支类型" prop="type">
+        <el-radio-group v-model="type" @change="handleQuery">
+          <el-radio label="0">收入</el-radio>
+          <el-radio label="1">支出</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item>
         <el-button size="small" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,15 +37,15 @@
 
     <el-table v-loading="loading" :data="otherIncomeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="其他收入ID" align="center" prop="otherIncomeId" v-if="false" />
-      <el-table-column label="收入日期" align="center" prop="incomeDate" width="180">
+      <el-table-column label="其他收支ID" align="center" prop="otherIncomeId" v-if="false" />
+      <el-table-column label="收支日期" align="center" prop="incomeDate" width="180">
         <template #default="scope">
           <span>{{ formatterTime(scope.row.incomeDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="收入类型" align="center" prop="incomeType" />
-      <el-table-column label="收入金额" align="center" prop="amount" />
-      <el-table-column label="收入来源" align="center" prop="source" />
+      <el-table-column label="收支类型" align="center" prop="incomeType" />
+      <el-table-column label="收支金额" align="center" prop="amount" />
+      <el-table-column label="收支来源" align="center" prop="source" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -52,22 +58,29 @@
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
 
-    <!-- 添加或修改其他收入对话框 -->
+    <!-- 添加或修改其他收支对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="otherIncomeRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="收入日期" prop="incomeDate">
+        <!-- 单选框收入或支出 -->
+        <el-form-item label="收支类型" prop="type">
+          <el-radio-group v-model="type">
+            <el-radio label="0">收入</el-radio>
+            <el-radio label="1">支出</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="收支日期" prop="incomeDate">
           <el-date-picker clearable v-model="form.incomeDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择收入日期">
+            placeholder="请选择收支日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="收入类型" prop="incomeType">
-          <el-input v-model="form.incomeType" placeholder="请输入收入类型" />
+        <el-form-item label="收支分类" prop="incomeType">
+          <el-input v-model="form.incomeType" placeholder="请输入收支分类" />
         </el-form-item>
-        <el-form-item label="收入金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入收入金额" />
+        <el-form-item label="收支金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入收支金额" />
         </el-form-item>
-        <el-form-item label="收入来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入收入来源" />
+        <el-form-item label="收支来源" prop="source">
+          <el-input v-model="form.source" placeholder="请输入收支来源" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -99,6 +112,12 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 
+const type = ref('0');
+
+const typeLabel = computed(() => {
+  return type.value === '0' ? '收入' : '支出';
+})
+
 const formatterTime = (time) => {
   return proxy.parseTime(time, '{y}-{m}-{d}')
 }
@@ -112,6 +131,7 @@ const data = reactive({
     incomeType: undefined,
     amount: undefined,
     source: undefined,
+    type: 1
   },
   rules: {
   }
@@ -119,10 +139,10 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询其他收入列表 */
+/** 查询其他收支列表 */
 function getList() {
   loading.value = true;
-  listOtherIncome(queryParams.value).then(response => {
+  listOtherIncome({ ...queryParams.value, type: type.value }).then(response => {
     otherIncomeList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -148,7 +168,8 @@ function reset() {
     createTime: null,
     createBy: null,
     updateTime: null,
-    updateBy: null
+    updateBy: null,
+    type: type.value
   };
   proxy.resetForm("otherIncomeRef");
 }
@@ -176,7 +197,7 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加其他收入";
+  title.value = "添加其他收支";
 }
 
 /** 修改按钮操作 */
@@ -188,7 +209,7 @@ function handleUpdate(row) {
     loading.value = false;
     form.value = response.data;
     open.value = true;
-    title.value = "修改其他收入";
+    title.value = "修改其他收支";
   });
 }
 
@@ -206,7 +227,7 @@ function submitForm() {
           buttonLoading.value = false;
         });
       } else {
-        addOtherIncome(form.value).then(response => {
+        addOtherIncome({ ...form.value, type: type.value }).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -221,7 +242,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _otherIncomeIds = row.otherIncomeId || ids.value;
-  proxy.$modal.confirm('是否确认删除其他收入编号为"' + _otherIncomeIds + '"的数据项？').then(function () {
+  proxy.$modal.confirm('是否确认删除其他收支编号为"' + _otherIncomeIds + '"的数据项？').then(function () {
     loading.value = true;
     return delOtherIncome(_otherIncomeIds);
   }).then(() => {
diff --git a/gear-ui3/src/views/product/info/index.vue b/gear-ui3/src/views/product/info/index.vue
index be41655..75f0bad 100644
--- a/gear-ui3/src/views/product/info/index.vue
+++ b/gear-ui3/src/views/product/info/index.vue
@@ -7,6 +7,11 @@
       <el-form-item label="产品名称" prop="productName">
         <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="产品分类" prop="categoryId">
+        <el-select v-model="queryParams.categoryId" placeholder="请选择产品分类" clearable style="width: 100px">
+          <el-option v-for="item in categoryList" :key="item.categoryId" :label="item.categoryName" :value="item.categoryId" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="负责人" prop="salesManager">
         <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
       </el-form-item>
@@ -51,6 +56,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="产品编号" align="center" prop="productCode" />
       <el-table-column label="产品名称" align="center" prop="productName" />
+      <el-table-column label="产品分类" align="center" prop="categoryName" />
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="样品图" align="center">
diff --git a/gear-ui3/src/views/system/user/index.vue b/gear-ui3/src/views/system/user/index.vue
index 2ef5f7f..1d9cde7 100644
--- a/gear-ui3/src/views/system/user/index.vue
+++ b/gear-ui3/src/views/system/user/index.vue
@@ -217,6 +217,7 @@
 import { getToken } from "@/utils/auth"
 import useAppStore from '@/store/modules/app'
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user"
+
 import { Splitpanes, Pane } from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
 
@@ -488,8 +489,8 @@ function cancel() {
 function handleAdd() {
   reset()
   getUser().then(response => {
-    postOptions.value = response.posts
-    roleOptions.value = response.roles
+    postOptions.value = response.data.posts
+    roleOptions.value = response.data.roles
     open.value = true
     title.value = "添加用户"
     form.value.password = initPassword.value
@@ -502,10 +503,10 @@ function handleUpdate(row) {
   const userId = row.userId || ids.value
   getUser(userId).then(response => {
     form.value = response.data
-    postOptions.value = response.posts
-    roleOptions.value = response.roles
-    form.value.postIds = response.postIds
-    form.value.roleIds = response.roleIds
+    postOptions.value = response.data.posts
+    roleOptions.value = response.data.roles
+    form.value.postIds = response.data.postIds
+    form.value.roleIds = response.data.roleIds
     open.value = true
     title.value = "修改用户"
     form.password = ""
@@ -533,6 +534,8 @@ function submitForm() {
   })
 }
 
+
+
 onMounted(() => {
   getDeptTree()
   getList()