Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Reviewed-on: #214

.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-23 16:03:51
+ # @LastEditTime: 2024-02-26 08:45:43
- # @LastEditors: zhp
+ # @LastEditors: DY
  # @Description:
 ###
 # 开发环境配置
@@ -14,19 +14,16 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.30:8888'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
+VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'

src/api/base/orderGroup.js

@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+// 获得集团订单分页
+export function getOrderGroupPage(query) {
+  return request({
+    url: '/base/order-group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得集团订单
+export function getOrderGroup(query) {
+  return request({
+    url: '/base/order-group/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新集团订单
+export function updateOrderGroup(data) {
+  return request({
+    url: '/base/order-group/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建集团订单
+export function createOrderGroup(data) {
+  return request({
+    url: '/base/order-group/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改集团订单状态，结束-终止-作废用
+export function groupOrderStatusSet(data) {
+  return request({
+    url: '/base/order-group/groupOrderStatusSet',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得集团订单详情
+export function orderGroupDetail(query) {
+  return request({
+    url: '/base/order-group/getDetail',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建集团订单与厂务订单表关联表 一对多
+export function orderConGroupOrder(data) {
+  return request({
+    url: '/base/order-con-group-order/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 订单监控
+export function orderGroupMonitor(query) {
+  return request({
+    url: '/base/order-group/orderGroupMonitor',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/orderManage.js

@@ -8,6 +8,23 @@ export function orderList(query) {
   })
 }
 
+// 获得订单列表
+export function getOrderList(query) {
+  return request({
+    url: '/base/order/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得订单列表
+export function getFreeOrderList() {
+  return request({
+    url: '/base/order/getFreeOrderList',
+    method: 'get'
+  })
+}
+
 // 条件获得工单列表
 export function workOrderList(query) {
   return request({
@@ -86,6 +103,15 @@ export function orderDelete(query) {
   })
 }
 
+// 修改订单状态，结束-终止-作废用
+export function orderStatusSet(data) {
+  return request({
+    url: '/base/order/orderStatusSet',
+    method: 'put',
+    data: data
+  })
+}
+
 // 下发订单，绑定的穿工单id，新建不传
 export function orderIssue(data) {
   return request({
@@ -104,24 +130,6 @@ export function getWorkOrderById(query) {
   })
 }
 
-// 订单监控
-export function orderMonitor(query) {
-  return request({
-    url: '/base/order/orderMonitor',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id
-export function orderAssignmentList(query) {
-  return request({
-    url: '/base/order/orderAssignmentList',
-    method: 'get',
-    params: query
-  })
-}
-
 // 获得所有客户列表
 export function customerList() {
   return request({

src/api/equipment/base/inspection/record.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-16 20:15:02
+ * @LastEditTime: 2024-02-26 09:29:53
  * @LastEditors: DY
  * @Description: 
  */
@@ -68,3 +68,55 @@ export function deleteEqCheckLog(id) {
     method: 'delete'
   })
 }
+
+// 获得设备巡检单详情分页
+export function getCheckOrderDetPage(query) {
+  return request({
+    url: '/base/equipment-check-order-det/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建设备巡检单详情
+export function createCheckOrderDet(data) {
+  return request({
+    url: '/base/equipment-check-order-det/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备巡检单详情
+export function updateCheckOrderDet(data) {
+  return request({
+    url: '/base/equipment-check-order-det/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备巡检单详情
+export function deleteCheckOrderDet(id) {
+  return request({
+    url: '/base/equipment-check-order-det/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得设备巡检计划单
+export function getEqCheckOrder(id) {
+  return request({
+    url: '/base/equipment-check-order/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备巡检单分页
+export function getCheckOrderPage(query) {
+  return request({
+    url: '/base/equipment-check-order/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/equipment/base/inspection/settings.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-25 16:22:49
+ * @LastEditTime: 2024-02-25 22:23:54
  * @LastEditors: DY
  * @Description: 
  */
@@ -100,3 +100,63 @@ export function updateCheckConfig(data) {
     data: data
   })
 }
+
+// 创建巡检单
+export function createCheckOrder(data) {
+  return request({
+    url: '/base/equipment-check-order/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新巡检单
+export function updateCheckOrder(data) {
+  return request({
+    url: '/base/equipment-check-order/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得设备巡检单code
+export function getOrderCode() {
+  return request({
+    url: '/base/equipment-check-order/getCode',
+    method: 'get'
+  })
+}
+
+// 获得巡检单
+export function getCheckOrder(id) {
+  return request({
+    url: '/base/equipment-check-order/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得巡检单详细
+export function getCheckOrderDet(id) {
+  return request({
+    url: '/base/equipment-check-order-det/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 创建巡检单详情
+export function createCheckOrderDet(data) {
+  return request({
+    url: '/base/equipment-check-order-det/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新巡检单详情
+export function updateCheckOrderDet(data) {
+  return request({
+    url: '/base/equipment-check-order-det/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/equipment/base/maintain/confirm.js

@@ -0,0 +1,26 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2024-02-26 15:01:48
+ * @LastEditTime: 2024-02-26 18:09:39
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 获得设备保养记录分页
+export function getLogDetPage(query) {
+  return request({
+    url: '/base/equipment-maintain-log-det/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备巡检单
+export function getCheckOrder(query) {
+  return request({
+    url: '/base/equipment-check-order/get',
+    method: 'get',
+    params: query
+  })
+}

src/api/equipment/base/maintain/planconfig.js

@@ -0,0 +1,104 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2024-02-22 15:14:19
+ * @LastEditTime: 2024-02-23 19:18:22
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 获得设备保养计划配置分页
+export function getPlanPage(query) {
+  return request({
+    url: '/base/equipment-maintain-plan/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建设备保养计划
+export function createPlan(data) {
+  return request({
+    url: '/base/equipment-maintain-plan/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备保养计划
+export function updatePlan(data) {
+  return request({
+    url: '/base/equipment-maintain-plan/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得计划code
+export function getCode() {
+  return request({
+    url: '/base/equipment-maintain-plan/getCode',
+    method: 'get'
+  })
+}
+
+// 获得计划
+export function getPlan(query) {
+  return request({
+    url: '/base/equipment-maintain-plan/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备保养计划配置详情分页
+export function getPlanDetPage(query) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建设备保养计划详情
+export function createPlanDet(data) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新设备保养计划详情
+export function updatePlanDet(data) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得计划详情
+export function getPlanDet(query) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除设备保养计划
+export function deletePlan(id) {
+  return request({
+    url: '/base/equipment-maintain-plan/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 删除设备保养计划详情
+export function deletePlanDet(id) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/api/equipment/base/maintain/record.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-23 19:10:07
+ * @LastEditTime: 2024-02-26 17:02:53
  * @LastEditors: DY
  * @Description: 
  */
@@ -42,3 +42,39 @@ export function exportMaintainLogExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 导出巡检单
+export function exportCheckOrderExcel(query) {
+  return request({
+    url: '/base/equipment-check-order/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得保养记录
+export function getLog(query) {
+  return request({
+    url: '/base/equipment-maintain-log/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备保养记录详情分页
+export function getLogDetPage(query) {
+  return request({
+    url: '/base/equipment-maintain-log-det/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除设备保养记录详情
+export function deleteLogDet(id) {
+  return request({
+    url: '/base/equipment-maintain-log-det/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/api/system/user.js

@@ -26,6 +26,13 @@ export function getUser(userId) {
   })
 }
 
+export function getUserSimple(userId) {
+  return request({
+    url: '/system/user/getSimple?id=' + praseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
 // 新增用户
 export function addUser(data) {
   return request({

src/components/DialogForm/index.vue

@@ -360,8 +360,9 @@ export default {
 							promiseList.push(async () => {
 								const response = await this.$axios(opt.url, {
 									method: opt.method ?? 'get',
+									// data: opt.method == 'post' ? opt.queryParams : null
 								});
-								console.log('[dialogForm:handleOptions:response]', response);
+								// console.log('[dialogForm:handleOptions:response]', response);
 								if (opt.select) {
 									// 处理下拉框选项
 									const list =

src/layout/components/NavbarRight.vue

@@ -26,7 +26,7 @@
 </template>
 <script>
 import moment from 'moment'
-import { getUser } from "@/api/system/user.js";
+import { getUserSimple } from "@/api/system/user.js";
 import {getPath} from "@/utils/ruoyi";
 export default {
   name: 'navRight',
@@ -67,8 +67,8 @@ export default {
     },
     getUserMsg() {
       let id = this.$store.getters.userId
-      getUser(id).then(res => {
+      getUserSimple(id).then(res => {
-        this.dept = res.data.dept ? res.data.dept.name : ''
+        this.dept = res.data.deptName ? res.data.deptName : '---'
       })
     },
     async logout() {

src/mixins/lb/basicPageMixin.js

@@ -106,6 +106,8 @@ export default {
 				case 'detail':
 					this.handleDetail(data);
 					break;
+				default:
+					this.handleTableActions({data, type});
 			}
 		},
 		// 处理搜索栏按钮
@@ -133,10 +135,13 @@ export default {
 					this.$refs['search-bar'].resetForm();
 					this.resetQuery();
 					break;
+				default:
+					this.searchBarClicked(btn);
+					break;
 			}
 		},
 		handleEmitFun(val) {
-			console.log('emit unf', val);
+			console.log('[basicPageMixin handleEmitFun]', val);
 			switch (val.action) {
 				// 查看详情
 				case 'show-detail':

src/utils/dict.js

@@ -108,6 +108,9 @@ export const DICT_TYPE = {
   // ============== EQUIPMENT - 设备模块 =============
   MAINTAIN_TYPE: 'maintain_type',
   FAULT_LEVEL: 'fault-level',
+  FAULT_TYPE: 'fault-type',
+  REPAIR_MODE: 'repair-mode',
+  REPAIR_RESULT: 'repair-result',
 
   // ============== ENVIRONMENTAL - 环保模块 =============
   ENVIRONMENT_CHECK_UNIT: 'environment_check_unit',

src/views/base/coreProduct/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-21 09:04:48
+ * @LastEditTime: 2024-02-27 15:38:04
  * @Description:
 -->
 <template>
@@ -322,14 +322,14 @@ export default {
 				this.listQuery.total = response.data.total;
 			});
 		},
-		init(id, isdetail) {
+		init(row, isdetail) {
 			this.initData();
 			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
+			this.dataForm.id = row.id || undefined;
-			this.isedit = id ? true : false;
+			this.isedit = row?.id && row?.externalCode ? true : false;
 			console.log('你好', this.isedit)
 			this.visible = true;
-			if (id) {
+			if (row) {
 				this.idAttrShow = true
 			} else {
 				this.idAttrShow = false
@@ -340,7 +340,7 @@ export default {
 
 				if (this.dataForm.id) {
 					// 获取产品详情
-					this.urlOptions.infoURL(id).then(response => {
+					this.urlOptions.infoURL(this.dataForm.id).then(response => {
             this.dataForm = response.data
 						// this.dataForm.area = response.data.area || 0
 						// this.dataForm.weight = response.data.weight || 0

src/views/base/coreProduct/attr-add.vue

@@ -74,9 +74,7 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
-					getCoreProductAttr({
+					getCoreProductAttr(this.dataForm.id).then((res) => {
-						id: this.dataForm.id
-					}).then((res) => {
 						const { name, value } = res.data;
 						this.dataForm.name = name;
 						this.dataForm.value = value;

src/views/base/coreProduct/index.vue

@@ -141,6 +141,22 @@ export default {
 	},
 	created() {},
 	methods: {
+		//tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
 		// 删除
     deleteHandle(id, name, index) {
       this.$confirm(`是否确认删除产品名称为"${name}"的数据项`, "提示", {
@@ -168,7 +184,7 @@ export default {
 				this.addOrUpdateVisible = true;
         this.addOrEditTitle = "详情";
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data.id, true);
+          this.$refs.addOrUpdate.init(val.data, true);
         });
 			}
 		},

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -121,7 +121,6 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
-						:disabled="isdetail || isedit"
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
@@ -282,6 +281,7 @@ export default {
         this.urlOptions.createURL(this.dataForm).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.visible = false;
+          this.$emit("refreshDataList");
           // this.$confirm('是否添加预使用主原料信息?', '提示', {
           //   confirmButtonText: '确定',
           //   cancelButtonText: '取消',

src/views/base/packagingPrintLog/add-or-updata.vue

@@ -1,12 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 16:50:19
- * @LastEditTime: 2023-12-01 16:48:53
+ * @LastEditTime: 2024-02-28 10:07:29
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
-  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%" show-close="true">
+  <el-dialog class="baseDialog" :visible.sync="visible" :show-close="false" :wrapper-closable="false" width="40%"
+    show-close="true">
     <small-title slot="title" :no-padding="true">
       {{ !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -44,6 +45,12 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
+
+        <el-col :span="12">
+          <el-form-item label="包装条码" prop="packagingBarCode">
+            <el-input v-model="dataForm.packagingBarCode" clearable placeholder="请输入包装条码" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="标签模板" prop="modelId">
             <el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板" clearable>
@@ -186,6 +193,7 @@ export default {
         workOrderId: null, // 单位产品用时 (s)
         customerId: '', // 规格
         content: '', // 单位id
+        packagingBarCode: null
 			},
 			listQuery: {
 				pageSize: 10,

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-24 09:13:50
+ * @LastEditTime: 2024-02-28 10:38:34
  * @Description:
 -->
 <template>
@@ -55,6 +55,10 @@ const tableProps = [
 	{
     prop: 'packagingCode',
     label: '包装流水号'
+  },
+  {
+    prop: 'packagingBarCode',
+    label: '包装条码'
   },
 	{
     prop: 'workOrderName',

src/views/core/mixins/code-filter.js

@@ -2,7 +2,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: DY
- * @LastEditTime: 2023-09-12 11:13:34
+ * @LastEditTime: 2024-02-23 14:50:22
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -62,6 +62,17 @@ export function parseTime(time, pattern) {
   })
   return time_str
 }
+
+export function toDay(time) {
+  if (time < 24) {
+    return time + '小时'
+  } else {
+    const day = ~~(time / 24)
+    const hour = time % 24
+    return day + '天' + hour + '小时'
+  }
+}
+
 export default function (dictTable) {
   return function (val) {
     return table?.[dictTable]?.[val]

src/views/energy/base/energyQuantityRealtime/index.vue

@@ -193,7 +193,7 @@ export default {
       if (this.exportList.length > 0) {
         let body = this.exportList.map((x) => [
           x.objName,
-          x.objRemark,
+          x.objCode,
           x.energyTypeName,
           x.startValue,
           x.endValue,

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -152,7 +152,7 @@ export default {
         id: '',
         name: '',
         code: '',
-        nuit: '',
+        unit: '',
         pricingMethod: 2,
         leaderName: '',
         push: false
@@ -186,16 +186,16 @@ export default {
           if (res.code === 0) {
             this.form.name = res.data.name
             this.form.code = res.data.code
-            this.form.nuit = res.data.nuit
+            this.form.unit = res.data.unit
             this.form.pricingMethod = res.data.pricingMethod
             this.form.leaderName = res.data.leaderName
             this.form.push =  res.data.push ? true : false
             switch(this.form.pricingMethod) {
               case 0:
-                this.tableData1 = this.form.segPriceList || []
+                this.tableData1 = res.data.segPriceList || []
                 break;
               case 1:
-                this.tableData2 = this.form.usedPriceList || []
+                this.tableData2 = res.data.usedPriceList || []
                 break;
               default:
             }
@@ -233,10 +233,10 @@ export default {
     // 增加
     emitButtonClick1() {
       let n = this.tableData1.length
-      // if (n >=3) {
+      if (n >=3) {
-      //   this.$modal.msgWarning('最多可添加3档计价')
+        this.$modal.msgWarning('最多可添加3档计价')
-      //   return false
+        return false
-      // }
+      }
       let obj = {}
       obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
       obj.endTime = ''
@@ -245,10 +245,10 @@ export default {
     },
     emitButtonClick2() {
       let n = this.tableData2.length
-      if (n >=3) {
+      // if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
+      //   this.$modal.msgWarning('最多可添加3档计价')
-        return false
+      //   return false
-      }
+      // }
       let obj = {}
       obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
       obj.endUsed = 0

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -41,7 +41,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
-			width="700px"
+			width="30%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">

src/views/equipment/base/config/DataCollection/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-21 18:31:44
+ * @LastEditTime: 2024-02-22 10:08:13
  * @Description:
 -->
 <template>
@@ -18,6 +18,7 @@
 				v-model="dataForm.equipmentId"
 				:options="plLineList"
 				:props="{value: 'id', label: 'name', children: 'children'}"
+				style="width: 100%"
 				filterable />
 		</el-form-item>
 		<el-form-item label="关联表名" prop="plcId">
@@ -110,11 +111,9 @@ export default {
 					}
 				})
 			})
-			console.log('你好', this.plLineList)
 		},
 		// 表单提交
     dataFormSubmit() {
-			console.log('11', this.dataForm.equipmentId)
       this.$refs["dataForm"].validate((valid) => {
         if (!valid) {
           return false;

src/views/equipment/base/inspection/Confirm/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/equipment/base/inspection/Confirm/WaitingListTable.vue

@@ -0,0 +1,251 @@
+<!-- 
+    filename: WaitingListTable.vue
+    author: liubin
+    date: 2024-02-05 16:12:55
+    description: 
+-->
+
+<template>
+	<el-table
+		:data="tableDataWithIndex"
+		:border="true"
+		@selection-change="handleSelectionChange"
+		style="width: 100%"
+		:header-cell-style="{
+			background: '#f2f4f9',
+			color: '#606266',
+		}"
+		class="waiting-list-table">
+		<el-table-column
+			type="selection"
+			:width="50"
+			:selectable="checkSelectable" />
+		<el-table-column prop="_pageIndex" width="80" align="center">
+			<template slot="header">
+				<el-popover placement="bottom-start" width="300" trigger="click">
+					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
+						<el-checkbox
+							v-for="(item, index) in tablePropsLabelList"
+							:key="'cb' + index"
+							v-model="selectedBox[index]"
+							:label="item.label" />
+					</div>
+					<i slot="reference" class="el-icon-s-tools" />
+				</el-popover>
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[0]"
+			label="巡检单名称"
+			prop="name"></el-table-column>
+		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
+			<template slot-scope="scope">
+				{{ scope.row.department || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[2]"
+			label="巡检时间"
+			prop="planCheckTime">
+			<template slot-scope="scope">
+				{{ scope.row.planCheckTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[3]"
+			label="班次"
+			prop="groupClass">
+			<template slot-scope="scope">
+				{{ scope.row.groupClass || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
+			label="确认截止时间"
+			prop="confirmDueTime">
+			<template slot-scope="scope">
+				{{ scope.row.confirmDueTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[5]"
+			width="150"
+			label="备注"
+			prop="remark">
+			<template slot-scope="scope">
+				{{ scope.row.remark }}
+			</template>
+		</el-table-column>
+		<!-- <el-table-column v-if="selectedBox[10]" width="60" label="详情">
+			<template slot-scope="scope">
+				<el-button type="text" @click="handelDetail(scope.row)">详情</el-button>
+			</template>
+		</el-table-column> -->
+		<!-- btns  -->
+		<el-table-column width="188" label="操作">
+			<template slot-scope="scope">
+				<el-tooltip content="确认" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						:disabled="!checkSelectable(scope.row)"
+						@click="$emit('confirm', scope.row)">
+						确认
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="查看详情" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('detail', scope.row)">
+						<i class="iconfont icon-detail primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="编辑" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('edit', scope.row)">
+						<i class="iconfont icon-edit primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="删除" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('delete', scope.row)">
+						<i class="iconfont icon-delete delete-color" />
+					</el-button>
+				</el-tooltip>
+			</template>
+		</el-table-column>
+	</el-table>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+	name: 'WaitingListTable',
+	components: {},
+	props: ['tableData', 'page', 'limit'],
+	filters: {
+		timeFilter: (val) =>
+			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
+		relatePlanFilter: (val) =>
+			val != null ? ['-', '计划型', '非计划型'][val] : '-',
+	},
+	data() {
+		return {
+			tablePropsLabelList: [
+				{
+					label: '巡检单名称',
+				},
+				{
+					label: '部门',
+				},
+				{
+					label: '巡检时间',
+				},
+				{
+					label: '班次',
+				},
+				{
+					label: '确认截止时间',
+				},
+				{
+					label: '备注',
+				},
+			],
+			selectedBox: [
+				true,
+				true,
+				true,
+				true,
+				true,
+				true
+			],
+			selectedPlan: [],
+		};
+	},
+	computed: {
+		tableDataWithIndex() {
+			return this.tableData.map((item, index) => ({
+				...item,
+				_pageIndex: (this.page - 1) * this.limit + index + 1,
+			}));
+		},
+	},
+	methods: {
+		checkSelectable(row, index) {
+			return true;
+		},
+		handleSelectionChange(val) {
+			this.selectedPlan = val;
+		},
+		handleDelete(row) {},
+		handleDetail(row) {},
+		handleEdit(row) {},
+		handleConfirm(row) {},
+	},
+};
+</script>
+
+<style scoped>
+@import './iconfont/iconfont.css';
+.delete-color {
+	color: #ff5454;
+}
+.primary-color {
+	color: #0b58ff;
+}
+
+.baseTable .show-col-btn {
+	margin-right: 5px;
+	line-height: inherit;
+	cursor: pointer;
+}
+.baseTable .el-icon-refresh {
+	cursor: pointer;
+}
+</style>
+<style>
+.waiting-list-table .el-table__body tr.current-row > td.el-table__cell {
+	background-color: #eaf1fc;
+}
+.waiting-list-table.el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+.waiting-list-table .addButton {
+	width: 100%;
+	height: 35px;
+	border-top: none;
+	color: #0b58ff;
+	border-color: #ebeef5;
+	border-radius: 0;
+}
+.waiting-list-table .addButton:hover {
+	color: #0b58ff;
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+.waiting-list-table .addButton:focus {
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+
+.el-tooltip__popper.is-dark {
+	background: rgba(0, 0, 0, 0.6) !important;
+}
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+	border-top-color: rgba(0, 0, 0, 0.4) !important;
+}
+</style>

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -0,0 +1,498 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-27 09:41:00
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+				<el-form
+					:model="dataForm"
+					:rules="dataRule"
+					ref="dataForm"
+					@keyup.enter.native="dataFormSubmit()"
+					label-width="100px"
+					label-position="top">
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="巡检单名称" prop="name">
+								<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="部门" prop="departmentId">
+								<el-select
+									v-model="dataForm.departmentId"
+									:placeholder="`请选择部门`">
+									<el-option
+										v-for="opt in departmentOptions"
+										:key="opt.id"
+										:label="opt.name"
+										:value="opt.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="班次" prop="groupClass">
+								<el-select
+									v-model="dataForm.groupClass"
+									filterable
+									clearable
+									multiple
+									:disabled="isedit"
+									style="width: 100%"
+									placeholder="请选择班次">
+									<el-option
+										v-for="d in groupOptions"
+										:key="d.id"
+										:label="d.name"
+										:value="d.id" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="巡检人" prop="checkPerson">
+								<el-select
+									v-model="dataForm.checkPerson"
+									:placeholder="`请选择巡检人`"
+									multiple
+									clearable
+									:disabled="isedit"
+									filterable>
+									<el-option
+										v-for="opt in inspectorOptions"
+										:key="opt.value"
+										:label="opt.label"
+										:value="opt.value" />
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="巡检时间" prop="planCheckTime">
+								<el-date-picker
+									v-model="dataForm.planCheckTime"
+									type="datetime"
+									:disabled="isedit"
+									placeholder="请选择巡检时间"
+									value-format="timestamp"></el-date-picker>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</div>
+
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					巡检内容
+				</small-title>
+
+				<div v-if="!isdetail">
+					<div>
+						<SearchBar
+							:formConfigs="searchBarFormConfig"
+							ref="attr-search-bar"
+							@headBtnClick="handleSearchBarBtnClick" />
+					</div>
+					<!-- <template>
+						<span style="display: inline-block;" @click="addNew()">
+							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+							<span class="add">添加</span>
+						</span>
+					</template> -->
+				</div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="detList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+		</div>
+
+		<div v-if="!isdetail" class="drawer-body__footer">
+			<el-button @click="goback()">取消</el-button>
+			<!-- <el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button> -->
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:order-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from './../../../../core/mixins/basic-add';
+import { createCheckOrder, updateCheckOrder, getCheckOrder } from "@/api/equipment/base/inspection/settings";
+import { getCheckOrderDetPage, deleteCheckOrderDet } from "@/api/equipment/base/inspection/record";
+import SmallTitle from './SmallTitle';
+import { parseTime } from '@/utils/ruoyi';
+import attrAdd from './attr-add';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称'
+	},
+	{
+		prop: 'program',
+		label: '巡检项目',
+	},
+	{
+		prop: 'checkResult',
+		label: '巡检结果',
+	},
+];
+
+const topBtnConfig = [
+  {
+    type: 'add',
+    btnName: 'btn.add'
+  }
+]
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			topBtnConfig,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+				createURL: createCheckOrder,
+				updateURL: updateCheckOrder,
+				infoURL: getCheckOrder,
+			},
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					color: 'success',
+					plain: true
+				}
+			],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+				equipmentName: undefined
+			},
+			dataForm: {
+        id: undefined,
+        name: '',
+				departmentId: undefined,
+				groupClass: undefined,
+        checkPerson: undefined,
+				planCheckTime: undefined
+			},
+			detList: [],
+			groupOptions: [],
+			// departmentList: [],
+			departmentOptions: [],
+			inspectorOptions: [],
+			visible: false,
+			isdetail: false,
+			isedit: false,
+			idAttrShow: false,
+			dataRule: {
+        name: [{ required: true, message: "巡检单名称不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 班次列表
+			const res = await groupClassesListAll();
+			this.groupOptions = res.data || [];
+			// 部门列表
+			const res1 = await getCoreDepartmentList();
+			this.departmentOptions = res1.data || []
+			// 巡检人
+			let inspectorList = [];
+			const userlist = await this.$axios({
+				url: '/system/user/page',
+				params: { pageNo: 1, pageSize: 100 },
+			});
+			if (userlist.code == 0) {
+				inspectorList = inspectorList.concat(
+					(userlist.data?.list || []).map((item) => ({
+						label: item.username,
+						value: item.id,
+					}))
+				);
+			}
+			const workerlist = await this.$axios('/base/core-worker/listAll');
+			if (workerlist.code == 0) {
+				inspectorList = inspectorList.concat(
+					workerlist.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}))
+				);
+			}
+			this.inspectorOptions = inspectorList;
+			// const res1 = await groupClassesListAll();
+			// this.groupOptions = res1.data || [];
+			// const res = await getEquipmentAll()
+			// this.eqList = res.data
+		},
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.listQuery.equipmentName = btn.equipmentName;
+					this.getList();
+					break;
+				case 'add':
+					this.addNew()
+					break;
+			}
+		},
+		initData() {
+			this.detList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`是否确认删除巡检项目名为"${raw.data.program}"的数据项?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCheckOrderDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			} 
+		},
+		getList() {
+			// 获取设备巡检单详细
+			getCheckOrderDetPage({
+				...this.listQuery,
+				orderId: this.dataForm.id,
+			}).then((response) => {
+				this.detList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.isedit = id ? true : false;
+			console.log('你好', this.isedit)
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取巡检单详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+          });
+					// 获取巡检内容列表
+					this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL({
+						...this.dataForm,
+						groupClass: this.dataForm.groupClass.join(','),
+						checkPerson: this.dataForm.checkPerson.join(','),
+						special: false,
+						status: 1
+					}).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false; 
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL({
+					...this.dataForm,
+					groupClass: this.dataForm.groupClass.join(','),
+					checkPerson: this.dataForm.checkPerson.join(','),
+					special: false,
+					status: 1
+				}).then(response => {
+          this.$modal.msgSuccess("新增成功");
+					this.idAttrShow = true
+					this.dataForm.id = response.data
+          // this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    }
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	/* flex: 1; */
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 76vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: -32px 15px 0;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+</style>

src/views/equipment/base/inspection/Confirm/attr-add.vue

@@ -0,0 +1,172 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="设备名称" prop="equipmentId">
+				<el-select
+					v-model="dataForm.equipmentId"
+					filterable
+					clearable
+					placeholder="请选择设备名称"
+					style="width: 100%">
+					<el-option
+						v-for="dict in eqList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="巡检项目" prop="program">
+				<el-input
+					v-model="dataForm.program"
+					placeholder="请输入巡检项目"
+					clearable />
+			</el-form-item>
+			<el-form-item label="巡检结果" prop="checkResult">
+				<el-input
+					v-model="dataForm.checkResult"
+					placeholder="请输入巡检结果"
+					clearable />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { createCheckOrderDet, updateCheckOrderDet, getCheckOrderDet } from "@/api/equipment/base/inspection/settings";
+import { getEquipmentPage } from '@/api/base/equipment'
+
+export default {
+	props: {
+		orderId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null
+			},
+			eqList: [],
+			dataRule: {
+				equipmentId: [
+					{ required: true, message: '设备不能为空', trigger: 'blur' },
+				],
+				program: [
+					{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+				],
+				checkResult: [
+					{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+				]
+			},
+		};
+	},
+	mounted() {
+		this.getDict();
+	},
+	methods: {
+		async getDict() {
+			const res = await getEquipmentPage({
+				pageNo: 1,
+				pageSize: 100,
+				special: false
+			})
+			this.eqList = res.data.list
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getCheckOrderDet(this.dataForm.id).then((res) => {
+						const { equipmentId, program, checkResult } = res.data;
+						this.dataForm.equipmentId = equipmentId;
+						this.dataForm.program = program;
+						this.dataForm.checkResult = checkResult;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateCheckOrderDet({
+							...this.dataForm,
+							orderId: this.orderId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createCheckOrderDet({
+						...this.dataForm,
+						orderId: this.orderId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/inspection/Confirm/iconfont/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

src/views/equipment/base/inspection/Confirm/iconfont/iconfont.css

@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3821755 */
+  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
+  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
+       url('iconfont.woff?t=1689233106339') format('woff'),
+       url('iconfont.ttf?t=1689233106339') format('truetype'),
+       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-downward:before {
+  content: "\e604";
+}
+
+.icon-upward:before {
+  content: "\e605";
+}
+
+.icon-detail:before {
+  content: "\e601";
+}
+
+.icon-edit:before {
+  content: "\e602";
+}
+
+.icon-delete:before {
+  content: "\e603";
+}
+

src/views/equipment/base/inspection/Confirm/iconfont/iconfont.json

@@ -0,0 +1,44 @@
+{
+  "id": "3821755",
+  "name": "component",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "封装的组件中的icon",
+  "glyphs": [
+    {
+      "icon_id": "36426261",
+      "name": "downward",
+      "font_class": "downward",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "36426301",
+      "name": "upward",
+      "font_class": "upward",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "33347867",
+      "name": "detail",
+      "font_class": "detail",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "33347918",
+      "name": "edit",
+      "font_class": "edit",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "33347930",
+      "name": "delete",
+      "font_class": "delete",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    }
+  ]
+}

src/views/equipment/base/inspection/Confirm/iconfont/iconfont.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+  <metadata>Created by iconfont</metadata>
+  <defs>
+  <font id="iconfont" horiz-adv-x="1024">
+    <font-face
+      font-family="iconfont"
+      font-weight="400"
+      font-stretch="normal"
+      units-per-em="1024"
+      ascent="896"
+      descent="-128"
+    />
+      <missing-glyph />
+      
+      <glyph glyph-name="downward" unicode="&#58884;" d="M556.942222 144.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 260.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824l363.121778-401.749334c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="upward" unicode="&#58885;" d="M556.942222 623.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 507.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824L467.057778 623.729778c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="detail" unicode="&#58881;" d="M902.428444 705.251556H332.401778a7.964444 7.964444 0 0 1-7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.078222h570.026666A7.964444 7.964444 0 0 1 910.222222 641.024v56.206222a7.964444 7.964444 0 0 1-7.793778 8.021334z m0-285.127112H332.401778a7.964444 7.964444 0 0 1-7.793778-7.964444v-56.32a7.964444 7.964444 0 0 1 7.793778-7.964444h570.026666a7.964444 7.964444 0 0 1 7.793778 7.964444v56.32a7.964444 7.964444 0 0 1-7.793778 7.964444z m0-285.070222H332.401778a7.964444 7.964444 0 0 1-7.793778-8.078222v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.021334h570.026666a7.964444 7.964444 0 0 1 7.793778 8.021334v56.206222a7.964444 7.964444 0 0 1-7.793778 8.078222zM113.777778 669.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 669.127111zM113.777778 384c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0A56.547556 56.547556 0 0 1 223.061333 384a56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 384z m0-285.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0 56.547556 56.547556 0 0 1-27.363555-48.696889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="edit" unicode="&#58882;" d="M873.016889 395.264a32.824889 32.824889 0 0 0 65.649778 0v-273.806222a164.124444 164.124444 0 0 0-164.124445-164.124445h-525.084444A164.124444 164.124444 0 0 0 85.333333 121.457778v525.084444A164.124444 164.124444 0 0 0 249.457778 810.666667h312.32a32.824889 32.824889 0 1 0 0-65.649778h-312.32a98.417778 98.417778 0 0 1-98.474667-98.417778v-525.141333c0-54.385778 44.088889-98.474667 98.417778-98.474667h525.141333a98.417778 98.417778 0 0 1 98.474667 98.417778V395.320889z m-14.222222 362.097778a32.824889 32.824889 0 0 0 48.014222-44.771556L548.750222 328.533333a32.824889 32.824889 0 1 0-48.014222 44.771556l358.115556 384.056889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="delete" unicode="&#58883;" d="M601.024 146.24a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.456 0v-326.848a29.76 29.76 0 0 0-29.76-29.888z m-178.24 0a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.392 0v-326.848a29.76 29.76 0 0 0-29.696-29.888z m475.52 505.216h-148.544v59.456c0 49.152-39.616 89.088-88.512 89.088H363.392c-49.216 0-89.152-39.936-89.152-89.088v-59.456H125.696a29.632 29.632 0 1 1 0-59.392h772.608a29.632 29.632 0 1 1 0 59.392z m-564.608 59.456c0 16.256 13.44 29.696 29.696 29.696h297.856c16.32 0 29.056-13.12 29.056-29.696v-59.456H333.696v59.456zM720-32h-416a89.152 89.152 0 0 0-89.088 89.088V503.232a29.632 29.632 0 1 0 59.456 0v-446.08c0-16.512 13.44-29.76 29.696-29.76h416.064a29.632 29.632 0 0 1 29.696 29.696V502.144a29.632 29.632 0 1 0 59.456 0v-445.056A89.536 89.536 0 0 0 720-32z"  horiz-adv-x="1024" />
+      
+    </font>
+  </defs>
+</svg>

src/views/equipment/base/inspection/Confirm/index.vue

@@ -0,0 +1,486 @@
+<!-- 
+    filename: MaintainRecord.vue
+    author: DY
+    date: 2023-12-12 13:54:53
+    description: 
+-->
+
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@select-changed="handleSearchBarChange"
+			@headBtnClick="handleSearchBarBtnClick" />
+		<WaitingListTable
+			ref="waiting-list-table"
+			:table-data="list"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			@edit="handleEdit"
+			@detail="handleDetail"
+			@delete="handleDelete"
+			@confirm="handleConfirm" />
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
+	</div>
+</template>
+
+<script>
+import AddOrUpdate from './add-or-updata';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import {
+	exportCheckOrderExcel,
+} from '@/api/equipment/base/maintain/record';
+import WaitingListTable from './WaitingListTable.vue';
+
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', {
+				action: this.injectData.label,
+				value: this.injectData,
+			});
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
+export default {
+	name: 'Confirm',
+	components: {
+		WaitingListTable,
+		AddOrUpdate
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			addOrUpdateVisible: false,
+			recordDetailVisible: false,
+			searchBarKeys: [
+				'name'
+			],
+			tobeConfirmedIdList: [],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '巡检单名称',
+					placeholder: '请输入巡检单名称',
+					param: 'name',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: 'button',
+					btnName: '批量确认',
+					name: 'batchConfirm',
+					color: 'primary',
+					plain: true,
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'primary',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintainPlanId: null,
+				startTime: null,
+				special: false,
+				status: 1,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-check-order',
+			mode: null,
+			allSpecialEquipments: [],
+			openPlannedDrawer: false,
+			openUnplannedDrawer: false,
+			openPlannedDrawer: false,
+		};
+	},
+	watch: {
+		tobeConfirmedIdList: {
+			handler(val) {
+				if (val.length == this.list.length) {
+					this.$refs['table'].toggleAllSelection();
+				}
+			},
+		},
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 批量确认 */
+		async searchBarClicked(btn) {
+			switch (btn.btnName) {
+				case 'batchConfirm':
+					const ids = this.$refs['waiting-list-table'].selectedPlan.map(
+						(item) => item.id
+					)
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+						this.$message.warning('请选择待确认的设备巡检单');
+						return;
+					}
+					const res = await this.$axios({
+						url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId + '&ids=' + ids,
+						method: 'put',
+						// data: this.$refs['waiting-list-table'].selectedPlan.map(
+						// 	(item) => item.id
+						// ),
+					});
+					if (res.code == 0) {
+						this.$message.success('确认成功');
+						this.getList();
+					}
+					break;
+			}
+		},
+		handleSelectionChange(list) {
+			if (this.tobeConfirmedIdList.length) {
+				this.tobeConfirmedIdList = [];
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: false },
+					});
+				});
+				console.log(
+					'清空选择列表',
+					this.list.map((item) => item._selection)
+				);
+			} else {
+				this.tobeConfirmedIdList = list.map((item) => item.id);
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: true },
+					});
+				});
+				console.log(
+					'全选',
+					this.list.map((item) => item._selection)
+				);
+			}
+		},
+
+		handleEmitFun({ action, value }) {
+			switch (action) {
+				case '详情':
+					this.recordDetailVisible = true;
+					this.$nextTick(() => {
+						this.$refs.recordDetailDrawer.show({
+							id: value.id,
+							planMaintainWorker: value.planMaintainWorker,
+							maintainWorker: value.maintainWorker,
+						});
+					});
+					break;
+				case 'row-selected':
+					if (value.selected) {
+						this.tobeConfirmedIdList.push(value.row.id);
+						value.row._selection = 0b11;
+					} else {
+						const index = this.tobeConfirmedIdList.indexOf(value.row.id);
+						if (index != -1) {
+							this.tobeConfirmedIdList.splice(index, 1);
+						}
+					}
+					console.log('tobeConfirmedIdList', this.tobeConfirmedIdList);
+					break;
+			}
+		},
+
+		handleSearchBarChange({ param, value }) {
+			console.log('122', param)
+			// if ('specialType' === param) {
+			// 	if (!value) {
+			// 		this.setSearchBarEquipmentList(this.allSpecialEquipments);
+			// 		return;
+			// 	}
+			// 	this.setSearchBarEquipmentList(
+			// 		this.allSpecialEquipments.filter((item) => item.specialType == value)
+			// 	);
+			// }
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv({
+				...this.queryParams
+			}).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				relatePlan: null,
+				maintainWorker: [],
+				maintainOrderNumber: null,
+				departmentId: null,
+				lineId: null,
+				startTime: null,
+				endTime: null,
+				planStartTime: null,
+				planEndTime: null,
+				confirmed: false,
+				remark: null,
+				special: false,
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			// this.reset();
+			// this.open = true;
+			// this.title = '添加待确认保养记录';
+			// this.addOrEditTitle = '新增';
+			this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init();
+      });
+		},
+
+		// 新增 / 修改
+    // addOrUpdateHandle(id) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(id);
+    //   });
+    // },
+
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.put({
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+						special: false,
+						relatePlan: 2,
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+
+				// 添加的提交
+				this.getConfirmed()
+					.then((confirmed) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: false,
+							relatePlan: 2,
+							confirmed: true,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					})
+					.catch((err) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: false,
+							relatePlan: 2,
+							confirmed: false,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					});
+			});
+		},
+		/** 确认 */
+		async handleConfirm(row) {
+			console.log('111', this.$store.getters.userId)
+			this.$modal
+				.confirm('是否确认巡检单"' + row.name + '"?')
+				.then(() => {
+					return this.$axios({
+						url:
+							'/base/equipment-check-order/confirm?confirmPerson=' +
+							this.$store.getters.userId + '&ids=' + [row.id],
+						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
+						method: 'put',
+						// data: [row.id],
+					});
+				})
+				.then((res) => {
+					this.getList();
+					res.code == 0 && this.$modal.msgSuccess('确认成功');
+					res.code != 0 && this.$modal.msgError('确认失败');
+				})
+				.catch(() => {});
+		},
+		/** 编辑 */
+		async handleEdit(row) {
+			this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(row.id);
+      });
+			// this.reset();
+			// if (row.relatePlan == 1) {
+			// 	// 计划型
+			// 	// const res = await this.info({ id: row.id });
+			// 	// this.form = res.data;
+			// 	// this.form.maintainWorker = res.data.maintainWorker.split(',');
+			// 	this.openPlannedDrawer = true;
+			// 	this.$nextTick(() => {
+			// 		this.$refs.planned.init(row);
+			// 	});
+			// } else {
+			// 	this.openUnplannedDrawer = true;
+			// 	this.$nextTick(() => {
+			// 		this.$refs.unplanned.init(row);
+			// 	});
+			// }
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			this.$modal
+				.confirm(
+					'是否确认删除巡检单名称为"' + row.name + '"的数据项?'
+				)
+				.then(() => {
+					return this.$axios({
+						url: '/base/equipment-check-order/delete?id=' + row.id,
+						method: 'delete',
+					});
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(console.error);
+		},
+		handleDetail(row) {
+			this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(row.id, true);
+      });
+			// this.recordDetailVisible = true;
+			// this.$nextTick(() => {
+			// 	this.$refs.recordDetailDrawer.show({
+			// 		id: row.id,
+			// 		planMaintainWorker: row.planMaintainWorker,
+			// 		maintainWorker: row.maintainWorker,
+			// 	});
+			// });
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有巡检单?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportCheckOrderExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备巡检单.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/inspection/Record/addContent.vue

@@ -0,0 +1,312 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-26 09:25:10
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ '设备巡检记录详情' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <div class="blodTip">巡检单名称</div>
+            <div class="lightTip">{{ dataForm.name }}</div>
+          </el-col>
+					<el-col :span="8">
+            <div class="blodTip">部门</div>
+            <div class="lightTip">{{ dataForm.department }}</div>
+          </el-col>
+					<el-col :span="8">
+            <div class="blodTip">班次</div>
+            <div class="lightTip">{{ dataForm.groupClass }}</div>
+          </el-col>
+        </el-row>
+				<el-row :gutter="20">
+          <el-col :span="8">
+            <div class="blodTip">巡检人</div>
+            <div class="lightTip">{{ dataForm.checkPerson }}</div>
+          </el-col>
+					<el-col :span="8">
+            <div class="blodTip">巡检时间</div>
+            <div class="lightTip">{{ parseTime(dataForm.actualCheckTime) }}</div>
+          </el-col>
+					<el-col :span="8">
+            <div class="blodTip">确认人</div>
+            <div class="lightTip">{{ dataForm.confirmPerson }}</div>
+          </el-col>
+        </el-row>
+			</div>
+			
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					巡检内容
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+            </span>
+          </template>
+        </div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="planList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			</div>
+
+		</div>
+
+		<!-- <attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:plan-id="dataForm.id"
+			@refreshDataList="getList" /> -->
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import { getEqCheckOrder, deleteCheckOrderDet, getCheckOrderDetPage } from '@/api/equipment/base/inspection/record';
+// import { listData } from "@/api/system/dict/data";
+import SmallTitle from '../../maintain/PlanConfig/SmallTitle.vue';
+import { parseTime } from '../../../../core/mixins/code-filter';
+// import attrAdd from './attr-add';
+// import { getDictDatas } from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
+	{
+		prop: 'program',
+		label: '巡检项目',
+	},
+	{
+		prop: 'checkResult',
+		label: '巡检结果',
+	}
+];
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+				infoURL: getEqCheckOrder
+			},
+			listQuery: {
+				pageSize: 99,
+				pageNo: 1,
+				total: 0
+			},
+			dataForm: {},
+			planList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.planList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`是否确认删除保养项目名为"${raw.data.program}"的数据项?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteCheckOrderDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取巡检单详情分页
+			getCheckOrderDetPage({
+				...this.listQuery,
+				orderId: this.dataForm.id,
+			}).then((response) => {
+				this.planList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+
+				if (this.dataForm.id) {
+					// 获取巡检记录详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取详情分页
+					this.getList();
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 18vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
+</style>

src/views/equipment/base/inspection/Record/index.vue

@@ -50,6 +50,11 @@
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
 			@refreshDataList="getList" />
+
+		<add-content
+			v-if="addContent"
+			ref="addContent"
+			@refreshDataList="addContent = false" />
 	</div>
 </template>
 
@@ -57,60 +62,85 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addRecord from './addRecord.vue';
+import AddContent from './addContent.vue';
 import { exportCheckLogExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
 import { parseTime } from '../../../../core/mixins/code-filter';
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.label, value: this.injectData });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
 
 export default {
-	name: 'EquipmentRepair',
+	name: 'EquipmentInspectionRecord',
-	components: { addRecord },
+	components: { addRecord, AddContent },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'actualTime'],
+			addContent: false,
+			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:check-record:detail')
+				// this.$auth.hasPermi('equipment:check-record:detail')
-					? {
+				// 	? {
-							type: 'detail',
+				// 			type: 'detail',
-							btnName: '详情',
+				// 			btnName: '详情',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:check-record:update')
+				// this.$auth.hasPermi('equipment:check-record:update')
-					? {
+				// 	? {
-							type: 'edit',
+				// 			type: 'edit',
-							btnName: '修改',
+				// 			btnName: '修改',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:check-record:delete')
+				// this.$auth.hasPermi('equipment:check-record:delete')
-					? {
+				// 	? {
-							type: 'delete',
+				// 			type: 'delete',
-							btnName: '删除',
+				// 			btnName: '删除',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'configName', label: '配置名称' },
+				{ prop: 'name', label: '巡检单名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'department', label: '部门' },
-				{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
+				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
+				{ prop: 'groupClass', label: '班次' },
+				{ prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
+				{ prop: 'remark', label: '备注' }
+				// { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
-				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
 				// { prop: 'maintenanceDetail', label: '完成状态' },
-				{ prop: 'responsible', label: '巡检人' },
+				// { prop: 'responsible', label: '巡检人' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
-					label: '设备',
+					label: '巡检单名称',
-					placeholder: '请选择设备',
+					placeholder: '请选择巡检单',
-					param: 'equipmentId',
+					param: 'name',
 					filterable: true
 				},
 				// 开始结束时间 
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '巡检时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -118,7 +148,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'actualTime',
+					param: 'actualCheckTime',
 					// width: 350,
 				},
 				{
@@ -138,16 +168,16 @@ export default {
 					name: 'export',
 					plain: true,
 					color: 'primary',
-				},
+				}
-				{
+				// {
-					type: this.$auth.hasPermi('equipment:check-record:create')
+				// 	type: this.$auth.hasPermi('equipment:check-record:create')
-						? 'button'
+				// 		? 'button'
-						: '',
+				// 		: '',
-					btnName: '新增',
+				// 	btnName: '新增',
-					name: 'add',
+				// 	name: 'add',
-					plain: true,
+				// 	plain: true,
-					color: 'success',
+				// 	color: 'success',
-				},
+				// },
 			],
 			rows: [
 				[
@@ -216,13 +246,13 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				special: false,
-				maintenanceStatus: null,
+				name: null,
-				createTime: null,
+				actualCheckTime: null,
-				equipmentId: null,
+				status: 2
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-log',
+			basePath: '/base/equipment-check-order',
 			mode: null,
 		};
 	},
@@ -231,6 +261,17 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleEmitFun({action, value}) {
+ 			switch (action) {
+				// 查看详情
+				case '巡检内容':
+					this.addContent = true;
+					this.$nextTick(() => {
+						this.$refs.addContent.init(value.id, true);
+					});
+				break;
+			}
+		},
 		initSearchBar() {
 			this.http('/base/core-equipment/page', 'get', {
 				special: false,

src/views/equipment/base/inspection/Settings/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-12-01 11:02:43
+ * @LastEditTime: 2024-02-26 08:40:22
  * @Description:
 -->
 <template>
@@ -13,34 +13,25 @@
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '详情' : '添加巡检' }}
+			<!-- {{ isdetail ? '详情' : '添加巡检' }} -->
+			{{ '添加内容' }}
 		</small-title>
 		<div class="content">
 			<div class="visual-part">
-				<el-form
-					:model="dataForm"
-					:rules="dataRule"
-					ref="dataForm"
-					@keyup.enter.native="dataFormSubmit()"
-					label-width="100px"
-					label-position="top">
         <el-row :gutter="20">
-						<el-col :span="12">
+          <el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">
+            <div class="blodTip">巡检单名称</div>
-								<el-input v-model="dataForm.equipmentName" disabled clearable placeholder="请输入设备名称" />
+            <div class="lightTip">{{ dataForm.name }}</div>
-							</el-form-item>
           </el-col>
-						<el-col :span="12">
+					<el-col :span="8">
-							<el-form-item label="设备编码" prop="equipmentCode">
+            <div class="blodTip">部门</div>
-								<el-input
+            <div class="lightTip">{{ dataForm.department }}</div>
-									v-model="dataForm.equipmentCode"
+          </el-col>
-									clearable
+					<el-col :span="8">
-									disabled
+            <div class="blodTip">巡检时间</div>
-									placeholder="请输入设备编码" />
+            <div class="lightTip">{{ parseTime(dataForm.planCheckTime) }}</div>
-							</el-form-item>
           </el-col>
         </el-row>
-				</el-form>
 			</div>
 
 			<el-divider />
@@ -49,7 +40,7 @@
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
-					巡检项目
+					巡检内容
 				</small-title>
 
 				<div v-if="!isdetail" class="action_btn">
@@ -90,16 +81,18 @@
 		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			:config-id="dataForm.id"
+			:order-id="dataForm.id"
 			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
 <script>
-import { getEqCheck, getCheckDetPage, deleteCheckDet } from "@/api/equipment/base/inspection/settings";
+import { getCheckOrder } from "@/api/equipment/base/inspection/settings";
+import { deleteCheckOrderDet, getCheckOrderDetPage } from '@/api/equipment/base/inspection/record';
 import SmallTitle from './SmallTitle';
 import attrAdd from './attr-add';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import { parseTime } from '../../../../core/mixins/code-filter';
 
 const tableBtn = [
 	{
@@ -112,22 +105,14 @@ const tableBtn = [
 	},
 ];
 const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
 	{
 		prop: 'program',
-		label: '巡检项目',
+		label: '检查项目',
-	},
+	}
-	{
-		prop: 'content',
-		label: '巡检内容',
-	},
-	{
-		prop: 'code',
-		label: '巡检内容编码',
-	},
-	{
-		prop: 'description',
-		label: '备注',
-	},
 ];
 
 export default {
@@ -138,7 +123,7 @@ export default {
 			tableProps,
 			addOrUpdateVisible: false,
 			urlOptions: {
-				infoURL: getEqCheck,
+				infoURL: getCheckOrder,
 			},
 			listQuery: {
 				pageSize: 10,
@@ -147,26 +132,13 @@ export default {
 			},
 			dataForm: {
         id: undefined,
-        code: undefined,
+				name: undefined,
-        name: '',
+				department: undefined,
-				materialType: undefined,
+				planCheckTime: undefined
-				productType: undefined,
-        area: undefined,
-				specifications: undefined,
-				processTime: 0,
-        remark: undefined,
-				unit: undefined
 			},
 			checkDetList: [],
 			visible: false,
-			isdetail: false,
+			isdetail: false
-			dataRule: {
-        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
-				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
-				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
-				processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
-      }
 		};
 	},
 	mounted() {},
@@ -187,7 +159,7 @@ export default {
 					}
 				)
 					.then(() => {
-						deleteCheckDet(raw.data.id).then(({ data }) => {
+						deleteCheckOrderDet(raw.data.id).then(({ data }) => {
 							this.$message({
 								message: '操作成功',
 								type: 'success',
@@ -205,9 +177,9 @@ export default {
 		},
 		getList() {
 			// 获取巡检项目分页
-			getCheckDetPage({
+			getCheckOrderDetPage({
 				...this.listQuery,
-				configId: this.dataForm.id,
+				orderId: this.dataForm.id,
 			}).then((response) => {
 				this.checkDetList = response.data.list;
 				this.listQuery.total = response.data.total;
@@ -220,7 +192,7 @@ export default {
 			this.visible = true;
 
 			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
+				// this.$refs['dataForm'].resetFields();
 
 				if (this.dataForm.id) {
 					// 获取设备巡检详情
@@ -287,7 +259,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 16vh;
+	max-height: 10vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@@ -311,4 +283,18 @@ export default {
 .add {
 	color: #0b58ff;
 }
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
 </style>

src/views/equipment/base/inspection/Settings/add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-25 16:23:13
+ * @LastEditTime: 2024-02-24 20:50:51
  * @Description:
 -->
 <template>
@@ -11,43 +11,82 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="120px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="配置名称" prop="name">
+				<el-form-item label="巡检单名称" prop="name">
 					<el-input
 						v-model="dataForm.name"
-						placeholder="请输入配置名称" />
+						placeholder="请输入巡检单名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="配置编码" prop="code">
+				<el-form-item label="巡检单编码" prop="code">
 					<el-input
 						v-model="dataForm.code"
-						placeholder="请输入配置编码" />
+						placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="设备名称" prop="equipmentId">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
 					<el-select
-						v-model="dataForm.equipmentId"
+						v-model="dataForm.departmentId"
-						filterable
+						:placeholder="`请选择部门`"
-						style="width: 100%"
+						style="width: 100%">
-						placeholder="请选择设备名称"
-						@change="setCode">
 						<el-option
-							v-for="dict in eqList"
+							v-for="opt in departmentOptions"
-							:key="dict.id"
+							:key="opt.id"
-							:label="dict.name"
+							:label="opt.name"
-							:value="dict.id" />
+							:value="opt.id" />
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="设备编码" prop="equipmentCode">
+				<el-form-item label="计划巡检时间" prop="planCheckTime">
-						<el-input v-model="dataForm.equipmentCode" disabled placeholder="请输入设备编码" />
+					<el-date-picker
+						v-model="dataForm.planCheckTime"
+						type="datetime"
+						:placeholder="`请选择计划巡检时间`"
+						value-format="timestamp"
+						style="width: 100%" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+					<el-input
+						v-model="dataForm.confirmTimeLimit"
+						:placeholder="`请输入确认时限`" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="班次" prop="groupClass">
+					<el-select
+						v-model="dataForm.groupClass"
+						filterable
+						clearable
+						multiple
+						style="width: 100%"
+						placeholder="请选择班次">
+						<el-option
+							v-for="d in groupOptions"
+							:key="d.id"
+							:label="d.name"
+							:value="d.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
 				</el-form-item>
 			</el-col>
 		</el-row>
@@ -56,8 +95,10 @@
 
 <script>
 import basicAdd from '../../../../core/mixins/basic-add';
-import { getEqCheck, getCode, createCheckConfig, updateCheckConfig } from "@/api/equipment/base/inspection/settings";
+import { getCheckOrder, getOrderCode, createCheckOrder, updateCheckOrder } from "@/api/equipment/base/inspection/settings";
-import { getEquipmentAll } from '@/api/base/equipment'
+import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+// import { getEquipmentAll } from '@/api/base/equipment'
 
 export default {
 	mixins: [basicAdd],
@@ -65,23 +106,36 @@ export default {
 		return {
 			urlOptions: {
 			  isGetCode: true,
-        codeURL: getCode,
+        codeURL: getOrderCode,
-				createURL: createCheckConfig,
+				createURL: createCheckOrder,
-				updateURL: updateCheckConfig,
+				updateURL: updateCheckOrder,
-				infoURL: getEqCheck,
+				infoURL: getCheckOrder,
 			},
 			dataForm: {
-        id: undefined,
+        id: null,
-        code: undefined,
+				code: null,
-        name: undefined,
+				name: null,
-        equipmentId: undefined,
+				departmentId: null,
-				equipmentCode: undefined
+				planCheckTime: null,
+				confirmTimeLimit: null,
+				groupClass: null,
+				remark: null
 			},
-			eqList: [],
+			groupOptions: [],
+			departmentOptions: [],
 			dataRule: {
-				equipmentId: [{ required: true, message: "设备不能为空", trigger: "blur" }],
+				confirmTimeLimit: [
-        code: [{ required: true, message: "配置编码不能为空", trigger: "blur" }],
+					{ required: true, message: '确认时限不能为空', trigger: 'blur' }
-        name: [{ required: true, message: "配置名称不能为空", trigger: "blur" }],
+				],
+				code: [
+					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' }
+				],
+				name: [
+					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' }
+				],
+				planCheckTime: [
+					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' }
+				]
       }
 		};
 	},
@@ -90,16 +144,47 @@ export default {
 	},
 	methods: {
 		async getDict() {
-			// 设备列表
+			// 部门列表
-			const res = await getEquipmentAll()
+			const res = await getCoreDepartmentList();
-			this.eqList = res.data
+			this.departmentOptions = res.data || [];
+			const res1 = await groupClassesListAll();
+			this.groupOptions = res1.data || [];
+			// const res = await getEquipmentAll()
+			// this.eqList = res.data
 		},
-		setCode() {
+		// 表单提交
-			const chooseM = this.eqList.filter(item => {
+    dataFormSubmit() {
-				return item.id === this.dataForm.equipmentId
+      this.$refs["dataForm"].validate((valid) => {
-			})
+        if (!valid) {
-			this.dataForm.equipmentCode = chooseM[0].code
+          return false;
         }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL({
+						...this.dataForm,
+						special: false,
+						status: 0,
+						groupClass: this.dataForm.groupClass.join(',')
+					}).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL({
+					...this.dataForm,
+					special: false,
+					status: 0,
+					groupClass: this.dataForm.groupClass.join(',')
+				}).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 	},
 };
 </script>

src/views/equipment/base/inspection/Settings/attr-add.vue

@@ -17,18 +17,32 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="60px"
+			label-width="90px"
 			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="巡检" prop="checkId">
+			<el-form-item label="设备名称" prop="equipmentId">
-				<el-select v-model="dataForm.checkId" filterable placeholder="请选择巡检" style="width: 100%">
+				<el-select
-					<el-option v-for="dict in checkList" :key="dict.id" :label="dict.content"
+					v-model="dataForm.equipmentId"
+					filterable
+					clearable
+					placeholder="请选择设备名称"
+					style="width: 100%">
+					<el-option
+						v-for="dict in equipmentOptions"
+						:key="dict.id"
+						:label="dict.name"
 						:value="dict.id" />
 				</el-select>
 			</el-form-item>
-			<el-form-item label="备注" prop="description">
+			<el-form-item label="巡检项目" prop="program">
 				<el-input
-					v-model="dataForm.description"
+					v-model="dataForm.program"
-					placeholder="请输入备注"
+					placeholder="请输入巡检项目"
+					clearable />
+			</el-form-item>
+			<el-form-item label="巡检结果" prop="checkResult">
+				<el-input
+					v-model="dataForm.checkResult"
+					placeholder="请输入巡检结果"
 					clearable />
 			</el-form-item>
 		</el-form>
@@ -41,11 +55,12 @@
 </template>
 
 <script>
-import { getCheckDet, createCheckDet, updateCheckDet, getcheckList } from "@/api/equipment/base/inspection/settings";
+import { getCheckOrderDet, createCheckOrderDet, updateCheckOrderDet } from "@/api/equipment/base/inspection/settings";
+import { getEquipmentPage } from '@/api/base/equipment'
 
 export default {
 	props: {
-		configId: {
+		orderId: {
 			type: String,
 			default: '',
 		},
@@ -54,14 +69,22 @@ export default {
 		return {
 			visible: false,
 			dataForm: {
-				id: undefined,
+				id: null,
-				checkId: undefined,
+				equipmentId: null,
-				configId: undefined,
+				program: null,
-				description: ''
+				checkResult: null
 			},
-			checkList: [],
+			equipmentOptions: [],
 			dataRule: {
-				checkId: [{ required: true, message: '巡检不能为空', trigger: 'blur' }],
+				equipmentId: [
+					{ required: true, message: '设备不能为空', trigger: 'blur' }
+				],
+				program: [
+					{ required: true, message: '巡检项目不能为空', trigger: 'blur' }
+				],
+				checkResult: [
+					{ required: true, message: '巡检结果不能为空', trigger: 'blur' }
+				]
 			},
 		};
 	},
@@ -70,8 +93,12 @@ export default {
 	},
 	methods: {
 		async getDict() {
-			const res = await getcheckList()
+			const res = await getEquipmentPage({
-			this.checkList = res.data
+				pageNo: 1,
+				pageSize: 100,
+				special: false
+			})
+			this.equipmentOptions = res.data.list
 		},
 		init(id) {
 			this.dataForm.id = id || '';
@@ -79,7 +106,7 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
-					getCheckDet(this.dataForm.id).then((res) => {
+					getCheckOrderDet(this.dataForm.id).then((res) => {
 						// const { name, value } = res.data;
 						// this.dataForm.name = name;
 						// this.dataForm.value = value;
@@ -94,9 +121,9 @@ export default {
 				if (valid) {
 					// 修改的提交
 					if (this.dataForm.id) {
-						updateCheckDet({
+						updateCheckOrderDet({
 							...this.dataForm,
-							configId: this.configId
+							orderId: this.orderId
 						}).then((response) => {
 							this.$modal.msgSuccess('修改成功');
 							this.visible = false;
@@ -105,9 +132,9 @@ export default {
 						return;
 					}
 					// 添加的提交
-					createCheckDet({
+					createCheckOrderDet({
 						...this.dataForm,
-						configId: this.configId,
+						orderId: this.orderId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
 						this.visible = false;

src/views/equipment/base/inspection/Settings/index.vue

@@ -53,6 +53,7 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue'
+import { parseTime } from '../../../../core/mixins/code-filter';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -79,12 +80,12 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check-setting:update')
+				// this.$auth.hasPermi('equipment:check-setting:update')
-					? {
+				// 	? {
-							type: 'detail',
+				// 			type: 'detail',
-							btnName: '查看详情',
+				// 			btnName: '查看详情',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
@@ -93,29 +94,31 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '配置名', width: 110, showOverflowtooltip: true },
+				{ prop: 'name', label: '巡检单名称', width: 110, showOverflowtooltip: true },
-				{ prop: 'code', label: '编码', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '巡检单编码', minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'lineName', label: '产线', showOverflowtooltip: true },
+				{ prop: 'department', label: '部门', showOverflowtooltip: true },
-				{ prop: 'sectionName', label: '工段', showOverflowtooltip: true },
+				{ prop: 'planCheckTime', label: '计划巡检时间', filter: parseTime },
-				{ prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
+				{ prop: 'confirmTimeLimit', label: '确认时限', showOverflowtooltip: true },
-				{ prop: 'equipmentCode', label: '设备编码', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
+				{ prop: 'checkPerson', label: '创建人', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'createTime', label: '创建时间', filter: parseTime },
 				// { prop: 'responsible', label: '负责人' },
-				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
+				{ prop: 'remark', label: '备注' } // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '配置名称',
+					label: '巡检单名称',
-					placeholder: '请输入配置名称',
+					placeholder: '请输入巡检单名称',
 					param: 'name',
 				},
-				{
+				// {
-					type: 'select',
+				// 	type: 'select',
-					label: '设备名称',
+				// 	label: '设备名称',
-					placeholder: '请选择设备',
+				// 	placeholder: '请选择设备',
-					param: 'equipmentId',
+				// 	param: 'equipmentId',
-					filterable: true,
+				// 	filterable: true,
-				},
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -133,7 +136,7 @@ export default {
 					name: 'add',
 					plain: true,
 					color: 'success',
-				},
+				}
 				// {
 				// 	type: this.$auth.hasPermi('equipment:check-setting:export')
 				// 		? 'button'
@@ -192,10 +195,11 @@ export default {
 				pageSize: 10,
 				equipmentId: null,
 				name: null,
+				special: false
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-config',
+			basePath: '/base/equipment-check-order',
 			mode: null,
 		};
 	},

src/views/equipment/base/maintain/Confirm/Record--detail.vue

@@ -0,0 +1,444 @@
+<!-- 
+    filename: PlanConfig--addContent.vue
+    author: liubin
+    date: 2024-02-04 09:40:04
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="true"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section>
+					<!-- <SmallTitle>保养信息</SmallTitle> -->
+					<div class="form-part" style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<el-form
+							v-else
+							ref="form"
+							:model="form"
+							label-position="top"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="8">
+									<div class="blodTip">计划保养人员</div>
+            			<div class="lightTip">{{ form.planMaintainWorker }}</div>
+									<!-- <el-form-item label="计划保养人员" prop="planMaintainWorker">
+										<span>{{ form.planMaintainWorker }}</span>
+									</el-form-item> -->
+								</el-col>
+								<el-col :span="8">
+									<div class="blodTip">实际保养人员</div>
+            			<div class="lightTip">{{ form.maintainWorker }}</div>
+									<!-- <el-form-item label="实际保养人员" prop="maintainWorker">
+										<span>{{ form.maintainWorker }}</span>
+									</el-form-item> -->
+								</el-col>
+							</el-row>
+						</el-form>
+					</div>
+				</section>
+
+				<el-divider />
+
+				<section>
+					<SmallTitle>保养详情</SmallTitle>
+					<div style="margin-top: 12px; position: relative">
+						<base-table
+							v-loading="detailLoading"
+							:table-props="detailTableProps"
+							:page="detailTableQuery.pageNo || 1"
+							:limit="detailTableQuery.pageSize || 10"
+							:table-data="detailList"
+							@emitFun="handleDetailTableAction">
+							<!-- <method-btn
+								slot="handleBtn"
+								label="操作"
+								width="100"
+								:method-list="detailTableBtns"
+								@clickBtn="handleDetailTableBtnClicked" /> -->
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="detailTotal > 0"
+							:total="detailTotal"
+							:page.sync="detailTableQuery.pageNo"
+							:limit.sync="detailTableQuery.pageSize"
+							@pagination="refreshDetailList" />
+					</div>
+				</section>
+			</div>
+		</div>
+
+		<!-- <div class="drawer-body__footer"> -->
+			<!-- <el-button style="" @click="cancel">返回</el-button> -->
+			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				编辑
+			</el-button>
+			<el-button v-else type="primary" @click="confirm">保存</el-button> -->
+		<!-- </div> -->
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			dialogTitle="保养详情"
+			:dialogVisible="detailAddVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeDetailForm"
+			@cancel="closeDetailForm"
+			@confirm="submitDetailForm">
+			<DialogForm
+				v-if="detailAddVisible"
+				ref="detailForm"
+				v-model="detailForm"
+				:rows="detailRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '@/components/DialogForm';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	name: 'PlanConfig--addContent',
+	components: { SmallTitle, DialogForm },
+	props: ['maintainData'],
+	data() {
+		return {
+			visible: false,
+			mode: 'detail',
+			showForm: false,
+			form: {
+				id: null,
+				maintainWorker: null,
+				planMaintainWorker: null,
+			},
+			formLoading: false,
+			equipmentOptions: [],
+			detailList: [],
+			detailAddVisible: false,
+			detailPageProps: ['equipmentName', 'program'],
+			detailForm: {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			},
+			detailRows: [
+				[
+					{
+						select: true,
+						label: '设备',
+						prop: 'equipmentId',
+						options: [],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '保养项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+						rules: [
+							{ required: true, message: '包养描述不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			detailLoading: false,
+			detailTableProps: [
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'program', label: '保养项目' },
+				{ prop: 'maintenanceDes', label: '保养描述' },
+				// { prop: 'remark', label: '备注' },
+			],
+			detailTableQuery: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			detailTableBtns: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			detailTotal: 0,
+			detailList: [],
+			equipmentList: [],
+		};
+	},
+	computed: {},
+	mounted() {
+		this.loadEquipments();
+	},
+	methods: {
+		handleColse() {},
+		show({ planMaintainWorker, id, maintainWorker }) {
+			this.form = Object.assign(
+				{},
+				{
+					planMaintainWorker,
+					id,
+					maintainWorker,
+				}
+			);
+			this.$nextTick(() => {
+				this.refreshDetailList();
+			});
+			this.visible = true;
+			this.showForm = true;
+		},
+		cancel() {
+			this.visible = false;
+			setTimeout(() => {
+				this.$emit('closed');
+			}, 500);
+		},
+		confirm() {
+			this.cancel();
+		},
+		toggleEdit() {
+			this.mode == 'edit' ? 'detail' : 'edit';
+		},
+		async loadEquipments() {
+			// TODO: 很有可能此处要改成动态刷新/获取/加载设备列表，当总的特殊设备数量大于100的时候...
+			const res = await this.$axios('/base/core-equipment/page', {
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+					special: false,
+				},
+			});
+			this.equipmentList = res.data?.list || [];
+			this.detailRows[0][0].options = (res.data?.list || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		closeDetailForm() {
+			this.detailAddVisible = false;
+		},
+		async submitDetailForm() {
+			// validation
+			this.$refs.detailForm.validate(async (valid) => {
+				if (!valid) return;
+				const res = await this.$axios[this.detailForm.id ? 'put' : 'post'](
+					`/base/equipment-maintain-log-det/create/${
+						this.detailForm.id ? 'update' : 'create'
+					}`,
+					{
+						...this.detailForm,
+						logId: this.form.id,
+					}
+				);
+				if (res.code == 0) {
+					this.detailAddVisible = false;
+					this.$message.success('添加成功');
+					this.refreshDetailList();
+				} else {
+					this.detailAddVisible = false;
+					this.$message.error('出错');
+				}
+			});
+		},
+		async refreshDetailList() {
+			this.detailLoading = true;
+			if (!this.form.id) {
+				this.$message.info('没有找到保养计划相关信息...');
+				this.detailLoading = false;
+			}
+
+			try {
+				const res = await this.$axios(
+					'/base/equipment-maintain-log-det/page',
+					{
+						params: {
+							pageNo: this.detailTableQuery.pageNo,
+							pageSize: this.detailTableQuery.pageSize,
+							// planId: this.form.id,
+							logId: this.form.id,
+						},
+					}
+				);
+				this.detailList = res.data?.list || [];
+				this.detailTotal = res.data?.total || 0;
+				this.detailLoading = false;
+			} catch (err) {
+				this.detailLoading = false;
+			}
+		},
+		//
+		handleDetailTableAction() {},
+		handleDetailTableBtnClicked({ data, type }) {
+			switch (type) {
+				case 'edit':
+					const { id, equipmentId, planId, program, maintenanceDes, remark } =
+						data;
+					this.detailAddVisible = true;
+					this.$nextTick(() => {
+						this.detailForm = Object.assign(
+							{},
+							{
+								id,
+								equipmentId,
+								planId,
+								program,
+								maintenanceDes,
+								remark,
+							}
+						);
+					});
+					break;
+				case 'delete':
+					if (!data.id) return;
+					this.$confirm('确认移除该详情吗？', '提示', {
+						confirmButtonText: '确 认',
+						cancelButtonText: '取 消',
+					})
+						.then(async () => {
+							const res = await this.$axios.delete(
+								'/base/equipment-maintain-plan-det/delete',
+								{
+									params: {
+										id: data.id,
+									},
+								}
+							);
+							if (res.code == 0) {
+								this.$message.success('删除成功!');
+								this.refreshDetailList();
+							}
+						})
+						.catch(console.error);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+				default:
+					this.handleTableActions({ data, type });
+			}
+		},
+		handleAddDetail() {
+			this.detailAddVisible = true;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: calc(100% - 72px);
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
+</style>

src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue

@@ -0,0 +1,373 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item
+					label="保养计划单号"
+					prop="maintainOrderNumber"
+					:rules="[
+						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.maintainOrderNumber"
+						@change="$emit('update', form)"
+						:placeholder="`请输入保养计划单号`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="保养计划名称" prop="name">
+					<el-input value="---" disabled />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="部门"
+					prop="departmentId"
+					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+					<el-select
+						v-model="form.departmentId"
+						:placeholder="`请选择部门`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+
+				<!-- <el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '请选择设备大类', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item> -->
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="产线"
+					prop="lineId"
+					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+					<el-select
+						v-model="form.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划保养人员" prop="maintainer">
+					<el-input value="---" disabled />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划开始时间" prop="planStartTime">
+					<el-input value="---" disabled />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="计划结束时间" prop="planEndTime">
+					<el-input value="---" disabled />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际开始时间"
+					prop="startTime"
+					:rules="[
+						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.startTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际开始时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际结束时间"
+					prop="endTime"
+					:rules="[
+						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
+					]">
+					<el-date-picker
+						v-model="form.endTime"
+						type="datetime"
+						:disabled="edit"
+						placeholder="请选择实际结束时间"
+						@change="$emit('update', form)"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item
+					label="实际保养人员"
+					prop="maintainWorker"
+					:rules="[
+						{ required: true, message: '请选择实际保养人员', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.maintainWorker"
+						:placeholder="`请选择实际保养人员`"
+						:disabled="disabled"
+						multiple
+						clearable
+						filterable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in maintainerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						:placeholder="`请输入备注`"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: {},
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		edit: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			form: {},
+			formLoading: true,
+			equipmentTypeOptions: [
+				{ label: '安全设备', value: 1 },
+				{ label: '消防设备', value: 2 },
+				{ label: '特种设备', value: 3 },
+			],
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (typeof val.maintainer == 'string')
+					this.form.maintainer = val.maintainer.split(',');
+				if (this.form.equipmentCategory != null) {
+					setTimeout(() => {
+						this.equipmentOptions = this.equipmentList
+							.filter((item) => item.special)
+							.filter(
+								(item) => item.specialType === this.form.equipmentCategory
+							)
+							.map((item) => ({ label: item.name, value: item.id }));
+					}, 1000);
+				}
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.code = response.data || '';
+		},
+		// initialize
+		async getEquipmentList() {
+			this.formLoading = true;
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = (response.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = false;
+		},
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			if (type) {
+				this.equipmentOptions = this.equipmentList
+					.filter((item) => item.special)
+					.filter((item) => item.specialType === type)
+					.map((item) => ({ label: item.name, value: item.id }));
+			} else
+				this.equipmentOptions = this.equipmentList.map((item) => ({
+					label: item.name,
+					value: item.id,
+				}));
+			// this.$emit('update', this.form)
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue

@@ -0,0 +1,758 @@
+<!-- 
+    filename: WaitingListUnplanned--edit.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">编辑</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="保养计划单号" prop="maintainOrderNumber">
+									<!-- :rules="[
+										{
+											required: true,
+											message: '请输入保养计划单号',
+											trigger: 'blur',
+										},
+									]" -->
+									<el-input
+										v-model="form.maintainOrderNumber"
+										disabled
+										:placeholder="`请输入保养计划单号`" />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="保养计划名称" prop="planName">
+									<el-input
+										v-model="form.planName"
+										placeholder="请输入保养计划名称"
+										disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="departmentId">
+									<!-- :rules="[
+										{ required: true, message: '请选择部门', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.departmentId"
+										:placeholder="`请选择部门`"
+										clearable
+										disabled
+										filterable>
+										<el-option
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="产线" prop="lineId">
+									<!-- :rules="[
+										{ required: true, message: '请选择产线', trigger: 'blur' },
+									]" -->
+									<el-select
+										v-model="form.lineId"
+										:placeholder="`请选择产线`"
+										disabled
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in lineOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划保养人员" prop="maintainer">
+									<el-select
+										v-model="form.planMaintainWorker"
+										placeholder="请选择计划保养人员"
+										disabled
+										clearable
+										filterable />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划开始时间" prop="planStartTime">
+									<el-date-picker
+										v-model="form.planStartTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划结束时间" prop="planEndTime">
+									<el-date-picker
+										v-model="form.planEndTime"
+										type="datetime"
+										disabled
+										placeholder="请选择计划结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际开始时间"
+									prop="startTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际开始时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.startTime"
+										type="datetime"
+										placeholder="请选择实际开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际结束时间"
+									prop="endTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际结束时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.endTime"
+										type="datetime"
+										placeholder="请选择实际结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际保养人员"
+									prop="maintainWorker"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际保养人员',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.maintainWorker"
+										:placeholder="`请选择实际保养人员`"
+										multiple
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in maintainerOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>保养内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '保养项目',
+				},
+				{
+					prop: 'maintenanceDes',
+					label: '保养描述',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				logId: null,
+				program: null,
+				maintenanceDes: null,
+				remark: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
+						// method: 'post',
+						// queryParams: {
+						// 	pageNo: 1,
+						// 	pageSize: 100,
+						// 	special: true,
+						// },
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	mounted() {
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-maintain-log/update',
+					method: 'put',
+					data: {
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+						planMaintainWorker: this.form.planMaintainWorker?.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row) {
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			this.formLoading = true;
+			const res = await this.$axios(
+				'/base/equipment-maintain-log/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.form.planMaintainWorker = res.data.planMaintainWorker?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					logId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				logId: this.row.id,
+				maintenanceDes: '',
+				program: null,
+				remark: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该保养内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-maintain-log-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-maintain-log-det/update'
+							: '/base/equipment-maintain-log-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/maintain/Confirm/WaitingListTable.vue

@@ -0,0 +1,307 @@
+<!-- 
+    filename: WaitingListTable.vue
+    author: liubin
+    date: 2024-02-05 16:12:55
+    description: 
+-->
+
+<template>
+	<el-table
+		:data="tableDataWithIndex"
+		:border="true"
+		@selection-change="handleSelectionChange"
+		style="width: 100%"
+		:header-cell-style="{
+			background: '#f2f4f9',
+			color: '#606266',
+		}"
+		class="waiting-list-table">
+		<el-table-column
+			type="selection"
+			:width="50"
+			:selectable="checkSelectable" />
+		<el-table-column prop="_pageIndex" width="80" align="center">
+			<template slot="header">
+				<el-popover placement="bottom-start" width="300" trigger="click">
+					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
+						<el-checkbox
+							v-for="(item, index) in tablePropsLabelList"
+							:key="'cb' + index"
+							v-model="selectedBox[index]"
+							:label="item.label" />
+					</div>
+					<i slot="reference" class="el-icon-s-tools" />
+				</el-popover>
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[0]"
+			width="128"
+			label="设备保养单号"
+			prop="maintainOrderNumber"></el-table-column>
+		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
+			<template slot-scope="scope">
+				{{ scope.row.planName || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column v-if="selectedBox[2]" label="部门" prop="departmentName">
+			<template slot-scope="scope">
+				{{ scope.row.departmentName || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column v-if="selectedBox[3]" label="产线名" prop="lineName">
+			<template slot-scope="scope">
+				{{ scope.row.lineName || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
+			width="150"
+			label="计划开始时间"
+			prop="planStartTime">
+			<template slot-scope="scope">
+				{{ scope.row.planStartTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[5]"
+			width="150"
+			label="计划结束时间"
+			prop="planEndTime">
+			<template slot-scope="scope">
+				{{ scope.row.planEndTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[6]"
+			width="150"
+			label="实际开始时间"
+			prop="startTime">
+			<template slot-scope="scope">
+				{{ scope.row.startTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[7]"
+			width="150"
+			label="实际结束时间"
+			prop="endTime">
+			<template slot-scope="scope">
+				{{ scope.row.endTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[8]"
+			width="150"
+			label="确认截止时间"
+			prop="confirmDueTime">
+			<template slot-scope="scope">
+				{{ scope.row.confirmDueTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[9]"
+			width="150"
+			label="保养计划类型"
+			prop="relatePlan">
+			<template slot-scope="scope">
+				{{ scope.row.relatePlan | relatePlanFilter }}
+			</template>
+		</el-table-column>
+		<!-- <el-table-column v-if="selectedBox[10]" width="60" label="详情">
+			<template slot-scope="scope">
+				<el-button type="text" @click="handelDetail(scope.row)">详情</el-button>
+			</template>
+		</el-table-column> -->
+		<!-- btns  -->
+		<el-table-column width="188" label="操作">
+			<template slot-scope="scope">
+				<el-tooltip content="确认" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						:disabled="!checkSelectable(scope.row)"
+						@click="$emit('confirm', scope.row)">
+						确认
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="查看详情" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('detail', scope.row)">
+						<i class="iconfont icon-detail primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="编辑" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('edit', scope.row)">
+						<i class="iconfont icon-edit primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="删除" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('delete', scope.row)">
+						<i class="iconfont icon-delete delete-color" />
+					</el-button>
+				</el-tooltip>
+			</template>
+		</el-table-column>
+	</el-table>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+	name: 'WaitingListTable',
+	components: {},
+	props: ['tableData', 'page', 'limit'],
+	filters: {
+		timeFilter: (val) =>
+			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
+		relatePlanFilter: (val) =>
+			val != null ? ['-', '计划型', '非计划型'][val] : '-',
+	},
+	data() {
+		return {
+			tablePropsLabelList: [
+				{
+					label: '设备保养单号',
+				},
+				{
+					label: '保养计划名称',
+				},
+				{
+					label: '部门',
+				},
+				{
+					label: '产线名',
+				},
+				{
+					label: '计划开始时间',
+				},
+				{
+					label: '计划结束时间',
+				},
+				{
+					label: '实际开始时间',
+				},
+				{
+					label: '实际结束时间',
+				},
+				{
+					label: '确认截止时间',
+				},
+				{
+					label: '保养计划类型',
+				},
+				{
+					label: '详情',
+				},
+			],
+			selectedBox: [
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+				true,
+			],
+			selectedPlan: [],
+		};
+	},
+	computed: {
+		tableDataWithIndex() {
+			return this.tableData.map((item, index) => ({
+				...item,
+				_pageIndex: (this.page - 1) * this.limit + index + 1,
+			}));
+		},
+	},
+	methods: {
+		checkSelectable(row, index) {
+			return (
+				row.relatePlan == 2 ||
+				(row.relatePlan == 1 &&
+					(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
+			);
+		},
+		handleSelectionChange(val) {
+			this.selectedPlan = val;
+		},
+		handleDelete(row) {},
+		handleDetail(row) {},
+		handleEdit(row) {},
+		handleConfirm(row) {},
+	},
+};
+</script>
+
+<style scoped>
+@import './iconfont/iconfont.css';
+.delete-color {
+	color: #ff5454;
+}
+.primary-color {
+	color: #0b58ff;
+}
+
+.baseTable .show-col-btn {
+	margin-right: 5px;
+	line-height: inherit;
+	cursor: pointer;
+}
+.baseTable .el-icon-refresh {
+	cursor: pointer;
+}
+</style>
+<style>
+.waiting-list-table .el-table__body tr.current-row > td.el-table__cell {
+	background-color: #eaf1fc;
+}
+.waiting-list-table.el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+.waiting-list-table .addButton {
+	width: 100%;
+	height: 35px;
+	border-top: none;
+	color: #0b58ff;
+	border-color: #ebeef5;
+	border-radius: 0;
+}
+.waiting-list-table .addButton:hover {
+	color: #0b58ff;
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+.waiting-list-table .addButton:focus {
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+
+.el-tooltip__popper.is-dark {
+	background: rgba(0, 0, 0, 0.6) !important;
+}
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+	border-top-color: rgba(0, 0, 0, 0.4) !important;
+}
+</style>

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

@@ -0,0 +1,734 @@
+<!-- 
+    filename: WaitingListUnplanned--edit.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">编辑</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item
+									label="保养计划单号"
+									prop="maintainOrderNumber"
+									:rules="[
+										{
+											required: true,
+											message: '请输入保养计划单号',
+											trigger: 'blur',
+										},
+									]">
+									<el-input
+										v-model="form.maintainOrderNumber"
+										:placeholder="`请输入保养计划单号`" />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="保养计划名称" prop="name">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="部门"
+									prop="departmentId"
+									:rules="[
+										{ required: true, message: '请选择部门', trigger: 'blur' },
+									]">
+									<el-select
+										v-model="form.departmentId"
+										:placeholder="`请选择部门`"
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="产线"
+									prop="lineId"
+									:rules="[
+										{ required: true, message: '请选择产线', trigger: 'blur' },
+									]">
+									<el-select
+										v-model="form.lineId"
+										:placeholder="`请选择产线`"
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in lineOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划保养人员" prop="maintainer">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划开始时间" prop="planStartTime">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="计划结束时间" prop="planEndTime">
+									<el-input value="---" disabled />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际开始时间"
+									prop="startTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际开始时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.startTime"
+										type="datetime"
+										placeholder="请选择实际开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际结束时间"
+									prop="endTime"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际结束时间',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="form.endTime"
+										type="datetime"
+										placeholder="请选择实际结束时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item
+									label="实际保养人员"
+									prop="maintainWorker"
+									:rules="[
+										{
+											required: true,
+											message: '请选择实际保养人员',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										v-model="form.maintainWorker"
+										:placeholder="`请选择实际保养人员`"
+										multiple
+										clearable
+										filterable>
+										<el-option
+											v-for="opt in maintainerOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>保养内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加属性
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			lineList: [],
+			maintainerList: [],
+			departmentList: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '保养项目',
+				},
+				{
+					prop: 'maintenanceDes',
+					label: '保养描述',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				logId: null,
+				program: null,
+				maintenanceDes: null,
+				remark: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
+						// method: 'post',
+						// queryParams: {
+						// 	pageNo: 1,
+						// 	pageSize: 100,
+						// 	special: true,
+						// },
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养项目',
+						prop: 'program',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养描述',
+						prop: 'maintenanceDes',
+					},
+				],
+				[
+					{
+						input: true,
+						label: '备注',
+						prop: 'remark',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [],
+			row: null,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		lineOptions() {
+			return (this.lineList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		maintainerOptions() {
+			return (this.maintainerList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.name,
+			}));
+		},
+	},
+	mounted() {
+		this.getList('maintainer');
+		this.getList('department');
+		this.getList('line');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			console.log('btn', btn);
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-maintain-log/update',  
+					method: 'put',
+					data: {
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(',')
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row) {
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			this.formLoading = true;
+			const res = await this.$axios(
+				'/base/equipment-maintain-log/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					logId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-production-line/listAll',
+				'/base/core-department/listAll',
+				'/base/core-worker/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[1]);
+					this.departmentList = res.data || [];
+					break;
+				case 'maintainer':
+					res = await this.$axios(urls[2]);
+					this.maintainerList = res.data || [];
+					break;
+				case 'line':
+					res = await this.$axios(urls[0]);
+					this.lineList = res.data || [];
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				logId: this.row.id,
+				maintenanceDes: '',
+				program: null,
+				remark: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: 'url delete', // this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-maintain-log-det/update'
+							: '/base/equipment-maintain-log-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/equipment/base/maintain/Confirm/iconfont/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

src/views/equipment/base/maintain/Confirm/iconfont/iconfont.css

@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3821755 */
+  src: url('iconfont.eot?t=1689233106339'); /* IE9 */
+  src: url('iconfont.eot?t=1689233106339#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARgAAsAAAAACcAAAAQUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDKAqGSIUsATYCJAMYCw4ABCAFhGcHVBtUCMiuMG7hiaIkox1FaBhxvd1fpwAN4YKo1v7tWTr8hBRkBQgO7yqKUJKPUKzDjkixjn7/q0vlANCkEHCJtsMvx2eQn04h5rHEE8593TK2y1SC5nbvNG5gqgZBNEWTqFUQLGVFNnVu1TjyMm3SafEsC3y0myW12KdEh2x+deP/zzHTJeG3AVBm4lrnAxpQN0US7s3ijuSE6Jbh1UGv08cgQEivMg5z6m49Qj77TVxDEZww6gXicNkviSbkxgswNeGCj+CgMw1yFRpAnUNegSv+8+UfU/igsBpjnRV3rRV9+Su8Fk1Agv6CW4eAeyvAAhronJlI1tcrVnIMHZ0cCcsUTrRTnQ0CP50B4KfgEub9Lw80BougQBwGI8bYJU4LPwUbBw0/HXAw8NORUM90wsT9JeIMFACux9QckHyQ9FDYTobcGi+FLSjwMxDe3L5s+w9THFYeEs8H303FWMnZ1JuBWFgNPh3bd5wOvJmKI9aTqXeD8eJ66HnfnV1dJPE8cy4EgqT+s/SbdSWbp9Pn24NbZ1MnGw7CDbvT6+lL1CXVh++hcH56umDT9vOviL/grQ6srHjE57uLHdQn+dtO9x2v94WN6+eXm0HWlZOzta3tUDp1JWjymsiD8r0ViWGkC+n4GeH5aODSM+9COnilpdfdZsRIvMerLmS0uICTplrOnb99LT3NkJNeajPfpDznblq6bXH8efBjlPIUxhQcX+U0qEdt4bjxy6rMdOkbEn0/3mlvrXZL60ysxdwcn/qKLJ/82pnzGS61z5rBeGmrxf33ZXN/IBWUvb8KSvnttbwwq+YTkweZHue0M0+c0ssZGY/Rs+aVF8+3GaW07CkvLC/KcBvP8c2uGpsdm0THlazwlPE22Kdi9ZK4Hdsmtw9eHVQwPjG0p33Q7tGMJ6TUJ2VK1MMw6ftI6qPPtruCvEPmLZqiHcj1Aw3Rup/sdzj+lt/w3f5TrAHgx++nD7A+8xaD4CL8m60Q+KWYO7CgUY3gTFl+OwUBHKteh00BoWmGDIYm301frAJwKAg+BTEoPCpA41OPNNh2sET0g8NnCkI61M6PKKBzREwANBtGIOS6BEU2D0CT6xvSYP+Apdg/cOT6DyErI68W0RzbqhmYOFixuRNLFqoRi839Zh+A2KqYWJH1CTC7hM04My0j664HDVgXY+xtYhbnBBNGVVzH7geKQrHOqA0sPK2Fc70oPZ2UPSTNQlVUjQEmHLDCzDphEgtKQ9zCPP16DwBRK4UJAyKfyBg7jaeaxzKlyQAg6xkaKO9M2tu1EWXhOEL3IxhKhdWpMqCYDgrTy7vZAAsuTUsLm65IOlWIQBlp47PUS9wAhBgHOFGixYgVJx7+dtqutZuY1eXTvXYncJOkOF1Wicd+CnBACA==') format('woff2'),
+       url('iconfont.woff?t=1689233106339') format('woff'),
+       url('iconfont.ttf?t=1689233106339') format('truetype'),
+       url('iconfont.svg?t=1689233106339#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-downward:before {
+  content: "\e604";
+}
+
+.icon-upward:before {
+  content: "\e605";
+}
+
+.icon-detail:before {
+  content: "\e601";
+}
+
+.icon-edit:before {
+  content: "\e602";
+}
+
+.icon-delete:before {
+  content: "\e603";
+}
+

src/views/equipment/base/maintain/Confirm/iconfont/iconfont.json

@@ -0,0 +1,44 @@
+{
+  "id": "3821755",
+  "name": "component",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "封装的组件中的icon",
+  "glyphs": [
+    {
+      "icon_id": "36426261",
+      "name": "downward",
+      "font_class": "downward",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "36426301",
+      "name": "upward",
+      "font_class": "upward",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "33347867",
+      "name": "detail",
+      "font_class": "detail",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "33347918",
+      "name": "edit",
+      "font_class": "edit",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "33347930",
+      "name": "delete",
+      "font_class": "delete",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    }
+  ]
+}

src/views/equipment/base/maintain/Confirm/iconfont/iconfont.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+  <metadata>Created by iconfont</metadata>
+  <defs>
+  <font id="iconfont" horiz-adv-x="1024">
+    <font-face
+      font-family="iconfont"
+      font-weight="400"
+      font-stretch="normal"
+      units-per-em="1024"
+      ascent="896"
+      descent="-128"
+    />
+      <missing-glyph />
+      
+      <glyph glyph-name="downward" unicode="&#58884;" d="M556.942222 144.099556l363.064889 401.806222c24.860444 21.617778 24.860444 56.263111 0 77.880889a68.437333 68.437333 0 0 1-44.942222 16.156444c-16.896 0-33.052444-5.859556-44.885333-16.156444L512 260.949333l-318.236444 362.951111a68.437333 68.437333 0 0 1-44.942223 16.099556c-16.896 0-33.109333-5.802667-44.942222-16.156444-24.746667-21.617778-24.746667-56.206222 0-77.824l363.121778-401.749334c5.973333-5.290667 13.141333-9.443556 21.048889-12.231111 23.722667-8.305778 51.029333-3.527111 68.892444 12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="upward" unicode="&#58885;" d="M556.942222 623.900444l363.064889-401.806222c24.860444-21.617778 24.860444-56.263111 0-77.880889a68.437333 68.437333 0 0 0-44.942222-16.156444c-16.896 0-33.052444 5.859556-44.885333 16.156444L512 507.050667l-318.236444-362.951111a68.437333 68.437333 0 0 0-44.942223-16.099556c-16.896 0-33.109333 5.802667-44.942222 16.156444-24.746667 21.617778-24.746667 56.206222 0 77.824L467.057778 623.729778c5.973333 5.290667 13.141333 9.443556 21.048889 12.231111 23.722667 8.305778 51.029333 3.527111 68.892444-12.060445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="detail" unicode="&#58881;" d="M902.428444 705.251556H332.401778a7.964444 7.964444 0 0 1-7.793778-8.021334v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.078222h570.026666A7.964444 7.964444 0 0 1 910.222222 641.024v56.206222a7.964444 7.964444 0 0 1-7.793778 8.021334z m0-285.127112H332.401778a7.964444 7.964444 0 0 1-7.793778-7.964444v-56.32a7.964444 7.964444 0 0 1 7.793778-7.964444h570.026666a7.964444 7.964444 0 0 1 7.793778 7.964444v56.32a7.964444 7.964444 0 0 1-7.793778 7.964444z m0-285.070222H332.401778a7.964444 7.964444 0 0 1-7.793778-8.078222v-56.206222a7.964444 7.964444 0 0 1 7.793778-8.021334h570.026666a7.964444 7.964444 0 0 1 7.793778 8.021334v56.206222a7.964444 7.964444 0 0 1-7.793778 8.078222zM113.777778 669.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 669.127111zM113.777778 384c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0A56.547556 56.547556 0 0 1 223.061333 384a56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0A56.547556 56.547556 0 0 1 113.777778 384z m0-285.127111c0-20.081778 10.410667-38.684444 27.306666-48.696889a53.361778 53.361778 0 0 1 54.670223 0 56.547556 56.547556 0 0 1 27.306666 48.696889 56.547556 56.547556 0 0 1-27.306666 48.696889 53.361778 53.361778 0 0 1-54.613334 0 56.547556 56.547556 0 0 1-27.363555-48.696889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="edit" unicode="&#58882;" d="M873.016889 395.264a32.824889 32.824889 0 0 0 65.649778 0v-273.806222a164.124444 164.124444 0 0 0-164.124445-164.124445h-525.084444A164.124444 164.124444 0 0 0 85.333333 121.457778v525.084444A164.124444 164.124444 0 0 0 249.457778 810.666667h312.32a32.824889 32.824889 0 1 0 0-65.649778h-312.32a98.417778 98.417778 0 0 1-98.474667-98.417778v-525.141333c0-54.385778 44.088889-98.474667 98.417778-98.474667h525.141333a98.417778 98.417778 0 0 1 98.474667 98.417778V395.320889z m-14.222222 362.097778a32.824889 32.824889 0 0 0 48.014222-44.771556L548.750222 328.533333a32.824889 32.824889 0 1 0-48.014222 44.771556l358.115556 384.056889z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="delete" unicode="&#58883;" d="M601.024 146.24a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.456 0v-326.848a29.76 29.76 0 0 0-29.76-29.888z m-178.24 0a29.632 29.632 0 0 0-29.696 29.696V503.04a29.632 29.632 0 1 0 59.392 0v-326.848a29.76 29.76 0 0 0-29.696-29.888z m475.52 505.216h-148.544v59.456c0 49.152-39.616 89.088-88.512 89.088H363.392c-49.216 0-89.152-39.936-89.152-89.088v-59.456H125.696a29.632 29.632 0 1 1 0-59.392h772.608a29.632 29.632 0 1 1 0 59.392z m-564.608 59.456c0 16.256 13.44 29.696 29.696 29.696h297.856c16.32 0 29.056-13.12 29.056-29.696v-59.456H333.696v59.456zM720-32h-416a89.152 89.152 0 0 0-89.088 89.088V503.232a29.632 29.632 0 1 0 59.456 0v-446.08c0-16.512 13.44-29.76 29.696-29.76h416.064a29.632 29.632 0 0 1 29.696 29.696V502.144a29.632 29.632 0 1 0 59.456 0v-445.056A89.536 89.536 0 0 0 720-32z"  horiz-adv-x="1024" />
+      
+    </font>
+  </defs>
+</svg>

src/views/equipment/base/maintain/Confirm/index.vue

@@ -0,0 +1,558 @@
+<!-- 
+    filename: MaintainRecord.vue
+    author: DY
+    date: 2023-12-12 13:54:53
+    description: 
+-->
+
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@select-changed="handleSearchBarChange"
+			@headBtnClick="handleSearchBarBtnClick" />
+		<WaitingListTable
+			ref="waiting-list-table"
+			:table-data="list"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			@edit="handleEdit"
+			@detail="handleDetail"
+			@delete="handleDelete"
+			@confirm="handleConfirm" />
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogFormUnplanned
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'" />
+			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="cancel">
+						关闭
+					</el-button>
+				</el-col>
+			</el-row>
+		</base-dialog>
+
+		<!-- 编辑 -->
+		<UnplannedEditDrawer
+			ref="unplanned"
+			v-if="openUnplannedDrawer"
+			@refreshDataList="getList"
+			@destroy="openUnplannedDrawer = false" />
+		<PlannedEditDrawer
+			ref="planned"
+			v-if="openPlannedDrawer"
+			@refreshDataList="getList"
+			@destroy="openPlannedDrawer = false" />
+
+		<RecordDetail
+			v-if="recordDetailVisible"
+			ref="recordDetailDrawer"
+			@destroy="recordDetailVisible = false" />
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
+import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
+import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
+import {
+	exportMaintainLogExcel,
+} from '@/api/equipment/base/maintain/record';
+import WaitingListTable from './WaitingListTable.vue';
+import RecordDetail from './Record--detail.vue';
+
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', {
+				action: this.injectData.label,
+				value: this.injectData,
+			});
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
+export default {
+	name: 'Confirm',
+	components: {
+		DialogFormUnplanned,
+		WaitingListTable,
+		RecordDetail,
+		UnplannedEditDrawer,
+		PlannedEditDrawer
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			recordDetailVisible: false,
+			searchBarKeys: [
+				'maintainPlanId',
+				'startTime',
+			],
+			tobeConfirmedIdList: [],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '保养计划名称',
+					placeholder: '请选择保养计划名称',
+					param: 'maintainPlanId',
+					defaultSelect: null,
+				},
+				// 开始结束时间
+				{
+					type: 'datePicker',
+					label: '实际开始时间',
+					dateType: 'daterange', // datetimerange
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始日期',
+					endPlaceholder: '结束日期',
+					defaultTime: ['00:00:00', '23:59:59'],
+					param: 'startTime',
+					defaultSelect: null,
+					// width: 350,
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: 'button',
+					btnName: '批量确认',
+					name: 'batchConfirm',
+					color: 'primary',
+					plain: true,
+				},
+				{
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
+						? 'button'
+						: '',
+					btnName: '导出',
+					name: 'export',
+					plain: true,
+					color: 'primary',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:create')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '新增',
+				// 	name: 'add',
+				// 	plain: true,
+				// 	color: 'success',
+				// },
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				maintainPlanId: null,
+				startTime: null,
+				special: false,
+				confirmed: false,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-maintain-log',
+			mode: null,
+			allSpecialEquipments: [],
+			openPlannedDrawer: false,
+			openUnplannedDrawer: false,
+			openPlannedDrawer: false,
+		};
+	},
+	watch: {
+		tobeConfirmedIdList: {
+			handler(val) {
+				if (val.length == this.list.length) {
+					this.$refs['table'].toggleAllSelection();
+				}
+			},
+		},
+	},
+	created() {
+		this.initSearchBar();
+		// if (this.$route.query) {
+		// 	this.queryParams.specialType =
+		// 		this.$route.query?.specialType ?? undefined;
+		// 	this.queryParams.equipmentId =
+		// 		this.$route.query?.equipmentId ?? undefined;
+		// 	this.queryParams.maintainPlanId =
+		// 		this.$route.query?.maintainPlanId ?? undefined;
+		// 	this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
+		// 	this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[0].defaultSelect =
+		// 		this.$route.query.specialType ?? undefined;
+		// 	this.searchBarFormConfig[1].defaultSelect =
+		// 		this.$route.query.equipmentId ?? undefined;
+		// 	this.searchBarFormConfig[2].defaultSelect =
+		// 		this.$route.query.maintainPlanId ?? undefined;
+		// 	this.searchBarFormConfig[3].defaultSelect =
+		// 		this.$route.query?.createTime ?? undefined;
+		// 	this.searchBarFormConfig[4].defaultSelect =
+		// 		Number(this.$route.query.relatePlan) ?? undefined;
+		// }
+		this.getList();
+		// if (this.$route.query.addRecord) {
+		// 	this.handleAdd();
+		// }
+	},
+	methods: {
+		/** 批量确认 */
+		async searchBarClicked(btn) {
+			switch (btn.btnName) {
+				case 'batchConfirm':
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+						this.$message.warning('请选择待确认的设备保养记录');
+						return;
+					}
+					const res = await this.$axios({
+						url: '/base/equipment-maintain-log/confirm',
+						method: 'put',
+						data: this.$refs['waiting-list-table'].selectedPlan.map(
+							(item) => item.id
+						),
+					});
+					if (res.code == 0) {
+						this.$message.success('确认成功');
+						this.getList();
+					}
+					break;
+			}
+		},
+		handleSelectionChange(list) {
+			if (this.tobeConfirmedIdList.length) {
+				this.tobeConfirmedIdList = [];
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: false },
+					});
+				});
+				console.log(
+					'清空选择列表',
+					this.list.map((item) => item._selection)
+				);
+			} else {
+				this.tobeConfirmedIdList = list.map((item) => item.id);
+				this.list.forEach((item) => {
+					this.handleEmitFun({
+						action: 'row-selected',
+						value: { row: item, selected: true },
+					});
+				});
+				console.log(
+					'全选',
+					this.list.map((item) => item._selection)
+				);
+			}
+		},
+
+		handleEmitFun({ action, value }) {
+			switch (action) {
+				case '详情':
+					this.recordDetailVisible = true;
+					this.$nextTick(() => {
+						this.$refs.recordDetailDrawer.show({
+							id: value.id,
+							planMaintainWorker: value.planMaintainWorker,
+							maintainWorker: value.maintainWorker,
+						});
+					});
+					break;
+				case 'row-selected':
+					if (value.selected) {
+						this.tobeConfirmedIdList.push(value.row.id);
+						value.row._selection = 0b11;
+					} else {
+						const index = this.tobeConfirmedIdList.indexOf(value.row.id);
+						if (index != -1) {
+							this.tobeConfirmedIdList.splice(index, 1);
+						}
+					}
+					console.log('tobeConfirmedIdList', this.tobeConfirmedIdList);
+					break;
+			}
+		},
+
+		handleSearchBarChange({ param, value }) {
+			console.log('122', param)
+			// if ('specialType' === param) {
+			// 	if (!value) {
+			// 		this.setSearchBarEquipmentList(this.allSpecialEquipments);
+			// 		return;
+			// 	}
+			// 	this.setSearchBarEquipmentList(
+			// 		this.allSpecialEquipments.filter((item) => item.specialType == value)
+			// 	);
+			// }
+		},
+		initSearchBar() {
+			// this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			// 	this.allSpecialEquipments = data.filter((item) => item.special);
+			// 	this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			// });
+			this.http('/base/equipment-maintain-plan/page', 'get', {
+				pageNo: 1,
+				pageSize: 100,
+				special: false,
+			}).then(({ data }) => {
+				this.$set(
+					this.searchBarFormConfig[0],
+					// this.searchBarFormConfig[2],
+					'selectOptions',
+					(data?.list || []).map((item) => ({
+						name: item.name,
+						id: item.id,
+					}))
+				);
+			});
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv({
+				...this.queryParams,
+				special: false,
+				// relatePlan: 2,
+				confirmed: false,
+			}).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.mode = null;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				id: null,
+				relatePlan: null,
+				maintainWorker: [],
+				maintainOrderNumber: null,
+				departmentId: null,
+				lineId: null,
+				startTime: null,
+				endTime: null,
+				planStartTime: null,
+				planEndTime: null,
+				confirmed: false,
+				remark: null,
+				special: false,
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加待确认保养记录';
+		},
+
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.put({
+						...this.form,
+						maintainWorker: this.form.maintainWorker.join(','),
+						special: false,
+						relatePlan: 2,
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+
+				// 添加的提交
+				this.getConfirmed()
+					.then((confirmed) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: false,
+							relatePlan: 2,
+							confirmed: true,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					})
+					.catch((err) => {
+						this.post({
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: false,
+							relatePlan: 2,
+							confirmed: false,
+						}).then((response) => {
+							this.$modal.msgSuccess('新增成功');
+							this.open = false;
+							this.getList();
+						});
+					});
+			});
+		},
+		/** 确认 */
+		async handleConfirm(row) {
+			const res = await this.$axios({
+				url: '/base/equipment-maintain-log/confirm',
+				method: 'put',
+				data: [row.id],
+			});
+			if (res.code == 0) {
+				this.$message.success('确认成功');
+				this.getList();
+			}
+		},
+		/** 编辑 */
+		async handleEdit(row) {
+			this.reset();
+			if (row.relatePlan == 1) {
+				// 计划型
+				// const res = await this.info({ id: row.id });
+				// this.form = res.data;
+				// this.form.maintainWorker = res.data.maintainWorker.split(',');
+				this.openPlannedDrawer = true;
+				this.$nextTick(() => {
+					this.$refs.planned.init(row);
+				});
+			} else {
+				this.openUnplannedDrawer = true;
+				this.$nextTick(() => {
+					this.$refs.unplanned.init(row);
+				});
+			}
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			this.$modal
+				.confirm(
+					'是否确认删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?'
+				)
+				.then(() => {
+					return this.$axios({
+						url: '/base/equipment-maintain-log/delete?id=' + row.id,
+						method: 'delete',
+					});
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(console.error);
+		},
+		handleDetail(row) {
+			this.recordDetailVisible = true;
+			this.$nextTick(() => {
+				this.$refs.recordDetailDrawer.show({
+					id: row.id,
+					planMaintainWorker: row.planMaintainWorker,
+					maintainWorker: row.maintainWorker,
+				});
+			});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.queryParams };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有待确认的保养记录?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportMaintainLogExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '设备保养待确认记录.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/maintain/Monitor/index.vue

@@ -31,7 +31,7 @@
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
+		<!-- <base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
 			@close="cancel"
@@ -43,7 +43,11 @@
 				v-model="form"
 				:has-files="false"
 				:rows="rows" />
-		</base-dialog>
+		</base-dialog> -->
+		<add-content
+			v-if="addContent"
+			ref="addContent"
+			@refreshDataList="addContent = false" />
 	</div>
 </template>
 
@@ -53,6 +57,7 @@ import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 import { parseTime } from '@/utils/ruoyi'
+import AddContent from '../PlanConfig/addContent.vue';
 
 const remainBox = {
 	name: 'RemainBox',
@@ -107,11 +112,12 @@ const btn = {
 };
 
 export default {
-	name: 'PlanConfig',
+	name: 'Monitor',
-	components: {},
+	components: { AddContent },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addContent: false,
 			searchBarKeys: ['planId', 'equipmentId'],
 			tableProps: [
 				// {
@@ -121,46 +127,53 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'name', label: '保养计划' },
+				{ prop: 'code', label: '保养计划单号' },
+				{ prop: 'name', label: '保养计划名称' },
+				{ prop: 'departmentName', label: '部门' },
 				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'sectionName', label: '工段名' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'maintenancePeriod', label: '保养频率' },
 				{
-					prop: 'maintainType',
+					prop: 'lastPlanMaintainTime',
-					label: '保养类型',
+					label: '上次计划保养时间',
-					filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
+					filter: parseTime,
 				},
 				{
 					prop: 'lastMaintainTime',
-					label: '上次保养时间',
+					label: '上次实际保养时间',
 					filter: parseTime,
 				},
-				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime },
+				{ prop: 'nextMaintainTime', label: '下次计划保养时间', filter: parseTime },
+				{ prop: 'maintainer', label: '计划保养人员' },
+				// { prop: 'equipmentName', label: '设备名称' },
+				// { prop: 'equipmentCode', label: '设备编码' },
+				// { prop: 'maintenancePeriod', label: '保养频率' },
+				// {
+				// 	prop: 'maintainType',
+				// 	label: '保养类型',
+				// 	filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
+				// },
+				// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
+				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn },
 				{
 					prop: 'remainDays',
-					label: '距离保养时间(天)',
+					label: '距离下次保养剩余时间(天)',
 					subcomponent: remainBox,
-				},
+				}
-				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'select',
-					label: '保养计划',
+					label: '保养计划名称',
 					placeholder: '请选择保养计划',
 					param: 'planId',
 					filterable: true,
 				},
-				{
+				// {
-					type: 'select',
+				// 	type: 'select',
-					label: '设备名',
+				// 	label: '设备名',
-					placeholder: '请选择设备',
+				// 	placeholder: '请选择设备',
-					param: 'equipmentId',
+				// 	param: 'equipmentId',
-					filterable: true,
+				// 	filterable: true,
-				},
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -255,13 +268,18 @@ export default {
 						row: value
 					} })
 					break;
-				case '保养记录':
+				case '保养内容':
-					const queryData = {
+					// 保养内容
-					equipmentId: value.equipmentId,
+					this.addContent = true;
-					maintainPlanId: value.id,
+					this.$nextTick(() => {
-					relatePlan: value.lastMaintainTime ? 1 : 2
+						this.$refs.addContent.init(value.id, true);
-				}
+					});
-				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
+					// const queryData = {
+					// 	equipmentId: value.equipmentId,
+					// 	maintainPlanId: value.id,
+					// 	relatePlan: value.lastMaintainTime ? 1 : 2
+					// }
+				// this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
 				break;
 			}
 		},

src/views/equipment/base/maintain/PlanConfig/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: 18px;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue

@@ -0,0 +1,294 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-27 10:33:31
+ * @Description:
+-->
+<template>
+	<!-- <el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+		</small-title> -->
+	<div class="content">
+		<div class="visual-part">
+			<el-form
+				:model="dataForm"
+				:rules="dataRule"
+				ref="dataForm"
+				@keyup.enter.native="dataFormSubmit()"
+				label-width="100px"
+				label-position="top">
+				<el-row :gutter="20">
+					<el-col :span="8">
+						<el-form-item label="保养计划名称" prop="name">
+							<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入保养计划名称" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="保养计划编码" prop="code">
+							<el-input
+								v-model="dataForm.code"
+								clearable
+								:disabled="isdetail"
+								placeholder="请输入保养计划编码" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="部门" prop="departmentId">
+							<treeselect v-model="dataForm.departmentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择部门"/>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">
+						<el-form-item label="产线名" prop="lineId">
+							<el-select
+								v-model="dataForm.lineId"
+								filterable
+								placeholder="请选择产线"
+								style="width: 100%">
+								<el-option
+									v-for="dict in proLineList"
+									:key="dict.id"
+									:label="dict.name"
+									:value="dict.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="保养频率" prop="maintenancePeriod">
+							<el-input-number v-model="dataForm.maintenancePeriod" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入保养频率" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="确认时限" prop="confirmTimeLimit">
+							<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入单位平方数" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="8">
+						<el-form-item label="保养时长" prop="maintainDuration">
+							<el-input-number v-model="dataForm.maintainDuration" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入保养时长" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="首次保养时间" prop="firstMaintenanceTime">
+							<el-date-picker
+								v-model="dataForm.firstMaintenanceTime"
+								type="date"
+								format='yyyy-MM-dd'
+								:disabled="isedit"
+								value-format='timestamp'
+								placeholder="选择首次保养时间"
+								style="width: 100%" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="计划保养人员" prop="maintainer">
+							<el-select v-model="dataForm.maintainer" placeholder="请选择计划保养人员" style="width: 100%;" :disabled="isdetail" multiple filterable>
+								<el-option
+									v-for="item in personList"
+									:key="item.id"
+									:label="item.name"
+									:value="item.name">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+// import { getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct";
+import { getWorkerList } from '@/api/base/worker'
+import { getCoreDepartmentList } from "@/api/base/coreDepartment";
+import { createPlan, updatePlan, getCode, getPlan } from '@/api/equipment/base/maintain/planconfig';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import { parseTime } from '../../../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+// import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+	mixins: [basicAdd],
+	components: { attrAdd, Treeselect },
+	data() {
+		return {
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createPlan,
+				updateURL: updatePlan,
+				infoURL: getPlan
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: '',
+				departmentId: undefined,
+				lineId: undefined,
+        maintenancePeriod: undefined,
+				confirmTimeLimit: undefined,
+				maintainDuration: undefined,
+        remark: undefined,
+				firstMaintenanceTime: undefined,
+				maintainer: undefined
+			},
+			menuOptions: [],
+			proLineList: [],
+			personList: [],
+			visible: false,
+			isdetail: false,
+			isedit: false,
+			dataRule: {
+        code: [{ required: true, message: "保养计划编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "保养计划名称不能为空", trigger: "blur" }],
+				departmentId: [{ required: true, message: "部门不能为空", trigger: "change" }],
+				lineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+				maintenancePeriod: [{ required: true, message: "保养频率不能为空", trigger: "blur" }],
+				confirmTimeLimit: [{ required: true, message: "确认时限不能为空", trigger: "blur" }],
+				maintainDuration: [{ required: true, message: "保养时长不能为空", trigger: "blur" }],
+				firstMaintenanceTime: [{ required: true, message: "首次保养时间不能为空", trigger: "blur" }],
+				maintainer: [{ required: true, message: "计划保养人员不能为空", trigger: "blur" }]
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 部门列表
+			this.menuOptions = []
+			const res = await getCoreDepartmentList();
+			this.departmentlList = res.data.map(item => {
+				item.parentId = item.parentId ? item.parentId : 0
+				return item
+			});
+			// const menu = { id: 0, name: '总部门', children: [] };
+			// menu.children = this.handleTree(this.departmentlList, "id")
+			this.menuOptions = this.handleTree(this.departmentlList, "id")
+			// 产线列表
+			const resline = await getCorePLList();
+			this.proLineList = resline.data;
+			// 保养人员
+			const personres = await getWorkerList()
+      this.personList = personres.data || []
+		},
+		getList() {
+			// 获取产品属性列表
+			// getCoreProductAttrPage({
+			// 	...this.listQuery,
+			// 	productId: this.dataForm.id,
+			// }).then((response) => {
+			// 	this.productAttrList = response.data.list;
+			// 	this.listQuery.total = response.data.total;
+			// });
+		},
+		init(id, isdetail) {
+			// this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.isedit = id ? true : false;
+			this.visible = true;
+			// if (id) {
+			// 	this.idAttrShow = true
+			// } else {
+			// 	this.idAttrShow = false
+			// }
+
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取计划详情
+					this.urlOptions.infoURL({ id: this.dataForm.id }).then(response => {
+            this.dataForm = response.data
+          });
+					// 获取产品属性列表
+					// this.getList();
+				} else {
+					if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		},
+		/** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL({
+						...this.dataForm,
+						maintainer: this.dataForm.maintainer.join(',')
+					}).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false; 
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL({
+					...this.dataForm,
+					maintainer: this.dataForm.maintainer.join(',')
+				}).then(response => {
+          this.$modal.msgSuccess("新增成功");
+					// this.idAttrShow = true
+					this.dataForm.id = response.data
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    }
+	}
+};
+</script>
+<style scoped>
+</style>

src/views/equipment/base/maintain/PlanConfig/addContent.vue

@@ -0,0 +1,308 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-23 19:48:12
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ '添加内容' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+				<el-row :gutter="20">
+          <el-col :span="8">
+            <div class="blodTip">保养计划名称</div>
+            <div class="lightTip">{{ dataForm.name }}</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="blodTip">部门</div>
+            <div class="lightTip">{{ dataForm.departmentName }}</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="blodTip">产线名</div>
+            <div class="lightTip">{{ dataForm.lineName }}</div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <div class="blodTip">保养频率</div>
+            <div class="lightTip">{{ dataForm.maintenancePeriod }}</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="blodTip">保养时长</div>
+            <div class="lightTip">{{ dataForm.maintainDuration }}</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="blodTip">计划保养人员</div>
+            <div class="lightTip">{{ dataForm.maintainer }}</div>
+          </el-col>
+        </el-row>
+			</div>
+			
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					保养内容
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+            </span>
+          </template>
+        </div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="planList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			</div>
+
+		</div>
+
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:plan-id="dataForm.id"
+			@refreshDataList="getList" />
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import { getPlan, deletePlanDet, getPlanDetPage } from '@/api/equipment/base/maintain/planconfig';
+// import { listData } from "@/api/system/dict/data";
+import SmallTitle from './SmallTitle';
+// import { parseTime } from '../../../../core/mixins/code-filter';
+import attrAdd from './attr-add';
+// import { getDictDatas } from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
+	{
+		prop: 'program',
+		label: '保养项目',
+	},
+];
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle, attrAdd },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+				infoURL: getPlan
+			},
+			listQuery: {
+				pageSize: 99,
+				pageNo: 1,
+				total: 0
+			},
+			dataForm: {},
+			planList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.planList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`是否确认删除保养项目名为"${raw.data.program}"的数据项?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deletePlanDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取物料的属性列表
+			getPlanDetPage({
+				...this.listQuery,
+				planId: this.dataForm.id,
+			}).then((response) => {
+				this.planList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+
+				if (this.dataForm.id) {
+					// 获取计划详情
+					this.urlOptions.infoURL({ id: id}).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取详情分页
+					this.getList();
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 18vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
+</style>

src/views/equipment/base/maintain/PlanConfig/attr-add.vue

@@ -0,0 +1,167 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'35%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="100px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-form-item label="设备名称" prop="equipmentId">
+				<el-select
+					v-model="dataForm.equipmentId"
+					filterable
+					style="width: 100%"
+					placeholder="请选择设备">
+					<el-option
+						v-for="dict in eqList"
+						:key="dict.id"
+						:label="dict.name"
+						:value="dict.id" />
+				</el-select>
+			</el-form-item>
+			<el-form-item label="保养项目" prop="program">
+				<el-input
+					v-model="dataForm.program"
+					placeholder="请输入保养项目"
+					clearable />
+			</el-form-item>
+			<el-form-item label="保养描述" prop="maintenanceDes">
+				<el-input
+					v-model="dataForm.maintenanceDes"
+					placeholder="请输入保养描述"
+					clearable />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { createPlanDet, updatePlanDet, getPlanDet } from '@/api/equipment/base/maintain/planconfig';
+import { getEquipmentPage } from '@/api/base/equipment'
+
+export default {
+	props: {
+		planId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			eqList: [],
+			dataForm: {
+				id: undefined,
+				equipmentId: '',
+				program: '',
+				maintenanceDes: ''
+			},
+			dataRule: {
+				equipmentId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
+				program: [{ required: true, message: '保养项目不能为空', trigger: 'blur' }],
+				maintenanceDes: [{ required: true, message: '保养描述不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	created() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			const res = await getEquipmentPage({
+				pageNo: 1,
+				pageSize: 100,
+				special: false
+			})
+			this.eqList = res.data.list
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getPlanDet({
+						id: this.dataForm.id
+					}).then((res) => {
+						const { equipmentId, program, maintenanceDes } = res.data;
+						this.dataForm.equipmentId = equipmentId;
+						this.dataForm.program = program;
+						this.dataForm.maintenanceDes = maintenanceDes;
+					});
+				}
+			});
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updatePlanDet({
+							...this.dataForm,
+							planId: this.planId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createPlanDet({
+						...this.dataForm,
+						planId: this.planId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/equipment/base/maintain/PlanConfig/index.vue

@@ -1,143 +1,150 @@
 <template>
 	<div class="app-container">
-		<!-- 搜索工作栏 -->
+		<search-bar
-		<SearchBar
+			:formConfigs="formConfig"
-			:formConfigs="searchBarFormConfig"
+			ref="searchBarForm"
-			ref="search-bar"
+			@headBtnClick="buttonClick" />
-			@headBtnClick="handleSearchBarBtnClick" />
-
-		<!-- 列表 -->
 		<base-table
+			v-loading="dataListLoading"
 			:table-props="tableProps"
-			:page="queryParams.pageNo"
+			:page="listQuery.pageNo"
-			:limit="queryParams.pageSize"
+			:limit="listQuery.pageSize"
-			:table-data="list"
+			:table-data="tableData">
-			@emitFun="handleEmitFun">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
+				:width="150"
 				label="操作"
-				:width="120"
 				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
+				@clickBtn="handleClick" />
 		</base-table>
-
-		<!-- 分页组件 -->
 		<pagination
-			v-show="total > 0"
+			:limit.sync="listQuery.pageSize"
-			:total="total"
+			:page.sync="listQuery.pageNo"
-			:page.sync="queryParams.pageNo"
+			:total="listQuery.total"
-			:limit.sync="queryParams.pageSize"
+			@pagination="getDataList" />
-			@pagination="getList" />
+		<!-- <add-or-update
-
+			v-if="addOrUpdateVisible"
-		<!-- 对话框(添加 / 修改) -->
+			ref="addOrUpdate"
+			@refreshDataList="getDataList" /> -->
     <base-dialog
-			:dialogTitle="title"
+			:dialogTitle="addOrEditTitle"
-			:dialogVisible="open"
+			:dialogVisible="addOrUpdateVisible"
-			@close="cancel"
+			@cancel="handleCancel"
-			@cancel="cancel"
+			@confirm="handleConfirm"
-			@confirm="submitForm">
+			:before-close="handleCancel"
-			<DialogForm
+			width="55%">
-				v-if="open"
+			<add-or-update
-				ref="form"
+				ref="addOrUpdate"
-				v-model="form"
+				@refreshDataList="successSubmit"></add-or-update>
-				:has-files="false"
-				:rows="rows" />
 		</base-dialog>
+		<add-content
+			v-if="addContent"
+			ref="addContent"
+			@refreshDataList="addContent = false" />
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
+import AddOrUpdate from './add-or-updata';
-import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import AddContent from './addContent';
-import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'
+import basicPage from '../../../../core/mixins/basic-page';
+import { parseTime, toDay } from '../../../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
+import { getPlanPage } from '@/api/equipment/base/maintain/planconfig';
+import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
+
+const tableProps = [
+	// {
+	// 	prop: 'createTime',
+	// 	label: '添加时间',
+	// 	filter: parseTime
+	// },
+	{
+		prop: 'name',
+		label: '保养计划名称'
+	},
+	{
+		prop: 'departmentName',
+		label: '部门'
+	},
+  {
+		prop: 'lineName',
+		label: '产线名'
+	},
+  {
+		prop: 'maintenancePeriod',
+		label: '保养频率(天/次)'
+	},
+  {
+		prop: 'firstMaintenanceTime',
+		label: '首次保养时间',
+		filter: parseTime
+	},
+  {
+		prop: 'maintainDuration',
+		label: '保养时长'
+	},
+  {
+		prop: 'maintainer',
+		label: '计划保养人员'
+	},
+  {
+		prop: 'confirmTimeLimit',
+		label: '确认时限',
+		filter: toDay
+	},
+	{
+		prop: 'remark',
+		label: '备注'
+	}
+];
 
 export default {
-	name: 'PlanConfig',
+	mixins: [basicPage],
-	components: {},
-	mixins: [basicPageMixin],
 	data() {
-		const t = new Date();
-		const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()];
 		return {
-			searchBarKeys: ['equipmentName', 'createTime'],
+			urlOptions: {
-			tableBtn: [
+				getDataListURL: getPlanPage,
-				{
+				deleteURL: deleteEqMaintainPlan
-					type: 'detail',
-					btnName: '保养记录',
 			},
-				this.$auth.hasPermi('equipment:plan-config:update')
+			tableProps,
+			addContent: false,
+			listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 0,
+				special: false,
+				planName: undefined
+      },
+			tableBtn: [
+				this.$auth.hasPermi(`equipment:plan-config:add`)
 					? {
-							type: 'edit',
+							type: 'add',
-							btnName: '修改',
+							btnName: '添加内容',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:plan-config:delete')
+				this.$auth.hasPermi(`equipment:plan-config:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+          this.$auth.hasPermi(`equipment:plan-config:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
 			].filter((v)=>v),
-			tableProps: [
+			tableData: [],
-				{
+			formConfig: [
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '计划名称' },
-				{ prop: 'code', label: '计划编号' },
-				{ prop: 'enabled', label: '启用状态', filter: (val) => ['停用', '启用'][val] },
-				{ prop: 'lineName', label: '产线' },
-				{ prop: 'sectionName', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
-				{ prop: 'maintenancePeriod', label: '保养频率(天/次)' },
-				{ prop: 'maintainType', label: '保养类型', filter: publicFormatter('maintain_type') },
-				{ prop: 'remark', label: '备注' },
-			],
-			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '设备名',
+					label: '保养计划名称',
-					placeholder: '请输入设备名称',
+					placeholder: '保养计划名称',
-					param: 'equipmentName',
+					param: 'planName'
 				},
-				// 时间段
-				// {
-				// 	type: 'datePicker',
-				// 	label: '时间段',
-				// 	dateType: 'daterange', // datetimerange
-				// 	format: 'yyyy-MM-dd',
-				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
-				// 	// valueFormat: 'timestamp',
-				// 	rangeSeparator: '-',
-				// 	startPlaceholder: '开始日期',
-				// 	endPlaceholder: '结束日期',
-				// 	defaultTime: ['00:00:00', '23:59:59'],
-				// 	param: 'createTime',
-				// 	// defaultSelect: [
-				// 	// 	new Date(y, m, d)
-				// 	// 		.toLocaleString()
-				// 	// 		.split('/')
-				// 	// 		.map((item, index) => {
-				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-				// 	// 			return item;
-				// 	// 		})
-				// 	// 		.join('-'),
-				// 	// 	new Date(y, m, d, 23, 59, 59)
-				// 	// 		.toLocaleString()
-				// 	// 		.split('/')
-				// 	// 		.map((item, index) => {
-				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-				// 	// 			return item;
-				// 	// 		})
-				// 	// 		.join('-'),
-				// 	// ],
-				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -148,228 +155,81 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:plan-config:create')
+					type: this.$auth.hasPermi('equipment:plan-config:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
-					plain: true,
 					color: 'success',
-				},
+					plain: true
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '计划名称',
-						prop: 'name',
-						rules: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '计划编号',
-						prop: 'code',
-						url: '/base/equipment-maintain-plan/getCode',
-						rules: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
 				},
 			],
-				[
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						// url: '/base/core-equipment/listAll?special=false',
-						url: '/base/core-equipment/page?special=false&pageNo=1&pageSize=99',
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '保养类型',
-						prop: 'maintainType',
-						options: this.getDictDatas(this.DICT_TYPE.MAINTAIN_TYPE),
-					},
-				],
-				[
-					{
-						input: true,
-						label: '保养时长(h)',
-						prop: 'maintainDuration',
-						rules: [
-							{
-								type: 'number',
-								trigger: 'blur',
-								message: '请输入正确的数字',
-								transform: (val) => Number(val),
-							},
-						],
-					},
-					{
-						input: true,
-						label: '保养频率(天/次)',
-						prop: 'maintenancePeriod',
-						rules: [
-							{
-								type: 'number',
-								trigger: 'blur',
-								message: '请输入正确的数字',
-								transform: (val) => Number(val),
-							},
-						],
-						rules: [{ required: true, message: '保养频率不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						switch: true,
-						label: '启用状态',
-						prop: 'enabled',
-						bind: {
-							'active-value': 1,
-							'inactive-value': 0,
-						},
-					}
-				],
-				[{ input: true, label: '备注', prop: 'remark' }],
-			],
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNo: 1,
-				pageSize: 10,
-				special: false,
-				equipmentName: null,
-				createTime: null,
-			},
-			// 表单参数
-			form: {},
-			basePath: '/base/equipment-maintain-plan',
 		};
 	},
-	created() {
+	components: {
-		if (this.$route.query) {
+		AddOrUpdate,
-			this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined
+		AddContent
-			this.searchBarFormConfig[0].defaultSelect = this.$route.query.equipmentName ?? undefined
-		}
-		this.getList();
 	},
+	created() {},
 	methods: {
-		/** 查询列表 */
+		// 删除
-		getList() {
+    deleteHandle(id, name, index) {
-			this.loading = true;
+      this.$confirm(`是否确认删除产品名称为"${name}"的数据项`, "提示", {
-			// 执行查询
+        confirmButtonText: "确定",
-			this.recv(this.queryParams).then((response) => {
+        cancelButtonText: "取消",
-				this.list = response.data.list;
+        type: "warning",
-				this.total = response.data.total;
-				this.loading = false;
-			});
-		},
-		/** 取消按钮 */
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				code: null,
-				name: null,
-				equipmentId: null,
-				enabled: null,
-				maintenancePeriod: null,
-				maintainDuration: null,
-				maintainType: null,
-				remark: null,
-                enabled: 1
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNo = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加保养计划';
-		},
-		handleDetail(row){
-				// alert('跳转到 保养记录')
-				// console.log(row)
-				const queryData = {
-					equipmentId: row.equipmentId,
-					maintainPlanId: row.id,
-					isAdd: 1
-					// relatePlan: row.enabled
-				}
-				if (this.queryParams.createTime) {
-					queryData.createTime = this.queryParams.createTime
-				}
-				console.log('你好', queryData)
-				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
-				// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改保养计划';
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.post(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm('是否确认删除计划名称为"' + row.name + '"的数据项?')
-				.then(function () {
-					return deleteEqMaintainPlan(id);
       })
         .then(() => {
-					this.getList();
+          this.urlOptions.deleteURL(id).then(({ data }) => {
-					this.$modal.msgSuccess('删除成功');
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
         })
         .catch(() => { });
+    },
+		// 查看详情
+		otherMethods(val) {
+			if (val.type === 'add') {
+				this.addContent = true;
+				// this.addOrEditTitle = '详情';
+				this.$nextTick(() => {
+					this.$refs.addContent.init(val.data.id);
+				});
+			}
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+					// this.listQuery.pageNo = 1;
+					// this.listQuery.pageSize = 10;
+					this.listQuery.planName = val.planName ? val.planName : undefined;
+					this.listQuery.code = val.code ? val.code : undefined;
+					this.getDataList();
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				case 'add':
+					this.addOrEditTitle = '新增';
+					this.addOrUpdateVisible = true;
+					this.addOrUpdateHandle();
+					break;
+				case 'export':
+					this.handleExport();
+					break;
+				default:
+					console.log(val);
+			}
 		},
 	},
 };

src/views/equipment/base/maintain/PlanConfig/index1.vue

@@ -0,0 +1,376 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 对话框(添加 / 修改) -->
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:has-files="false"
+				:rows="rows" />
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'
+import { publicFormatter } from '@/utils/dict';
+
+export default {
+	name: 'PlanConfig',
+	components: {},
+	mixins: [basicPageMixin],
+	data() {
+		const t = new Date();
+		const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()];
+		return {
+			searchBarKeys: ['equipmentName', 'createTime'],
+			tableBtn: [
+				{
+					type: 'detail',
+					btnName: '保养记录',
+				},
+				this.$auth.hasPermi('equipment:plan-config:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('equipment:plan-config:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'name', label: '计划名称' },
+				{ prop: 'code', label: '计划编号' },
+				{ prop: 'enabled', label: '启用状态', filter: (val) => ['停用', '启用'][val] },
+				{ prop: 'lineName', label: '产线' },
+				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
+				{ prop: 'maintenancePeriod', label: '保养频率(天/次)' },
+				{ prop: 'maintainType', label: '保养类型', filter: publicFormatter('maintain_type') },
+				{ prop: 'remark', label: '备注' },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备名',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				// 时间段
+				// {
+				// 	type: 'datePicker',
+				// 	label: '时间段',
+				// 	dateType: 'daterange', // datetimerange
+				// 	format: 'yyyy-MM-dd',
+				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				// 	// valueFormat: 'timestamp',
+				// 	rangeSeparator: '-',
+				// 	startPlaceholder: '开始日期',
+				// 	endPlaceholder: '结束日期',
+				// 	defaultTime: ['00:00:00', '23:59:59'],
+				// 	param: 'createTime',
+				// 	// defaultSelect: [
+				// 	// 	new Date(y, m, d)
+				// 	// 		.toLocaleString()
+				// 	// 		.split('/')
+				// 	// 		.map((item, index) => {
+				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+				// 	// 			return item;
+				// 	// 		})
+				// 	// 		.join('-'),
+				// 	// 	new Date(y, m, d, 23, 59, 59)
+				// 	// 		.toLocaleString()
+				// 	// 		.split('/')
+				// 	// 		.map((item, index) => {
+				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+				// 	// 			return item;
+				// 	// 		})
+				// 	// 		.join('-'),
+				// 	// ],
+				// },
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:plan-config:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
+				// 		? 'button'
+				// 		: '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						input: true,
+						label: '计划名称',
+						prop: 'name',
+						rules: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '计划编号',
+						prop: 'code',
+						url: '/base/equipment-maintain-plan/getCode',
+						rules: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						// url: '/base/core-equipment/listAll?special=false',
+						url: '/base/core-equipment/page?special=false&pageNo=1&pageSize=99',
+						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '保养类型',
+						prop: 'maintainType',
+						options: this.getDictDatas(this.DICT_TYPE.MAINTAIN_TYPE),
+					},
+				],
+				[
+					{
+						input: true,
+						label: '保养时长(h)',
+						prop: 'maintainDuration',
+						rules: [
+							{
+								type: 'number',
+								trigger: 'blur',
+								message: '请输入正确的数字',
+								transform: (val) => Number(val),
+							},
+						],
+					},
+					{
+						input: true,
+						label: '保养频率(天/次)',
+						prop: 'maintenancePeriod',
+						rules: [
+							{
+								type: 'number',
+								trigger: 'blur',
+								message: '请输入正确的数字',
+								transform: (val) => Number(val),
+							},
+						],
+						rules: [{ required: true, message: '保养频率不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						switch: true,
+						label: '启用状态',
+						prop: 'enabled',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					}
+				],
+				[{ input: true, label: '备注', prop: 'remark' }],
+			],
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+				special: false,
+				equipmentName: null,
+				createTime: null,
+			},
+			// 表单参数
+			form: {},
+			basePath: '/base/equipment-maintain-plan',
+		};
+	},
+	created() {
+		if (this.$route.query) {
+			this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined
+			this.searchBarFormConfig[0].defaultSelect = this.$route.query.equipmentName ?? undefined
+		}
+		this.getList();
+	},
+	methods: {
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			this.recv(this.queryParams).then((response) => {
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		/** 表单重置 */
+		reset() {
+			this.form = {
+				code: null,
+				name: null,
+				equipmentId: null,
+				enabled: null,
+				maintenancePeriod: null,
+				maintainDuration: null,
+				maintainType: null,
+				remark: null,
+                enabled: 1
+			};
+			this.resetForm('form');
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm');
+			this.handleQuery();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = '添加保养计划';
+		},
+		handleDetail(row){
+				// alert('跳转到 保养记录')
+				// console.log(row)
+				const queryData = {
+					equipmentId: row.equipmentId,
+					maintainPlanId: row.id,
+					isAdd: 1
+					// relatePlan: row.enabled
+				}
+				if (this.queryParams.createTime) {
+					queryData.createTime = this.queryParams.createTime
+				}
+				console.log('你好', queryData)
+				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
+				// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const id = row.id;
+			this.info({ id }).then((response) => {
+				this.form = response.data;
+				this.open = true;
+				this.title = '修改保养计划';
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.put(this.form).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.open = false;
+						this.getList();
+					});
+					return;
+				}
+				// 添加的提交
+				this.post(this.form).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.open = false;
+					this.getList();
+				});
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认删除计划名称为"' + row.name + '"的数据项?')
+				.then(function () {
+					return deleteEqMaintainPlan(id);
+				})
+				.then(() => {
+					this.getList();
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
+		},
+	},
+};
+</script>

src/views/equipment/base/maintain/Record/addContent.vue

@@ -0,0 +1,294 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-24 16:59:05
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="isdetail"
+		class="drawer"
+		size="60%">
+		<small-title slot="title" :no-padding="true">
+			{{ '设备保养记录详情' }}
+		</small-title>
+		<div class="content">
+			<div class="visual-part">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <div class="blodTip">计划保养人员</div>
+            <div class="lightTip">{{ dataForm.planMaintainWorker }}</div>
+          </el-col>
+					<el-col :span="8">
+            <div class="blodTip">实际保养人员</div>
+            <div class="lightTip">{{ dataForm.maintainWorker }}</div>
+          </el-col>
+        </el-row>
+			</div>
+			
+			<div class="attr-list" v-if="idAttrShow">
+				<small-title
+					style="margin: 16px 0; padding-left: 8px"
+					:no-padding="true">
+					保养内容
+				</small-title>
+
+				<div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
+            </span>
+          </template>
+        </div>
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-data="planList">
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div v-if="!isdetail" class="drawer-body__footer">
+				<el-button style="" @click="goback()">取消</el-button>
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			</div>
+
+		</div>
+
+		<!-- <attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:plan-id="dataForm.id"
+			@refreshDataList="getList" /> -->
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import { getLog, deleteLogDet, getLogDetPage } from '@/api/equipment/base/maintain/record';
+// import { listData } from "@/api/system/dict/data";
+import SmallTitle from '../PlanConfig/SmallTitle';
+// import { parseTime } from '../../../../core/mixins/code-filter';
+// import attrAdd from './attr-add';
+// import { getDictDatas } from "@/utils/dict";
+
+const tableBtn = [
+	{
+		type: 'edit',
+		btnName: '编辑',
+	},
+	{
+		type: 'delete',
+		btnName: '删除',
+	},
+];
+const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
+	{
+		prop: 'program',
+		label: '保养项目',
+	},
+	{
+		prop: 'maintenanceDes',
+		label: '保养描述',
+	}
+];
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle },
+	data() {
+		return {
+			tableBtn,
+			tableProps,
+			addOrUpdateVisible: false,
+			urlOptions: {
+			  isGetCode: false,
+				infoURL: getLog
+			},
+			listQuery: {
+				pageSize: 99,
+				pageNo: 1,
+				total: 0
+			},
+			dataForm: {},
+			planList: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			this.planList.splice(0);
+			this.listQuery.total = 0;
+		},
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`是否确认删除保养项目名为"${raw.data.program}"的数据项?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteLogDet(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		getList() {
+			// 获取物料的属性列表
+			getLogDetPage({
+				...this.listQuery,
+				logId: this.dataForm.id,
+			}).then((response) => {
+				this.planList = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			if (id) {
+				this.idAttrShow = true
+			} else {
+				this.idAttrShow = false
+			}
+
+			this.$nextTick(() => {
+
+				if (this.dataForm.id) {
+					// 获取计划详情
+					this.urlOptions.infoURL({ id: id}).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取详情分页
+					this.getList();
+				}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 10vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form,
+.drawer >>> .attr-list {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.action_btn {
+  float: right;
+  margin: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
+</style>

src/views/equipment/base/maintain/Record/index.vue

@@ -51,6 +51,10 @@
 				</el-col>
 			</el-row>
 		</base-dialog>
+		<add-content
+			v-if="addContent"
+			ref="addContent"
+			@refreshDataList="addContent = false" />
 	</div>
 </template>
 
@@ -59,15 +63,37 @@ import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
 import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
+import AddContent from './addContent.vue';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
+const btn = {
+	name: 'tableBtn',
+	props: ['injectData'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleClick() {
+			this.$emit('emitData', { action: this.injectData.label, value: this.injectData });
+		},
+	},
+	render: function (h) {
+		return (
+			<el-button type="text" onClick={this.handleClick}>
+				{this.injectData.name}
+			</el-button>
+		);
+	},
+};
+
 export default {
 	name: 'EquipmentMaintainRecord',
-	components: {},
+	components: { AddContent },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			addContent: false,
 			searchBarKeys: [
 				'maintainPlanId',
 				'startTime',
@@ -75,65 +101,70 @@ export default {
 				'equipmentId',
 			],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:maintain-record:update')
+				// this.$auth.hasPermi('equipment:maintain-record:update')
-					? {
+				// 	? {
-							type: 'detail',
+				// 			type: 'detail',
-							btnName: '详情',
+				// 			btnName: '详情',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:maintain-record:update')
+				// this.$auth.hasPermi('equipment:maintain-record:update')
-					? {
+				// 	? {
-							type: 'edit',
+				// 			type: 'edit',
-							btnName: '修改',
+				// 			btnName: '修改',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:maintain-record:delete')
+				// this.$auth.hasPermi('equipment:maintain-record:delete')
-					? {
+				// 	? {
-							type: 'delete',
+				// 			type: 'delete',
-							btnName: '删除',
+				// 			btnName: '删除',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{
+				// {
-					prop: 'createTime',
+				// 	prop: 'createTime',
-					label: '添加时间',
+				// 	label: '添加时间',
-					fixed: true,
+				// 	fixed: true,
-					width: 180,
+				// 	width: 180,
-					filter: timeFilter,
+				// 	filter: timeFilter,
-				},
+				// },
 				{ prop: 'maintainOrderNumber', label: '设备保养单号' },
-				{ prop: 'startTime', label: '开始时间', filter: timeFilter },
+				{ prop: 'planName', label: '保养计划名称' },
-				{ prop: 'endTime', label: '结束时间', filter: timeFilter },
+				{ prop: 'departmentName', label: '部门' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'maintainWorker', label: '保养人员' },
+				{ prop: 'planStartTime', label: '计划开始时间', filter: timeFilter },
+				{ prop: 'planEndTime', label: '计划结束时间', filter: timeFilter },
+				{ prop: 'startTime', label: '实际开始时间', filter: timeFilter },
+				{ prop: 'endTime', label: '实际结束时间', filter: timeFilter },
+				// { prop: 'equipmentName', label: '设备名称' },
+				// { prop: 'maintainWorker', label: '保养人员' },
 				{
 					prop: 'relatePlan',
-					label: '是否计划保养',
+					label: '保养计划类型',
-					filter: (v) => (v != null ? ['', '是', '否'][v] : ''),
+					filter: (v) => (v != null ? ['', '计划型', '非计划型'][v] : ''),
 				},
-				{ prop: 'planName', label: '保养计划名称' },
+				{ prop: 'opt', label: '详情', name: '详情', subcomponent: btn }
-				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
+				// { prop: 'maintainDuration', label: '计划保养用时(h)' },
-				{ prop: 'timeUsed', label: '实际保养用时(h)' },
+				// { prop: 'timeUsed', label: '实际保养用时(h)' },
-				{ prop: 'remark', label: '备注' },
+				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '设备',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// },
 				{
 					type: 'select',
-					label: '设备',
+					label: '保养计划名称',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-				},
-				{
-					type: 'select',
-					label: '计划名称',
 					placeholder: '请选择计划名称',
 					param: 'maintainPlanId',
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '保养开始时间',
+					label: '实际开始时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -144,15 +175,15 @@ export default {
 					param: 'startTime',
 					// width: 350,
 				},
-				{
+				// {
-					type: 'select',
+				// 	type: 'select',
-					label: '是否计划保养',
+				// 	label: '是否计划保养',
-					selectOptions: [
+				// 	selectOptions: [
-						{ name: '是', id: 1 },
+				// 		{ name: '是', id: 1 },
-						{ name: '否', id: 2 },
+				// 		{ name: '否', id: 2 },
-					],
+				// 	],
-					param: 'relatePlan',
+				// 	param: 'relatePlan',
-				},
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -170,24 +201,24 @@ export default {
 					name: 'export',
 					plain: true,
 					color: 'primary',
-				},
+				}
-				{
+				// {
-					type: this.$auth.hasPermi('equipment:maintain-record:create')
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:create')
-						? 'button'
+				// 		? 'button'
-						: '',
+				// 		: '',
-					btnName: '新增',
+				// 	btnName: '新增',
-					name: 'add',
+				// 	name: 'add',
-					plain: true,
+				// 	plain: true,
-					color: 'success',
+				// 	color: 'success',
-				},
+				// },
-				{
+				// {
-					type: this.$auth.hasPermi('equipment:maintain-record:export')
+				// 	type: this.$auth.hasPermi('equipment:maintain-record:export')
-						? 'button'
+				// 		? 'button'
-						: '',
+				// 		: '',
-					btnName: '导出',
+				// 	btnName: '导出',
-					name: 'export',
+				// 	name: 'export',
-					color: 'warning',
+				// 	color: 'warning',
-				},
+				// },
 			],
 			rows: [
 				[
@@ -339,6 +370,18 @@ export default {
 		}
 	},
 	methods: {
+		handleEmitFun({action, value}) {
+ 			switch (action) {
+				// 查看详情
+				case '详情':
+					// this.handleDetail({ id: value.id })
+					this.addContent = true;
+					this.$nextTick(() => {
+						this.$refs.addContent.init(value.id, true);
+					});
+					break;
+			}
+		},
 		initSearchBar() {
 			this.http('/base/core-equipment/page', 'get', {
 				special: false,

src/views/equipment/base/repair/CustomDialogForm.vue

@@ -1,40 +1,3 @@
-
-首页
-工单管理
-合并请求
-里程碑
-探索
- 通知469
- 创建…
- 个人信息和配置
- mt-fe-group / yudao-dev
-取消关注
-11
-点赞
-0
-派生
-0
-代码
-工单
-0
-合并请求
-0
-版本发布
-0
-百科
-动态
- 559 提交
- 25 分支
- 145 MiB
- 分支: projects/mes-test
-yudao-dev/src/views/equipment/base/repair/CustomDialogForm.vue
-346 行
-8.9 KiB
-原始文件
-永久链接
-Blame
-文件历史
-
 <!--
     filename: dialogForm.vue
     author: liubin
@@ -44,53 +7,74 @@ Blame
 
 <template>
   <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
-    custom-class="mes-drawer" size="65%" @closed="$emit('destroy')">
+    custom-class="mes-drawer" size="50%" @closed="$emit('destroy')">
     <small-title slot="title" :no-padding="true">
       {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
     </small-title>
     <div class="drawer-body flex">
       <div class="drawer-body__content">
-        <el-form ref="form" :model="dataForm" label-width="100px" label-position="top" v-loading="formLoading">
+        <div>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="维修单号" prop="repairOrderNumber">
+              <div class="blodTip">故障发生时间</div>
-                <span>{{ dataForm.repairOrderNumber }}</span>
+              <div class="lightTip">{{ parseTime(dataForm.faultTime) }}</div>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="设备名称" prop="equipmentName">
+              <div class="blodTip">故障级别</div>
-                <span>{{ dataForm.equipmentName }}</span>
+              <div class="lightTip">{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</div>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="维修工" prop="repairman">
+              <div class="blodTip">故障类型</div>
-                <span>{{ dataForm.repairman }}</span>
+              <div class="lightTip">{{ getDictDataLabel('fault-type', dataForm.faultType) }}</div>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item label="故障发生时间" prop="faultTime">
+              <div class="blodTip">维修工</div>
-                <span>{{ parseTime(dataForm.faultTime) }}</span>
+              <div class="lightTip">{{ dataForm.repairman }}</div>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="故障级别" prop="faultLevel">
+              <div class="blodTip">联系方式</div>
-                <span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
+              <div class="lightTip">{{ dataForm.repairmanPhone }}</div>
-              </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="联系方式" prop="repairmanPhone">
+              <div class="blodTip">维修方式</div>
-                <span>{{ dataForm.repairmanPhone }}</span>
+              <div class="lightTip">{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}</div>
-              </el-form-item>
             </el-col>
           </el-row>
-
+          <el-row>
-          <el-divider style="margin-top: -10px" />
+            <div class="blodTip">维修附件</div>
-
+            <div v-if="dataForm.files && dataForm.files.length > 0">
+              <uploadedFile
+                class="file"
+                v-for="file in dataForm.files"
+                :file="file"
+                :key="file.fileUrl"
+                :disabled="disabled"
+                @delete="!disabled && handleDeleteFile(file, col.prop)" />
+            </div>
+            <p v-else>暂无附件</p>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <div class="blodTip">创建时间</div>
+              <div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
+            </el-col>
+            <el-col :span="8">
+              <div class="blodTip">创建人</div>
+              <div class="lightTip">{{ dataForm.creator }}</div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="blodTip">备注</div>
+              <div class="lightTip">{{ dataForm.remark }}</div>
+          </el-row>
+        </div>
+        <!-- <el-divider style="margin-top: -10px" />
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
           {{ '设备维修信息' }}
-          </small-title>
+        </small-title> -->
+        <!-- <el-form ref="form" :model="dataForm" label-width="100px" label-position="top" v-loading="formLoading">
           <el-row :gutter="20">
             <el-col :span="6">
               <el-form-item label="维修开始时间" prop="maintenanceStartTime"
@@ -129,7 +113,6 @@ Blame
             <el-col>
               <el-form-item label="故障明细" prop="faultDetail"
                 :rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
-                <!-- // 富文本 -->
                 <editor v-model="dataForm.faultDetail" :read-only="disabled" :min-height="150" />
               </el-form-item>
             </el-col>
@@ -138,7 +121,6 @@ Blame
           <el-row :gutter="20">
             <el-col>
               <el-form-item label="维修记录" prop="maintenanceDetail">
-                <!-- // 富文本 -->
                 <editor v-model="dataForm.maintenanceDetail" :read-only="disabled" :min-height="150" />
               </el-form-item>
             </el-col>
@@ -159,7 +141,7 @@ Blame
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
+        </el-form> -->
 
         <div v-if="!disabled" class="drawer-body__footer">
           <el-button style="" @click="goback()">取消</el-button>
@@ -174,11 +156,73 @@ Blame
 import SmallTitle from '../../base/alarm/Record/SmallTitle.vue';
 import { getEqRepair, updateEqRepair } from '@/api/equipment/base/repair'
 import Editor from "@/components/Editor";
-import FileUpload from "@/components/FileUpload";
+// import FileUpload from "@/components/FileUpload";
 import { getDictDatas } from "@/utils/dict";
 import { parseTime } from '@/utils/ruoyi'
 import { getDictDataLabel } from '@/utils/dict';
 
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {
+	},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
+
 export default {
   name: 'DialogForm',
   model: {
@@ -186,7 +230,7 @@ export default {
     event: 'update',
   },
   emits: ['update'],
-  components: { SmallTitle, Editor, FileUpload },
+  components: { SmallTitle, Editor, uploadedFile },
   props: {
     // dataForm: {
     // 	type: Object,
@@ -237,18 +281,18 @@ export default {
       this.visible = true;
 
       this.$nextTick(() => {
-        this.$refs['form'].resetFields();
+        // this.$refs['form'].resetFields();
 
         if (this.dataForm.id) {
           // 获取设备维修
           getEqRepair(this.dataForm.id).then(response => {
             this.formLoading = false
             this.dataForm = response.data;
-            this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+            // this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
-            if (this.dataForm.files.length > 0) {
+            // if (this.dataForm.files.length > 0) {
-              this.file = this.dataForm.files[0].fileUrl
+            //   this.file = this.dataForm.files[0].fileUrl
-              this.fileName = this.dataForm.files[0].fileName
+            //   this.fileName = this.dataForm.files[0].fileName
-            }
+            // }
           });
         } else {
           // if (this.urlOptions.isGetCode) {
@@ -337,4 +381,18 @@ export default {
   justify-content: flex-end;
   padding: 18px;
 }
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
 </style>

src/views/equipment/base/repair/Repair--add.vue

@@ -0,0 +1,799 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20">
+			<!-- 维修单号  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修单号"
+					prop="repairOrderNumber"
+					:rules="[
+						{ required: true, message: '维修单号不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.repairOrderNumber"
+						@change="$emit('update', form)"
+						placeholder="请输入维修单号"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 产线名  -->
+			<el-col :span="8">
+				<el-form-item label="产线名" prop="lineId">
+					<el-select
+						v-model="formFilters.lineId"
+						:placeholder="`请选择产线`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="initSections">
+						<el-option
+							v-for="opt in lineOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 工段名  -->
+			<el-col :span="8">
+				<el-form-item label="工段名" prop="sectionId">
+					<el-select
+						v-model="formFilters.sectionId"
+						:placeholder="`请选择工段`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in sectionOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 设备名称  -->
+			<el-col :span="8">
+				<el-form-item
+					label="设备名称"
+					prop="equipmentId"
+					:rules="[
+						{ required: true, message: '设备不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentId"
+						:placeholder="`请选择设备`"
+						:disabled="disabled"
+						filterable
+						clearable
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in equipmentOptions"
+							:key="opt.id"
+							:label="opt.name"
+							:value="opt.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 故障发生时间  -->
+			<el-col :span="8">
+				<el-form-item
+					label="故障发生时间"
+					prop="faultTime"
+					:rules="[
+						{
+							required: true,
+							message: '故障发生时间不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-date-picker
+						v-model="form.faultTime"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择故障发生时间`"
+						value-format="timestamp"
+						format="yyyy-MM-dd HH:mm:ss"
+						clearable
+						@change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 故障级别  -->
+			<el-col :span="8">
+				<el-form-item
+					label="故障级别"
+					prop="faultLevel"
+					:rules="[
+						{
+							required: true,
+							message: '故障级别不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.faultLevel"
+						placeholder="故障级别"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 故障类型 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="故障类型"
+					prop="faultType"
+					:rules="[
+						{
+							required: true,
+							message: '故障类型不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.faultType"
+						placeholder="故障类型"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_TYPE)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修开始时间  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修开始时间"
+					prop="maintenanceStartTime"
+					:rules="[
+						{
+							required: true,
+							message: '维修开始时间不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-date-picker
+						v-model="form.maintenanceStartTime"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择维修开始时间`"
+						value-format="timestamp"
+						format="yyyy-MM-dd HH:mm:ss"
+						clearable
+						@change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修结束时间  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修结束时间"
+					prop="maintenanceFinishTime"
+					:rules="[
+						{
+							required: true,
+							message: '维修结束时间不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-date-picker
+						v-model="form.maintenanceFinishTime"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择维修结束时间`"
+						value-format="timestamp"
+						format="yyyy-MM-dd HH:mm:ss"
+						clearable
+						@change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修工  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修工"
+					prop="repairman"
+					:rules="[
+						{ required: true, message: '维修工不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.repairman"
+						@change="$emit('update', form)"
+						placeholder="请选择维修工"
+						filterable
+						clearable
+						multiple
+						:disabled="disabled">
+						<el-option
+							v-for="opt in workerOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 联系方式  -->
+			<el-col :span="8">
+				<el-form-item
+					label="联系方式"
+					prop="repairmanPhone"
+					:rules="[
+						{ required: false, message: '联系方式不能为空', trigger: 'blur' },
+					]">
+					<el-input
+						v-model="form.repairmanPhone"
+						@change="$emit('update', form)"
+						placeholder="请输入联系方式"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修方式 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修方式"
+					prop="repairMode"
+					:rules="[
+						{
+							required: true,
+							message: '维修方式不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.repairMode"
+						placeholder="维修方式"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_MODE)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修结果 - 数据字典  -->
+			<el-col :span="8">
+				<el-form-item
+					label="维修结果"
+					prop="maintenanceResult"
+					:rules="[
+						{
+							required: true,
+							message: '维修结果不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<el-select
+						v-model="form.maintenanceResult"
+						placeholder="维修结果"
+						:disabled="disabled"
+						@change="$emit('update', form)">
+						<el-option
+							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_RESULT)"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+
+			<!-- 备注  -->
+			<el-col :span="24">
+				<el-form-item label="备注" prop="remark">
+					<el-input
+						v-model="form.remark"
+						@change="$emit('update', form)"
+						placeholder="请输入备注"
+						:disabled="disabled" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 故障明细  -->
+			<el-col :span="24">
+				<el-form-item
+					label="故障明细"
+					prop="faultDetail"
+					:rules="[
+						{
+							required: true,
+							message: '故障明细不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<Editor
+						key="fault-detail"
+						:height="200"
+						v-model="form.faultDetail"
+						@on-change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修描述  -->
+			<el-col :span="24">
+				<el-form-item label="维修描述" prop="maintenanceDetail">
+					<Editor
+						key="maintenance-detail"
+						:height="200"
+						v-model="form.maintenanceDetail"
+						@on-change="$emit('update', form)" />
+				</el-form-item>
+			</el-col>
+
+			<!-- 维修附件  -->
+			<el-col :span="24">
+				<el-form-item label="维修附件" prop="files">
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="uploadOpen = !uploadOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							class="upload-in-dialog"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:disabled="disabled"
+							:before-upload="beforeUpload"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, 'files');
+								}
+							">
+							<el-button size="mini" :disabled="disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
+								上传文件
+							</el-button>
+							<div class="el-upload__tip" slot="tip">
+								只能上传jpg/png文件, 大小不超过2MB
+							</div>
+						</el-upload>
+
+						<uploadedFile
+							class="file"
+							v-for="file in form.files"
+							:file="file"
+							:key="file.fileUrl"
+							:disabled="disabled"
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
+					</div>
+				</el-form-item>
+			</el-col>
+
+			<!-- 设备大类  -->
+			<!-- <el-col :span="8">
+				<el-form-item
+					label="设备大类"
+					prop="equipmentCategory"
+					:rules="[
+						{ required: true, message: '设备大类不能为空', trigger: 'blur' },
+					]">
+					<el-select
+						v-model="form.equipmentCategory"
+						:placeholder="`请选择设备大类`"
+						:disabled="disabled"
+						clearable
+						filterable
+						@change="handleEqTypeChange">
+						<el-option
+							v-for="opt in equipmentTypeOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col> -->
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import Editor from '@/components/Editor';
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { Editor, uploadedFile },
+	props: {
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'top',
+		},
+	},
+	data() {
+		return {
+			isInit: true,
+			// allSpeicalEquipments: [],
+			form: {},
+			formFilters: {
+				lineId: null,
+				sectionId: null,
+			},
+			formLoading: true,
+			dataLoaded: false,
+			equipmentList: [],
+			equipmentOptions: [],
+			workerOptions: [],
+			planOptions: [],
+			sectionOptions: [],
+			lineOptions: [],
+			uploadOpen: false,
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
+		};
+	},
+	watch: {
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				// if (this.form.equipmentCategory != null) {
+				// 	setTimeout(() => {
+				// 		this.equipmentOptions = this.equipmentList
+				// 			.filter((item) => item.special)
+				// 			.filter(
+				// 				(item) => item.specialType === this.form.equipmentCategory
+				// 			)
+				// 			.map((item) => ({ label: item.name, value: item.id }));
+				// 	}, 1000);
+				// }
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		this.initOptions();
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+
+		// getCode
+		async getCode() {
+			const response = await this.$axios('/base/equipment-repair-log/getCode');
+			this.form.repairOrderNumber = response.data || '';
+		},
+
+		// initialize
+		async initOptions() {
+			this.formLoading = true;
+			await this.getCode();
+			await this.initEquipment();
+			await this.initLines();
+			await this.initWorker();
+			await this.initSections();
+			this.formLoading = false;
+			this.isInit = false;
+			this.setInitWorker();
+		},
+
+		/** 设置默认维修工为用户自己 */
+		setInitWorker() {
+			/** 获取用户自身id */
+			const userId = this.$store.getters.userId;
+			this.$nextTick(() => {
+				this.form.repairman = [userId];
+			});
+		},
+
+		/** 获取产线 */
+		async initLines() {
+			const res = await this.$axios('/base/core-production-line/listAll');
+			this.lineOptions = (res.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+		},
+
+		/** 获取工段 */
+		async initSections(byLineId) {
+			this.formLoading = !this.isInit && true;
+			const res = await this.$axios({
+				url:
+					byLineId && !this.isInit
+						? '/base/core-workshop-section/listByParentId?id=' + byLineId
+						: '/base/core-workshop-section/listAll',
+			});
+			this.sectionOptions = (res.data || []).map((item) => ({
+				label: item.name,
+				value: item.id,
+			}));
+			this.formLoading = !this.isInit && false;
+		},
+		/** 获取设备 */
+		async initEquipment() {
+			const response = await this.$axios('/base/core-equipment/listAll');
+			this.equipmentList = response.data || [];
+			this.equipmentOptions = response.data || [];
+			// this.allSpeicalEquipments = equipmentOptions;
+		},
+		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
+		async initWorker() {
+			let list = [];
+			/** user */
+			const userList = await this.$axios({
+				url: '/system/user/page',
+				params: {
+					pageNo: 1,
+					pageSize: 100,
+				},
+			});
+			list = list.concat(
+				(userList.data?.list || []).map((item) => ({
+					label: item.username,
+					value: item.id,
+				}))
+			);
+			/** worker */
+			const workerList = await this.$axios({
+				url: '/base/core-worker/listAll',
+			});
+			list = list.concat(
+				(workerList.data || []).map((item) => ({
+					label: item.name,
+					value: item.id,
+				}))
+			);
+			/** setting */
+			this.workerOptions = list;
+		},
+
+		beforeUpload(file) {
+			const checkFileSize = () => {
+				const isLt2M = file.size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					this.$modal.msgError('上传文件大小不能超过 2MB!');
+				}
+				return isLt2M;
+			};
+			const checkFileType = () => {
+				const isJPG =
+					file.type === 'image/jpeg' ||
+					file.type === 'image/png' ||
+					file.type === 'image/jpg';
+				return isJPG;
+			};
+			return checkFileSize() && checkFileType();
+		},
+
+		// handlers
+		handleEqTypeChange(type) {
+			this.form.equipmentId = null;
+			console.log('111', type)
+			this.equipmentOptions = this.equipmentList
+			// if (type) {
+			// 	this.equipmentOptions = this.equipmentList
+			// 		.filter((item) => item.special)
+			// 		.filter((item) => item.specialType === type)
+			// 		.map((item) => ({ label: item.name, value: item.id }));
+			// } else
+			// 	this.equipmentOptions = this.equipmentList.map((item) => ({
+			// 		label: item.name,
+			// 		value: item.id,
+			// 	}));
+			// this.$emit('update', this.form)
+		},
+
+		handleEqChange() {
+			this.$emit('update', this.form);
+		},
+
+		// 修改 是否计划保养 时
+		handlePlanChange(val) {
+			console.log('handlePlanChange', val);
+			// this.form.equipmentCategory = null;
+			this.form.equipmentId = null;
+			this.$emit('update', { ...this.form, relatePlan: val });
+			this.initEquipment(val == 1 ? 'special-equipment' : null);
+		},
+
+		handleEditorInput(html) {
+			this.$emit('update', {
+				...this.form,
+				maintenanceDes: html,
+			});
+		},
+
+		// upload
+		handleFilesOpen() {},
+
+		handleUploadSuccess(response, file, prop) {
+			console.log('response', response);
+			if (response.code != 0) {
+				this.$modal.msgError('上传失败: ', response.msg || '-');
+				return;
+			}
+			this.form.files.push({
+				fileName: file.name,
+				fileUrl: response.data,
+				fileType: prop == 'files' ? 2 : 1,
+			});
+			this.$modal.msgSuccess('上传成功');
+			this.$emit('update', this.form);
+		},
+
+		handleDeleteFile(file, prop) {
+			this.form.files = this.form.files.filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+
+.upload-area {
+	position: relative;
+	overflow: hidden;
+	transition: height 0.3s ease-out;
+}
+
+.upload-in-dialog {
+	margin-right: 24px;
+	position: relative;
+	float: left;
+}
+
+.close-icon {
+	position: absolute;
+	top: 0;
+	right: 12px;
+	z-index: 100;
+	transition: transform 0.3s ease-out;
+}
+
+.close-icon.open {
+	transform: rotateZ(90deg);
+}
+
+.dialog__upload_component__close {
+	color: #ccc;
+}
+.dialog__upload_component__close:hover {
+	/* color: #777; */
+	color: red;
+}
+
+.height-48 {
+	height: 35px !important;
+}
+
+:deep(.record-add__editor) {
+	.ql-picker-label {
+		display: flex;
+	}
+}
+</style>

src/views/equipment/base/repair/index.vue

@@ -41,9 +41,7 @@
 				v-if="open"
 				ref="form"
 				v-model="form"
-				:disabled="mode == 'detail'"
+				:disabled="mode == 'detail'" />
-				:has-files="true"
-				:rows="rows" />
 		</base-dialog>
 		<CustomDialogForm
 			v-if="addOrUpdateVisible"
@@ -59,16 +57,17 @@ import CustomDialogForm from './CustomDialogForm.vue';
 import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
 import { parseTime } from '@/utils/ruoyi'
 import htmls from './htmls.vue'
+import DialogForm from './Repair--add.vue';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
-	components: { CustomDialogForm },
+	components: { CustomDialogForm, DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['maintenanceStatus', 'createTime', 'equipmentId'],
+			searchBarKeys: ['maintenanceResult', 'createTime', 'equipmentId'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:repair:update')
 					? {
@@ -76,18 +75,18 @@ export default {
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:repair:finish')
+				// this.$auth.hasPermi('equipment:repair:finish')
-					? {
+				// 	? {
-							type: 'finish',
+				// 			type: 'finish',
-							btnName: '完成',
+				// 			btnName: '完成',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:repair:update')
+				// this.$auth.hasPermi('equipment:repair:update')
-					? {
+				// 	? {
-							type: 'edit',
+				// 			type: 'edit',
-							btnName: '修改',
+				// 			btnName: '修改',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:repair:delete')
 					? {
 							type: 'delete',
@@ -96,33 +95,40 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
+				// {
+				// 	prop: 'createTime',
+				// 	label: '添加时间',
+				// 	fixed: true,
+				// 	width: 180,
+				// 	filter: parseTime,
+				// },
+				{ prop: 'repairOrderNumber', label: '维修单号' },
+				{ prop: 'lineName', label: '产线名' },
+				{ prop: 'sectionName', label: '工段名' },
+				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls },
+				// { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
 				{
-					prop: 'createTime',
+					prop: 'maintenanceStartTime',
-					label: '添加时间',
+					label: '维修开始时间',
-					fixed: true,
-					width: 180,
 					filter: parseTime,
 				},
-				{ prop: 'repairOrderNumber', label: '设备维修单号' },
-				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
 				{
 					prop: 'maintenanceFinishTime',
-					label: '结束时间',
+					label: '维修结束时间',
 					filter: parseTime,
 				},
+				// { prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
 				{
-					prop: 'maintenanceStatus',
+					prop: 'maintenanceResult',
-					label: '维修状态',
+					label: '维修结果',
-					filter: (v) => (v != null ? ['未完成', '完成', '进行中'][v] : ''),
+					filter: (v) => (v != null ? ['成功', '失败'][v] : ''),
 				},
-				{ prop: 'maintenanceDuration', label: '维修时长(h)' },
+				// { prop: 'maintenanceDuration', label: '维修时长(h)' },
-				{ prop: 'lineName', label: '产线' },
+				{ prop: 'maintenanceDetail', label: '维修描述', subcomponent: htmls }, // 没有参数
-				{ prop: 'sectionName', label: '工段' },
+				// { prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
+				// { prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true }
-				{ prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true },
 			],
 			searchBarFormConfig: [
 				{
@@ -134,13 +140,12 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '状态',
+					label: '维修结果',
 					placeholder: '请选择状态',
-					param: 'maintenanceStatus',
+					param: 'maintenanceResult',
 					selectOptions: [
-						{ name: '未完成', id: '0' },
+						{ name: '成功', id: '0' },
-						{ name: '完成', id: '1' },
+						{ name: '失败', id: '1' }
-						{ name: '进行中', id: '2' },
 					],
 				},
 				// 时间段
@@ -181,71 +186,6 @@ export default {
 					color: 'success',
 				},
 			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '维修单号',
-						prop: 'repairOrderNumber',
-						rules: [{ required: true, message: '维修单号不能为空', trigger: 'blur' }],
-					},
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						// url: '/base/core-equipment/listAll',
-						url: '/base/core-equipment/page?special=false&pageNo=1&pageSize=99',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-					},
-				],
-				[
-					{
-						// TODO: 和班组联动
-						// select: true,
-						input: true,
-						label: '维修工',
-						prop: 'repairman',
-						// url: '/base/core-worker/listAll',
-						// valueKey: 'name',
-						bind: {
-							filterable: true,
-							clearable: true,
-							// multiple: true,
-						},
-						// options: [{ label: 'test', value: 'test' }],
-						rules: [{ required: true, message: '维修工不能为空', trigger: 'blur' }],
-					},
-					{
-						input: true,
-						label: '联系方式',
-						prop: 'repairmanPhone',
-					},
-				],
-				[
-					{
-						datetime: true,
-						label: '故障发生时间',
-						prop: 'faultTime',
-						rules: [{ required: true, message: '故障发生时间不能为空', trigger: 'blur' }],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
-					{
-						select: true,
-						label: '故障级别',
-						prop: 'faultLevel', // 数据字典
-						options: this.getDictDatas(this.DICT_TYPE.FAULT_LEVEL),
-					},
-				],
-			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -253,9 +193,10 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				special: false,
-				maintenanceStatus: null,
+				maintenanceResult: null,
 				createTime: null,
 				equipmentId: null,
+				special: false
 			},
 			// 表单参数
 			form: {},
@@ -381,7 +322,10 @@ export default {
 				// }
 				// 修改的提交
 				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
+					this.put({
+						...this.form,
+						repairman: this.form.repairman.join(',')
+					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -389,7 +333,10 @@ export default {
 					return;
 				}
 				// 添加的提交
-				this.post(this.form).then((response) => {
+				this.post({
+					...this.form,
+					repairman: this.form.repairman.join(',')
+				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();

src/views/order/base/orderGroup/components/bindOrder.vue

@@ -0,0 +1,156 @@
+<template>
+  <el-form ref="bindOrder" :rules="rules" label-width="130px" :model="form">
+    <el-row :gutter="20">
+      <el-col :span='12'>
+        <el-form-item label="厂务订单名称" prop="orderId">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable @change="getOrderMsg">
+            <el-option
+              v-for="item in orderList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="订单编码" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" style="width: 100%;" disabled></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="优先级" prop="priority">
+          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" disabled>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品名称" prop="productName">
+          <el-input v-model="form.productName" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="订单计划开始时间" prop="planStartTime">
+          <el-date-picker
+            v-model="form.planStartTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            disabled
+            placeholder="选择日期">
+          </el-date-picker> 
+        </el-form-item>
+      </el-col>
+      <el-col :span='12'>
+        <el-form-item label="订单计划完成时间" prop="planFinishTime">
+          <el-date-picker
+            v-model="form.planFinishTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            disabled
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { orderDetail, getFreeOrderList } from '@/api/base/orderManage'
+import { orderConGroupOrder } from '@/api/base/orderGroup'
+import { getProductAll } from '@/api/base/product'
+export default {
+  name: 'bindOrder',
+  data() {
+    return {
+      form: {
+        groupOrderId: '',
+        orderId: '',
+        code: '',
+        planQuantity: '',
+        priority: '',
+        productName: '',
+        specifications: '',
+        remark: '',
+        planStartTime: '',
+        planFinishTime: ''
+      },
+      rules: {
+        orderId: [{ required: true, message: "厂务订单名称不能为空", trigger: "change" }]
+      },
+      orderList: []
+    }
+  },
+  methods: {
+    init(data) {
+      this.form.groupOrderId = data.id
+      this.getList()
+    },
+    getList() {
+      // 厂务订单list
+      getFreeOrderList().then(res => {
+        this.orderList = res.data || []
+      })
+    },
+    bindOrderSubmit() {
+      this.$refs['bindOrder'].validate((valid) => {
+        if (valid) {
+            //集团订单绑定厂务订单
+            orderConGroupOrder({
+              groupOrderId: this.form.groupOrderId,
+              orderId: this.form.orderId
+             }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功")
+                this.$emit('bindOrderSubmit')
+              }
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.bindOrder.resetFields()
+      this.form.planQuantity = 0
+    },
+    // 选择订单时获取订单信息
+    getOrderMsg(val) {
+      orderDetail({
+        id: val
+      }).then(res => {
+        this.form.code = res.data.code
+        this.form.planQuantity = res.data.planQuantity
+        this.form.productName = res.data.productName
+        this.form.specifications = res.data.specifications
+        this.form.priority = res.data.priority ? res.data.priority + '' : ''
+        this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
+        this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
+        this.form.remark = res.data.remark
+      })
+    }
+  }
+}
+</script>

src/views/order/base/orderGroup/components/orderGroupAdd.vue

@@ -0,0 +1,197 @@
+<template>
+  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="订单名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="订单编码" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品名称" prop="planProductId">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable @change="getSpecifications">
+            <el-option
+              v-for="item in productList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='6'>
+        <el-form-item label="客户" prop="customerId">
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
+            <el-option
+              v-for="item in customerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="计划加工数量" prop="planQuantity">
+          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    <el-col :span='6'>
+        <el-form-item label="交货时间" prop="deliveTime">
+          <el-date-picker
+            v-model="form.deliveTime"
+            type="datetime"
+            style="width: 100%;"
+            value-format="timestamp"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="包装要求" prop="packReq">
+          <el-select v-model="form.packReq" placeholder="请选择" style="width: 100%;" clearable>
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='24'>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { getOrderCode } from '@/api/base/orderManage'
+import { getOrderGroup, updateOrderGroup, createOrderGroup } from '@/api/base/orderGroup'
+import { getProductAll } from '@/api/base/product'
+import { getCustomerList } from '@/api/base/customer'
+export default {
+  name: 'OrderGroupAdd',
+  data() {
+    return {
+      form: {
+        id: '',
+        name: '',
+        code: '',
+        planProductId: '',
+        specifications: '',
+        customerId: '',
+        planQuantity: '',
+        deliveTime: '',
+        packReq:'',
+        remark: ''
+      },
+      rules: {
+        name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "订单编码不能为空", trigger: "blur" }],
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+        planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
+        deliveTime: [{ required: true, message: "交货时间不能为空", trigger: "change" }]
+      },
+      productList: [],
+      customerList: [],
+      isEdit: false //是否是编辑
+    }
+  },
+  methods: {
+    init(id) {
+      this.getList()
+      if (id) {
+        this.isEdit = true
+        this.form.id = id
+        getOrderGroup({id: this.form.id}).then(res => {
+          if (res.code === 0) {
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.planProductId = res.data.planProductId
+            this.form.customerId = res.data.customerId
+            this.form.planQuantity = res.data.planQuantity
+            this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null
+            this.form.packReq = res.data.packReq ? res.data.packReq+'' : ''
+            this.form.remark = res.data.remark
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
+          }
+        })
+      } else {
+        this.isEdit = false
+        this.form.id = ''
+        // 订单号
+        getOrderCode().then(res => {
+          this.form.code = res.data || ''
+        })
+      }
+    },
+    getList() {
+      // 产品
+      getProductAll().then(res => {
+        this.productList = res.data || []
+      })
+      // 客户
+      getCustomerList().then(res => {
+        this.customerList = res.data || []
+      })
+    },
+    // 获取产品规格
+    getSpecifications(val) {
+      for (let i of this.productList) {
+        if (i.id === val) {
+          this.form.specifications =  i.specifications
+          return
+        }
+      }
+      this.form.specifications = ''
+    },
+    submitForm() {
+      this.$refs['orderAddForm'].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            //编辑
+            updateOrderGroup({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          } else {
+            createOrderGroup({ ...this.form }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit('successSubmit')
+              }
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    formClear() {
+      this.$refs.orderAddForm.resetFields()
+      this.form.planQuantity = 0
+      this.isEdit = false
+    }
+  }
+}
+</script>

src/views/order/base/orderGroup/index.vue

@@ -0,0 +1,445 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <search-bar
+      :formConfigs="formConfig"
+      ref="searchBarForm"
+      @headBtnClick="buttonClick"
+    />
+    <!-- 列表 -->
+    <base-table
+      :page="queryParams.pageNo"
+      :limit="queryParams.pageSize"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="240"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <pagination
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增&编辑 -->
+    <base-dialog
+      :dialogTitle="addOrEditTitle"
+      :dialogVisible="centervisible"
+      @cancel="handleCancel"
+      @confirm="handleConfirm"
+      :before-close="handleCancel"
+      width='60%'
+    >
+      <order-group-add ref="orderGroupAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+    <!-- 查看详情 -->
+    <!-- 新增工单 -->
+    <base-dialog
+      dialogTitle="绑定厂务订单"
+      :dialogVisible="bindOrderVisible"
+      @cancel="bindOrderCancel"
+      @confirm="bindOrderConfirm"
+      :before-close="bindOrderCancel"
+      width='60%'
+    >
+      <bind-order ref="bindOrder" @bindOrderSubmit="bindOrderSubmit" />
+    </base-dialog>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup'
+import { customerList } from '@/api/base/orderManage'
+import OrderGroupAdd from './components/orderGroupAdd'
+import BindOrder from './components/bindOrder'
+import { publicFormatter } from '@/utils/dict'
+const tableProps = [
+  {
+    prop: 'createTime',
+    label: '添加时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '订单名称',
+    minWidth: 140,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '订单编码',
+    minWidth: 150
+  },
+  {
+    prop: 'customerId',
+    label: '客户',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    filter: publicFormatter('order_status')
+  },
+  {
+    prop: 'productName',
+    label: '产品名称',
+    minWidth: 200,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'specifications',
+    label: '产品规格',
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'unit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
+  },
+  {
+    prop: 'planQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualquantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'deliveTime',
+    label: '交货时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'packReq',
+    label: '包装要求',
+    filter: publicFormatter('pack_spec'),
+    minWidth: 120,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'orderIdNum',
+    label: '订单数量'
+  }  
+]
+export default {
+  name: 'OrderGroup',
+  data() {
+    return {
+      formConfig: [
+        {
+          type: 'input',
+          label: '订单名称',
+          placeholder: '订单名称',
+          param: 'name'
+        },
+        {
+          type: 'select',
+          label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
+          valueField: 'value',
+          param: 'status'
+        },
+        {
+          type: 'datePicker',
+          label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary'
+        },
+        {
+          type: this.$auth.hasPermi('base:order-group:create') ? 'separate' : '',
+        },
+        {
+          type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
+          btnName: '新增',
+          name: 'add',
+          color: 'success',
+          plain: true
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20,
+        name: null,
+        status: null,
+        planFinishTime: []
+      },
+      total: 0,
+      tableProps,
+      list: [],
+      tableH: this.tableHeight(260),
+      tableBtn: [
+      this.$auth.hasPermi('base:order-group:bind')
+          ? {
+              type: 'bind',
+              btnName: '绑定',
+              showTip: '厂务订单',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-group:complete')
+          ? {
+              type: 'complete',
+              btnName: '完成',
+              showTip: '完成订单',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+          this.$auth.hasPermi('base:order-group:termination')
+          ? {
+              type: 'termination',
+              btnName: '终止',
+              showTip: '终止',
+              showParam: {
+                type: '|',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 2
+                  },
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+          this.$auth.hasPermi('base:order-group:cancel')
+          ? {
+              type: 'cancel',
+              btnName: '作废',
+              showTip: '作废',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 2
+                  }
+                ]
+              }
+            }
+          : undefined,
+          {
+            type: 'detail',
+            btnName: '详情'
+          },
+        this.$auth.hasPermi('base:order-group:edit')
+          ? {
+              type: 'edit',
+              btnName: '编辑',
+              showParam: {
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined
+      ].filter((v) => v),
+      addOrEditTitle: '',
+      centervisible: false,
+      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
+      workIssueTitle: '',
+      bindOrderVisible: false,
+      orderDetailVisible: false
+    }
+  },
+  components: { OrderGroupAdd, BindOrder },
+  created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      getOrderGroupPage({...this.queryParams}).then(res => {
+        let arr = res.data.records || []
+        this.total = res.data.total || 0
+        if (arr.length > 0) {
+          customerList().then(result => {
+            let tempData = result.data || []
+            if (tempData.length > 0) {
+              arr.map(item => {
+                for (let i of tempData) {
+                  if (item.customerId === i.id) {
+                    item.customerId = i.name
+                  }
+                }
+              })
+              this.list = arr
+            }
+          })
+        }else {
+          this.list = arr
+        }
+      })
+    },
+    buttonClick(val) {
+      console.log(val)
+      if (val.btnName === 'search') {
+        this.queryParams.name = val.name
+        this.queryParams.status = val.status
+        if (val.timeVal && val.timeVal.length > 0) {
+          this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00'
+          this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.queryParams.planFinishTime = []
+        }
+        this.getList()
+      } else {
+        this.addOrEditTitle = '新增'
+        this.centervisible = true
+        this.$nextTick(() => {
+          this.$refs.orderGroupAdd.init()
+        })
+      }
+    },
+    handleClick(val) {
+      console.log(val)
+      switch (val.type) {
+        case 'edit':
+          this.addOrEditTitle = '编辑'
+          this.centervisible = true
+          this.$nextTick(() => {
+            this.$refs.orderGroupAdd.init(val.data.id)
+          })
+          break
+        case 'cancel':
+          this.handleEditStatus(val.data, '作废', '6')
+          break
+        case 'detail':
+          this.$router.push({path: '/order/base/order-group/order-group-detail-data?orderGroupId='+ val.data.id})
+          break
+        case 'termination':
+          this.handleEditStatus(val.data, '终止', '5')
+          break
+        case 'bind':
+          this.workIssueTitle = '绑定工单'
+          this.bindOrderVisible = true
+          this.$nextTick(() => {
+            this.$refs.bindOrder.init(val.data)
+          })
+          break
+        case 'complete':
+          this.handleEditStatus(val.data, '完成', '4')
+          break
+        default:
+      }
+    },
+    // 完成,终止，作废
+    handleEditStatus(val, tip, status) {
+      console.log(val)
+      if (val.orderIdNum > 0) {// 有下级订单
+        this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
+          type: 'warning',
+          distinguishCancelAndClose: true,
+          confirmButtonText: '同步',
+          cancelButtonText: '不同步'
+        }).then(function() {
+          console.log('同步')
+          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
+            this.getList();
+            this.$modal.msgSuccess("操作成功");
+          })
+        }).catch(action => {
+          if (action === 'cancel') {
+            console.log('不同步')
+            groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("操作成功");
+            })
+          }else {
+            return console.log('关闭')
+          }
+        })
+      }else{// 无下级订单
+        this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
+          return groupOrderStatusSet({ id: val.id, status: status})
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("操作成功");
+        }).catch(() => {});
+      }
+    },
+    handleCancel() {
+      this.$refs.orderGroupAdd.formClear()
+      this.centervisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.orderGroupAdd.submitForm()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getList()
+    },
+    // 下发新增
+    bindOrderCancel() {
+      this.$refs.bindOrder.formClear()
+      this.bindOrderVisible = false
+    },
+    bindOrderConfirm() {
+      this.$refs.bindOrder.bindOrderSubmit()
+    },
+    bindOrderSubmit() {
+      this.bindOrderCancel()
+      this.getList()
+    }
+  }
+}
+</script>

src/views/order/base/orderGroup/orderGroupDetailData.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="orderGroupDetailData">
+    <div class="box1">
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>集团编码: {{orderGroupMsg.code}}</span>
+      </div>
+      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+      <div style="padding-left: 14px;">
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">订单名称</div>
+            <div class="lightTip" :title='orderGroupMsg.name'>{{orderGroupMsg.name}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品名称</div>
+            <div class="lightTip" :title="orderGroupMsg.productName">{{orderGroupMsg.productName}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品规格</div>
+            <div class="lightTip">{{orderGroupMsg.specifications}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">客户</div>
+            <div class="lightTip">{{orderGroupMsg.customerName}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">包装要求</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq)}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">交货时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.deliveTime)}}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">创建时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.createTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划加工数量</div>
+            <div class="lightTip">{{orderGroupMsg.planQuantity}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">加工平方数(平方米)</div>
+            <div class="lightTip">{{orderGroupMsg.planArea}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">状态</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际开始时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.startProduceTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际完成时间</div>
+            <div class="lightTip">{{ parseTime(orderGroupMsg.finishProduceTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">实际生产数量</div>
+            <div class="lightTip">{{orderGroupMsg.actualquantity }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">完成比%</div>
+            <div class="lightTip">{{orderGroupMsg.completeRate}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">废片数量</div>
+            <div class="lightTip">{{orderGroupMsg.nokQuantity}}</div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <div class="box2" v-for="(item, index) in orderMsg" :key='index'>
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>厂务订单编码: {{item.code}}</span>
+      </div>
+      <div style="padding-left: 14px;">
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">订单名称</div>
+            <div class="lightTip" :title="item.name">{{item.name}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品名称</div>
+            <div class="lightTip" :title="item.productName">{{item.productName}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">产品规格</div>
+            <div class="lightTip">{{item.specifications}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">创建时间</div>
+            <div class="lightTip">{{ parseTime(item.createTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划开始时间</div>
+            <div class="lightTip">{{ parseTime(item.planStartTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">计划完成时间</div>
+            <div class="lightTip">{{ parseTime(item.planFinishTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">计划加工数量</div>
+            <div class="lightTip">{{item.planQuantity}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">加工平方数(平方米)</div>
+            <div class="lightTip">{{item.planArea}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">预计用时(时)</div>
+            <div class="lightTip">{{item.expectTime}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">状态</div>
+            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status)}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际开始时间</div>
+            <div class="lightTip">{{ parseTime(item.startProduceTime) }}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">实际完成时间</div>
+            <div class="lightTip">{{ parseTime(item.finishProduceTime) }}</div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
+            <div class="blodTip">实际生产数量</div>
+            <div class="lightTip">{{item.actualQuantity	}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">完成比%</div>
+            <div class="lightTip">{{item.completeProp}}</div>
+          </el-col>
+          <el-col :span='4'>
+            <div class="blodTip">废片数量</div>
+            <div class="lightTip">{{item.nokQuantity}}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 列表 -->
+      <div class="boxTitle">
+        <span class="blueTitle"></span>
+        <span>工单信息</span>
+      </div>
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="item.coreWorkOrderRespVOS || []"
+        :max-height="tableH"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { parseTime } from '@/utils/ruoyi'
+import { publicFormatter } from '@/utils/dict'
+import { orderGroupDetail } from '@/api/base/orderGroup'
+const tableProps = [
+  {
+    prop: 'issueTime',
+    label: '下发时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'name',
+    label: '工单名',
+    minWidth: 150,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'code',
+    label: '工单编码',
+    minWidth: 150
+  },
+  {
+    prop: 'roomNameDict',
+    label: '负责车间',
+    minWidth: 120,
+    filter: publicFormatter('workshop')
+  },
+  {
+    prop: 'planQuantity',
+    label: '计划加工量',
+    width: 100
+  },
+  {
+    prop: 'actualQuantity',
+    label: '实际加工量',
+    width: 100
+  },
+  {
+    prop: 'actualArea',
+    label: '加工平方数',
+    width: 100
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    filter: publicFormatter('work_order_status')
+  },
+  {
+    prop: 'startProduceTime',
+    label: '开始时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'finishProduceTime',
+    label: '结束时间',
+    filter: parseTime,
+    minWidth: 160
+  },
+  {
+    prop: 'productLineNames',
+    label: '关联产线',
+    filter: (val) => val ? val.join(',') : '',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'workers',
+    label: '负责人',
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    showOverflowtooltip: true
+  }
+]
+export default {
+  name: 'orderGroupDetailData',
+  data() {
+    return {
+      orderGroupId: '',
+      tableProps,
+      orderMsg: [],
+      tableH: 150,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 500
+      },
+      orderGroupMsg: {}
+    }
+  },
+  mounted() {
+    this.orderGroupId = location.href.split('?')[1].split('=')[1]
+    this.getMsg()
+  },
+  methods: {
+    getMsg() {
+      orderGroupDetail({
+        id: this.orderGroupId
+      }).then(res => {
+        this.orderGroupMsg = res.data
+        if ( res.data.orderIdNum && res.data.orderIdNum > 0) {
+          this.orderMsg = res.data.orderDetailVOS
+        }else{
+          this.orderMsg = []
+        }
+      })
+    },
+    // 返回
+    returnOrderManage() {
+      this.$router.push({path: '/order/base/order-group'})
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.orderGroupDetailData {
+  height: calc(100vh - 120px - 8px);
+  background-color: rgb(242, 244, 249);
+  overflow: auto;
+  .box1, .box2 {
+    background-color: #fff;
+    border-radius: 9px;
+    .blodTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 600;
+      color: rgba(0,0,0,0.85);
+      margin-bottom: 8px;
+    }
+    .lightTip {
+      height: 16px;
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(102,102,102,0.75);
+      margin-bottom: 12px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+  .box2 {
+    height: 415px;
+    padding: 12px 16px 0;
+    margin: 8px 0;
+  }
+  .box1 {
+    height: 215px;
+    padding: 16px 16px 0 16px;
+  }
+  .boxTitle {
+    display: inline-block;
+    font-size: 16px;
+    font-weight: 400;
+    color: #000000;
+    margin:0 10px 20px 0;
+  }
+  .blueTitle {
+    content: '';
+    display: inline-block;
+    width: 4px;
+    height: 18px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: bottom;
+  }
+}
+</style>

src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -27,14 +27,19 @@
             <el-option
               v-for="item in productList"
               :key="item.id"
-              :label="item.name+' | '+item.specifications"
+              :label="item.name"
               :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span='6'>
+        <el-form-item label="产品规格" prop="specifications">
+          <el-input v-model="form.specifications" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="计划开始时间">
           <el-date-picker
@@ -47,8 +52,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="计划完成时间">
           <el-date-picker
@@ -71,9 +74,11 @@
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
+          <el-select v-model="form.processFlowId" placeholder="请选择" :disabled="isBind" style="width: 100%;">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
@@ -83,11 +88,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" :disabled="isBind" @change='selectMethod'>
             <el-option label="产品基础BOM" :value="1"></el-option>
             <el-option label="工艺扩展BOM" :value="2"></el-option>
           </el-select>
@@ -117,6 +120,8 @@
           </el-select>
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span='6'>
       <el-form-item label="关联产线" prop="productLineId">
         <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
@@ -129,8 +134,18 @@
         </el-select>
       </el-form-item>
     </el-col>
-    </el-row>
+  <el-col :span='6'>
-    <el-row :gutter="20">
+      <el-form-item label="负责车间" prop="roomNameDict">
+        <el-select v-model="form.roomNameDict" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+          <el-option
+            v-for="item in getDictDatas(DICT_TYPE.WORK_SHOP)"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-col>
     <el-col :span='6'>
       <el-form-item label="负责人" prop="workers">
         <el-input v-model="form.workers" :disabled="isBind"></el-input>
@@ -159,6 +174,7 @@ export default {
         name: '',
         code: '',
         planProductId: '',
+        specifications: '',
         planStartTime: '',
         planFinishTime: '',
         planAssignQuantity: 0,
@@ -167,6 +183,7 @@ export default {
         materialMethod: 1,
         priority: '',
         productLineId: [],
+        roomNameDict: '',
         type: '',
         workers: '',
         planAssignmentQuantity: ''
@@ -176,15 +193,17 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
+        materialMethod: [{ required: true, message: "物料计算方式不能为空", trigger: "change" }],
         productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+        roomNameDict: [{ required: true, message: "负责车间不能为空", trigger: "change" }],
         planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
       },
       productList: [],
       processFlowList: [],
       productLineList: [],
       workOrderTypeList: [
-        {id: 1,name:'标准工单'},
+        {id: 1,name:'普通'},
-        {id: 2, name:'特殊工单'}
+        {id: 2, name:'特殊'}
       ],
       planStartTime: '',
       planFinishTime: '',
@@ -202,8 +221,8 @@ export default {
           this.form.code = res.data || ''
         })
         this.form.planProductId = data.planProductId
-        this.form.processFlowId = data.processFlowId
+        // this.form.processFlowId = data.processFlowId
-        this.form.materialMethod = data.materialMethod
+        // this.form.materialMethod = data.materialMethod
       }else{//绑定
         this.isBind = true
       }
@@ -212,6 +231,9 @@ export default {
       // 产品
       getProductAll().then(res => {
         this.productList = res.data || []
+        if (this.form.planProductId) {
+          this.getSpecifications(this.form.planProductId)
+        }
       })
       // 产线
       getLineAll().then(res => {
@@ -228,11 +250,25 @@ export default {
         this.workOrderList = res.data || []
       })
     },
+    // 物料变动
+    selectMethod(val) {
+      if (val === 2 && !this.form.processFlowId ) {
+        this.form.materialMethod = 1
+        this.$modal.msgError("请先选择关联工艺");
+      }else if (val === 1) {
+        this.form.processFlowId = ''
+      }
+    },
     addWorkOrderSubmit() {
-      this.$refs['addWorkOrder'].validate((valid) => {
+      if (this.isBind) {//绑定工单
-        if (valid) {
+        if (!this.form.workOrderId) {
-          if (this.isBind) {
+          this.$modal.msgError("工单名称不能为空");
-            //绑定工单
+          return false
+        }
+        if (!this.form.planAssignmentQuantity) {
+          this.$modal.msgError("计划分配订单量不能为空");
+          return false
+        }
         orderIssue({
           workOrderId: this.form.workOrderId,
           orderId: this.form.orderId,
@@ -243,7 +279,9 @@ export default {
             this.$emit('addWorkOrderSubmit')
           }
         })
-          } else {
+      }else{// 新增工单
+        this.$refs['addWorkOrder'].validate((valid) => {
+          if (valid) {
               // 新增工单
               let _this = this
               _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
@@ -253,19 +291,19 @@ export default {
                   _this.$modal.msgSuccess("操作成功")
                   let name = this.form.name
                   _this.$emit('addWorkOrderSubmit')
-                // 询问是否添加预使用主原料
+                  // // 询问是否添加预使用主原料
-                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+                  // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                    _this.$router.push({
+                  //     _this.$router.push({
-                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
+                  //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                    })
+                  //     })
-                  })
+                  //   })
                 }
               })
-          }
           } else {
             return false
           }
         })
+      }
     },
     formClear() {
       this.$refs.addWorkOrder.resetFields()
@@ -295,9 +333,23 @@ export default {
             this.form.productLineId = res.data.productLineIds
             this.form.type = res.data.type
             this.form.workers = res.data.workers
+            this.form.roomNameDict = (res.data.roomNameDict || res.data.roomNameDict === 0) ? res.data.roomNameDict + '' : ''
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
           }
         })
       }
+    },
+    // 获取产品规格
+    getSpecifications(val) {
+      for (let i of this.productList) {
+        if (i.id === val) {
+          this.form.specifications =  i.specifications
+          return
+        }
+      }
+      this.form.specifications = ''
     }
   }
 }

src/views/order/base/orderManage/components/orderAdd.vue

@@ -7,7 +7,7 @@
         </el-form-item>
       </el-col>
       <el-col :span='6'>
-        <el-form-item label="订单号" prop="code">
+        <el-form-item label="订单编码" prop="code">
           <el-input v-model="form.code"></el-input>
         </el-form-item>
       </el-col>
@@ -16,39 +16,6 @@
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
-            <el-option
-              v-for="item in productList"
-              :key="item.id"
-              :label="item.name+' | '+(item.specifications || '')"
-              :value="item.id">
-              <span style="float: left">{{ item.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="单价" prop="price">
-          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
-            <el-option
-              v-for="item in customerList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span='6'>
         <el-form-item label="优先级" prop="priority">
           <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
@@ -61,30 +28,13 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="包装规格" prop="packSpec">
-          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
+        <el-form-item label="产品名称" prop="planProductId">
-          <el-input v-model="form.workers"></el-input>
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable @change="getSpecifications">
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
             <el-option
-              v-for="item in processFlowList"
+              v-for="item in productList"
               :key="item.id"
               :label="item.name"
               :value="item.id">
@@ -93,11 +43,8 @@
         </el-form-item>
       </el-col>
       <el-col :span='6'>
-        <el-form-item label="物料计算方式" prop="materialMethod">
+        <el-form-item label="产品规格" prop="specifications">
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" @change='materialMethodChange'>
+          <el-input v-model="form.specifications" disabled></el-input>
-            <el-option label="产品基础BOM" :value="1"></el-option>
-            <el-option label="工艺扩展BOM" :value="2"></el-option>
-          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -112,8 +59,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单计划完成时间" prop="planFinishTime">
           <el-date-picker
@@ -126,25 +71,19 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='24'>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
-    <!-- <el-row>
-      <el-col :span='24'>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row> -->
   </el-form>
 </template>
 <script>
-import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
+import { getOrderCode, getOrderById, orderUpdate, orderCreate } from '@/api/base/orderManage'
 import { getProductAll } from '@/api/base/product'
-import { getCustomerList } from '@/api/base/customer'
 export default {
   name: 'OrderAdd',
   data() {
@@ -155,15 +94,9 @@ export default {
         code: '',
         planQuantity: '',
         planProductId: '',
-        price: '',
-        customerId: '',
         priority: '',
-        packSpec: '',
+        specifications: '',
-        workers: '',
-        processFlowId: '',
-        materialMethod: 1,
         remark: '',
-        // description: '',
         planStartTime: '',
         planFinishTime: ''
       },
@@ -174,8 +107,6 @@ export default {
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
       },
       productList: [],
-      customerList: [],
-      processFlowList: [],
       isEdit: false //是否是编辑
     }
   },
@@ -191,17 +122,13 @@ export default {
             this.form.code = res.data.code
             this.form.planQuantity = res.data.planQuantity
             this.form.planProductId = res.data.planProductId
-            this.form.price = res.data.price
-            this.form.customerId = res.data.customerId
             this.form.priority = res.data.priority ? res.data.priority + '' : ''
             this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-            this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
-            this.form.workers = res.data.workers
-            this.form.processFlowId = res.data.processFlowId
-            this.form.materialMethod = res.data.materialMethod
             this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
             this.form.remark = res.data.remark
-            // this.form.description = res.data.description
+            setTimeout(() => {
+              this.getSpecifications(this.form.planProductId)
+            }, 300);
           }
         })
       } else {
@@ -218,14 +145,17 @@ export default {
       getProductAll().then(res => {
         this.productList = res.data || []
       })
-      // 客户
+    },
-      getCustomerList().then(res => {
+    // 获取产品规格
-        this.customerList = res.data || []
+    getSpecifications(val) {
-      })
+      console.log(val)
-      // 工艺
+      for (let i of this.productList) {
-      getProcessFlowList().then(res => {
+        if (i.id === val) {
-        this.processFlowList = res.data || []
+          this.form.specifications =  i.specifications
-      })
+          return
+        }
+      }
+      this.form.specifications = ''
     },
     timeChange() {
       if (this.form.planStartTime && this.form.planFinishTime) {
@@ -234,20 +164,6 @@ export default {
         }
       }
     },
-    // 工艺变更
-    materialMethodChange(val) {
-      if (val === 2 && !this.form.processFlowId) {
-        this.form.materialMethod = 1
-        this.$modal.msgError("请先选择关联工艺");
-      }
-    },
-    // 工艺变更
-    processFlowIdChange(val) {
-      console.log(val)
-      if (!val) {
-        this.form.materialMethod = 1
-      }
-    },
     submitForm() {
       this.$refs['orderAddForm'].validate((valid) => {
         if (valid) {
@@ -257,7 +173,6 @@ export default {
               return false
             }
           }
-          // console.log(this.form)
           if (this.isEdit) {
             //编辑
             orderUpdate({ ...this.form }).then((res) => {
@@ -283,8 +198,6 @@ export default {
     },
     formClear() {
       this.$refs.orderAddForm.resetFields()
-      this.form.materialMethod = 1
-      this.form.price = 0.00
       this.form.planQuantity = 0
       this.isEdit = false
     }

src/views/order/base/orderManage/components/topTab.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="topTab">
+    <div class="arr leftArr" @click='toLeft'></div>
+    <div class="arr rightArr" @click='toRight'></div>
+    <el-scrollbar ref="groupTeamScroll" :vertical="false"  class="scrollTab">
+      <ul class="tabBox">
+        <li :class="{'active':orderId===item.id}" v-for="(item, index) in orderIdList" :key='index' @click='toggleName(item.id)'>{{item.name}}</li>
+      </ul>
+    </el-scrollbar>
+  </div>
+</template>
+<script>
+export default {
+  name: 'TopTab',
+  data() {
+    return {
+      
+    }
+  },
+  props:['orderIdList','orderId'],
+  computed: {
+    scrollWrapper() {
+      return this.$refs.groupTeamScroll.$refs.wrap
+    }
+  },
+  methods:{
+    toLeft() {
+      const container = this.scrollWrapper
+      container.scrollLeft-=100
+    },
+    toRight() {
+      const container = this.scrollWrapper
+      container.scrollLeft+=100
+    },
+    toggleName(val) {
+      this.$emit('emitFun',val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.topTab {
+  height: 56px;
+  padding: 0px 48px 0px 56px;
+  position: relative;
+  .arr {
+    position: absolute;
+    width: 48px;
+    height: 48px;
+    line-height: 48px;
+    background-color: #fff;
+    border-radius: 8px;
+    cursor: pointer;
+  }
+  .leftArr{
+    left: 0;
+    padding-left: 10px;
+  }
+  .leftArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent #0B58FF transparent transparent;
+  }
+  .rightArr{
+    right: 0;
+    top:0;
+    padding-left: 22px;
+  }
+  .rightArr::before{
+    display: inline-block;
+    content: '';
+    width: 0;
+    height: 0;
+    border-width: 8px;
+    border-style: solid;
+    border-color: transparent transparent transparent #0B58FF;
+  }
+  .scrollTab{
+    white-space: nowrap;
+    overflow: hidden;
+    font-size: 16px;
+    width: 100%;
+    height: 100%;
+    ul,li{
+      list-style: none;
+      margin: 0;
+      padding: 0;
+    }
+    .tabBox >.active {
+      border-bottom: 4px solid #0B58FF;
+    }
+    .tabBox>li {
+      display: inline-block;
+      height: 48px;
+      line-height: 48px;
+      background: #FFFFFF;
+      border-radius: 8px;
+      padding: 0px 10px;
+      margin-right: 8px;
+      cursor: pointer;
+    }
+  }
+}
+</style>

src/views/order/base/orderManage/index.vue

@@ -17,7 +17,7 @@
       <method-btn
         v-if="tableBtn.length"
         slot="handleBtn"
-        :width="240"
+        :width="290"
         label="操作"
         :method-list="tableBtn"
         @clickBtn="handleClick"
@@ -56,7 +56,7 @@
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
-import { getOrderPage, orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
+import { getOrderPage, orderStatusSet, customerList, orderFinish } from '@/api/base/orderManage'
 import OrderAdd from './components/orderAdd'
 import AddWorkOrder from './components/addWorkOrder'
 import { publicFormatter } from '@/utils/dict'
@@ -70,17 +70,13 @@ const tableProps = [
   {
     prop: 'name',
     label: '订单名称',
-    minWidth: 120,
+    minWidth: 140,
     showOverflowtooltip: true
   },
   {
     prop: 'code',
     label: '订单编码',
-    minWidth: 180
+    minWidth: 150,
-  },
-  {
-    prop: 'customerId',
-    label: '客户',
     showOverflowtooltip: true
   },
   {
@@ -111,6 +107,7 @@ const tableProps = [
   {
     prop: 'productName',
     label: '产品',
+    width: 200,
     showOverflowtooltip: true
   },
   {
@@ -196,20 +193,10 @@ export default {
               btnName: '新增',
               showTip: '新增工单',
               showParam: {
-                type: '|',
+                type: '&',
                 data: [
                   {
-                    type: 'equal',
+                    type: 'less',
-                    name: 'status',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
                     name: 'status',
                     value: 3
                   }
@@ -223,13 +210,42 @@ export default {
               btnName: '绑定',
               showTip: '绑定工单',
               showParam: {
-                type: '|',
+                type: '&',
+                data: [
+                  {
+                    type: 'less',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:complete')
+          ? {
+              type: 'complete',
+              btnName: '完成',
+              showTip: '完成订单',
+              showParam: {
+                type: '&',
                 data: [
                   {
                     type: 'equal',
                     name: 'status',
-                    value: 1
+                    value: 3
-                  },
+                  }
+                ]
+              }
+            }
+          : undefined,
+      this.$auth.hasPermi('base:order-manage:termination')
+        ? {
+            type: 'termination',
+            btnName: '终止',
+            showTip: '终止',
+            showParam: {
+              type: '|',
+              data: [
                 {
                   type: 'equal',
                   name: 'status',
@@ -244,23 +260,18 @@ export default {
             }
           }
         : undefined,
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+      this.$auth.hasPermi('base:order-manage:cancel')
         ? {
-              type: 'complete',
+            type: 'cancel',
-              btnName: '完成',
+            btnName: '作废',
-              showTip: '完成订单',
+            showTip: '作废',
             showParam: {
-                type: '|',
+              type: '&',
               data: [
                 {
-                    type: 'equal',
+                  type: 'less',
                   name: 'status',
                   value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
                 }
               ]
             }
@@ -280,35 +291,9 @@ export default {
                 type: '&',
                 data: [
                   {
-                    type: 'equal',
+                    type: 'less',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
                     name: 'status',
-                    value: 1
+                    value: 3
-                  }
-                ]
-              }
-            }
-          : undefined,
-        this.$auth.hasPermi('base:order-manage:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
                   }
                 ]
               }
@@ -345,7 +330,7 @@ export default {
                     item.customerId = i.name
                   }
                 }
-                item.price = item.price.toFixed(2)
+                item.price =  item.price ? item.price.toFixed(2) : '0.00'
               })
               this.list = arr
             }
@@ -385,8 +370,11 @@ export default {
             this.$refs.orderAdd.init(val.data.id)
           })
           break
-        case 'delete':
+        case 'cancel':
-          this.handleDelete(val.data)
+          this.handleEditStatus(val.data, '作废', '6')
+          break
+        case 'termination':
+          this.handleEditStatus(val.data, '终止', '5')
           break
         case 'detail':
           this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
@@ -406,28 +394,45 @@ export default {
           })
           break
         case 'complete':
-          this.handleComplete(val.data)
+          this.handleEditStatus(val.data, '完成', '4')
           break
         default:
       }
     },
-    // 删除
+    // 完成,终止，作废
-    handleDelete(val) {
+    handleEditStatus(val, tip, status) {
-      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
+      let _this = this
-          return orderDelete({ id: val.id })
+      if (val.workOrderNum > 0) {//有下级工单
+        _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
+          type: 'warning',
+          distinguishCancelAndClose: true,
+          confirmButtonText: '同步',
+          cancelButtonText: '不同步'
+        }).then(function() {
+          console.log('同步')
+          orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
+            _this.getList();
+            _this.$modal.msgSuccess("操作成功");
+          })
+        }).catch(action => {
+          if (action === 'cancel') {
+            console.log('不同步')
+            orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
+              _this.getList();
+              _this.$modal.msgSuccess("操作成功");
+            })
+          }else {
+            return console.log('关闭')
+          }
+        })
+      }else{// 无下级工单
+        _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
+          return orderStatusSet({ id: val.id, status: status})
         }).then(() => {
-          this.getList();
+          _this.getList();
-          this.$modal.msgSuccess("操作成功");
+          _this.$modal.msgSuccess("操作成功");
-        }).catch(() => {});
-    },
-    // 完成
-    handleComplete(val) {
-      this.$modal.confirm('是否确认完成订单"' + val.name + '"?').then(function() {
-          return orderFinish({ id: val.id })
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("操作成功");
         }).catch(() => {});
+      }
     },
     // 新增
     handleCancel() {

src/views/order/base/orderManage/orderDetailData.vue

@@ -1,97 +1,81 @@
 <template>
   <div class="orderDetailData">
+    <div v-show="!isSingle" style="position: relative;padding-right: 90px;">
+      <TopTab :orderIdList='orderIdList' :orderId="orderId"  @emitFun='toggleName'/>
+      <el-button type="primary" plain size="small" style="position: absolute;right: 0; top: 0;height: 48px;font-size: 14px;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+    </div>
     <div class="box1">
       <div class="boxTitle">
         <span class="blueTitle"></span>
         <span>订单编码: {{orderMsg.code}}</span>
       </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
+      <el-button v-show="isSingle" type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">订单名</div>
             <div class="lightTip">{{orderMsg.name}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
-            <div class="blodTip">产品信息</div>
+            <div class="blodTip">产品名称</div>
             <div class="lightTip">{{orderMsg.productName}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">产品规格</div>
             <div class="lightTip">{{orderMsg.specifications}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
-            <div class="blodTip">客户</div>
-            <div class="lightTip">{{orderMsg.customerName}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">包装规格</div>
-            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec)}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">物料计算方式</div>
-            <div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}</div>
-          </el-col>
-          <el-col :span='3'>
             <div class="blodTip">创建时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">计划开始时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
           </el-col>
-        </el-row>
+          <el-col :span='4'>
-        <el-row>
-          <el-col :span='3'>
             <div class="blodTip">计划完成时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
             <div class="blodTip">计划加工数量</div>
             <div class="lightTip">{{orderMsg.planQuantity}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">加工平方数(平方米)</div>
             <div class="lightTip">{{orderMsg.planArea}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">预计用时(时)</div>
             <div class="lightTip">{{ orderMsg.expectTime }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">状态</div>
             <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">实际开始时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">实际完成时间</div>
             <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
           </el-col>
-          <el-col :span='3'>
+        </el-row>
+        <el-row>
+          <el-col :span='4'>
             <div class="blodTip">实际生产数量</div>
             <div class="lightTip">{{orderMsg.actualQuantity	}}</div>
           </el-col>
-        </el-row>
+          <el-col :span='4'>
-        <el-row>
-          <el-col :span='3'>
             <div class="blodTip">完成比%</div>
             <div class="lightTip">{{orderMsg.completeProp}}</div>
           </el-col>
-          <el-col :span='3'>
+          <el-col :span='4'>
             <div class="blodTip">废片数量</div>
             <div class="lightTip">{{orderMsg.nokQuantity}}</div>
           </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">负责人</div>
-            <div class="lightTip">{{orderMsg.workers}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">关联工艺</div>
-            <div class="lightTip">{{processFlowName}}</div>
-          </el-col>
         </el-row>
       </div>
     </div>
@@ -109,26 +93,13 @@
         :max-height="tableH"
       />
     </div>
-    <div class="box3">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>预计用料信息</span>
-      </div>
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps2"
-        :table-data="list2"
-        :max-height="tableH"
-      />
-    </div>
   </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
 import { getProcessFlowList } from '@/api/base/orderManage'
+import TopTab from './components/topTab'
 const tableProps1 = [
   {
     prop: 'issueTime',
@@ -139,7 +110,7 @@ const tableProps1 = [
   {
     prop: 'name',
     label: '工单名',
-    minWidth: 100,
+    minWidth: 160,
     showOverflowtooltip: true
   },
   {
@@ -148,7 +119,13 @@ const tableProps1 = [
     minWidth: 150
   },
   {
-    prop: 'planAssignmentQuantity',
+    prop: 'roomNameDict',
+    label: '负责车间',
+    minWidth: 150,
+    filter: publicFormatter('workshop')
+  },
+  {
+    prop: 'planQuantity', 
     label: '计划加工量',
     width: 100
   },
@@ -187,39 +164,26 @@ const tableProps1 = [
   },
   {
     prop: 'workers',
-    label: '负责人'
+    label: '负责人',
+    showOverflowtooltip: true
   },
   {
     prop: 'remark',
-    label: '备注'
+    label: '备注',
+    showOverflowtooltip: true
   }
 ]
-const tableProps2 = [
+import { orderDetail, getOrderList } from '@/api/base/orderManage'
-  {
-    prop: 'materialName',
-    label: '物料名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'num',
-    label: '剩余生产预计消耗'
-  }
-]
-import { orderDetail, bomUseNum } from '@/api/base/orderManage'
 export default {
   name: 'OrderDetailData',
   data() {
     return {
       orderId: '',
+      orderIdList: [], //订单监控跳转过来
+      isSingle: true,//单个详情，false是多个详情
       tableProps1,
-      tableProps2,
       list1: [],
-      list2: [],
+      tableH: this.tableHeight(420),
-      tableH: this.tableHeight(510) / 2,
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -229,45 +193,38 @@ export default {
       processFlowName: ''
     }
   },
+  components:{ TopTab },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(510) / 2
     })
-    this.orderId = location.href.split('?')[1].split('=')[1]
+    if (this.$route.query.orderIdString && this.$route.query.orderIdString!=='undefined') {
+      getOrderList({ids:this.$route.query.orderIdString}).then(res => {
+        this.orderIdList = res.data.map(item => {
+          return {
+            id: item.id,
+            name: item.name
+          }
+        })
+        this.orderId = this.orderIdList[0].id
         this.getMsg()
-  },
+      })
-  watch: {
+      this.isSingle = false
-    $route: 'initData'
+      console.log('aaaaa')
-  },
+    }else{
-  methods: {
+      this.orderId = this.$route.query.orderId
-    initData(to) {
+      this.isSingle = true
-      if (to.name === 'OrderDetailData') {
-        this.orderId = location.href.split('?')[1].split('=')[1]
       this.getMsg()
+      console.log('bbbbbbbbbb')
     }
   },
+  methods: {
     getMsg() {
       orderDetail({
         id: this.orderId
       }).then(res => {
         this.orderMsg = res.data
         this.list1 = res.data.coreWorkOrderRespVOS
-        bomUseNum({
-          productId: this.orderMsg.planProductId
-        }).then(res2 => {
-          if (res2.data && res2.data.length > 0) {
-            let arr = res2.data
-            arr.map(item => {
-              if (item) {
-                let a = item.num * this.orderMsg.remainingQuantity
-                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
-              }
-            })
-            this.list2 = arr
-          }else {
-            this.list2 = []
-          }
-        })
         // 工艺
         getProcessFlowList().then(res => {
           let arr = res.data || []
@@ -283,7 +240,12 @@ export default {
     },
     // 返回
     returnOrderManage() {
-      this.$router.push({path: '/order/base/order-manage'})
+      this.$router.go(-1)
+    },
+    // 切换tab获取订单详情
+    toggleName(val) {
+      this.orderId = val
+      this.getMsg()
     }
   }
 }
@@ -291,14 +253,14 @@ export default {
 <style lang='scss' scoped>
 .orderDetailData {
   background-color: rgb(242, 244, 249);
-  .box1, .box2, .box3 {
+  .box1, .box2{
     background-color: #fff;
     border-radius: 9px;
   }
   .box2 {
-    height: calc((100vh - 360px) / 2);
+    height: calc(100vh - 351px);
     padding: 12px 16px 0;
-    margin: 8px 0;
+    margin-top: 8px;
   }
   .box1 {
     height: 215px;
@@ -318,10 +280,6 @@ export default {
       margin-bottom: 12px;
     }
   }
-  .box3 {
-    padding: 16px;
-    height: calc((100vh - 360px) / 2);
-    }
   .boxTitle {
     display: inline-block;
     font-size: 16px;

src/views/order/monitoring/components/monitoringRingCharts.vue

@@ -2,13 +2,13 @@
   <div>
     <div class="boxTitle">
       <span class="blueTitle"></span>
-      <span>各订单环形图</span>
+      <span>各集团订单环形图</span>
     </div>
     <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
       <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
         <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
           <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
-          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderName}}</span>
+          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderGroupName}}</span>
           <span>订单计划数量{{item.num}}</span>
         </div>
         <div
@@ -16,7 +16,7 @@
           :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
         ></div>
         <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
-          <div class="legendItem" v-for="(subItem, i) in item.workOrder" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
+          <div class="legendItem" v-for="(subItem, i) in item.order" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
             <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
             <div>
               <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
@@ -78,7 +78,7 @@ export default {
         var chartDom = document.getElementById(this.chartList[i].id);
         this.myChart[i] = echarts.init(chartDom);
         let colorList = []
-        this.chartList[i].workOrder.map(item => {
+        this.chartList[i].order.map(item => {
           colorList.push(item.color)
         })
         let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
@@ -118,7 +118,7 @@ export default {
               labelLine: {
                 show: false
               },
-              data: this.chartList[i].workOrder
+              data: this.chartList[i].order
             }
           ]
         };

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -13,11 +13,13 @@
     <!-- 表 -->
     <div v-if="activeName === 'dataList'">
       <base-table
-        :page="queryParams.pageNo"
+        :page="1"
-        :limit="queryParams.pageSize"
+        :limit="1000000000000"
         :table-props="tableProps"
         :table-data="list"
         :max-height="tableH"
+        row-key="id"
+        :tree-props="{children: 'orderMonitorVOS', hasChildren: 'hasChildren'}"
       >
         <method-btn
           v-if="tableBtn.length"
@@ -31,24 +33,30 @@
     </div>
     <!-- 图 -->
     <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
-    <pagination
+    <!-- <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
       :total="total"
       @pagination="getPage"
-    />
+    /> -->
   </div>
 </template>
 <script>
 import { parseTime } from '@/utils/ruoyi'
 import { publicFormatter } from '@/utils/dict'
-import { orderMonitor, orderAssignmentList } from '@/api/base/orderManage'
+import { orderGroupMonitor } from '@/api/base/orderGroup'
 import MonitoringRingCharts from './../components/monitoringRingCharts'
 import moment from "moment"
 const tableProps = [
   {
     prop: 'name',
-    label: '订单名称'
+    label: '订单名称',
+    minWidth: 140,
+    showOverflowtooltip: true
+  },
+  {
+    prop: 'orderType',
+    label: '订单类型'
   },
   {
     prop: 'customerName',
@@ -56,7 +64,9 @@ const tableProps = [
   },
   {
     prop: 'productname',
-    label: '产品'
+    label: '产品',
+    minWidth: 200,
+    showOverflowtooltip: true
   },
   {
     prop: 'planStartTime',
@@ -87,6 +97,12 @@ const tableProps = [
     filter: parseTime,
     minWidth: 160
   },
+  {
+    prop: 'deliveTime',
+    label: '交货时间',
+    filter: parseTime,
+    minWidth: 160
+  },
   {
     prop: 'lineNames',
     label: '加工线',
@@ -109,8 +125,8 @@ const tableProps = [
     width: 100
   },
   {
-    prop: 'workOrderNum',
+    prop: 'orderNum',
-    label: '关联工单数量',
+    label: '关联订单/工单数量',
     width: 110
   }
 ]
@@ -121,7 +137,7 @@ export default {
       formConfig: [
         {
           type: 'input',
-          label: '订单名称',
+          label: '集团订单名称',
           param: 'name'
         },
         {
@@ -147,10 +163,8 @@ export default {
       activeName: 'dataList',
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 20,
         name: null,
-        startProduceTime: []
+        deliveTime: []
       },
       tableProps,
       list: [],
@@ -160,14 +174,14 @@ export default {
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
           ? {
               type: 'orderDetail',
-              btnName: '工单',
+              btnName: '详情',
-              showTip: '工单详情',
+              showTip: '订单/工单详情',
               showParam: {
                 type: '&',
                 data: [
                   {
                     type: 'more',
-                    name: 'workOrderNum',
+                    name: 'orderNum',
                     value: 1
                   }
                 ]
@@ -184,8 +198,13 @@ export default {
                 data: [
                   {
                     type: 'more',
-                    name: 'workOrderNum',
+                    name: 'orderNum',
                     value: 1
+                  },
+                  {
+                    type: 'unequal',
+                    name: 'woIdString',
+                    value: ''
                   }
                 ]
               }
@@ -220,75 +239,78 @@ export default {
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
     this.formConfig[1].defaultSelect = [start, end]
-    this.queryParams.startProduceTime[0] = start + ' 00:00:00'
+    this.queryParams.deliveTime[0] = start + ' 00:00:00'
-    this.queryParams.startProduceTime[1] = end + ' 23:59:59'
+    this.queryParams.deliveTime[1] = end + ' 23:59:59'
     this.getPage()
   },
   methods: {
     getPage() {
-      // 表数据
+      orderGroupMonitor({...this.queryParams}).then(res => {
-      orderMonitor({...this.queryParams}).then(res => {
+        let arr = res.data || []
-        this.list = res.data.records || []
+        if (arr.length > 0) {
-        this.total = res.data.total || 0
-        if (this.list.length > 0) {
-          let orderIdList = []
-          this.list.map(item => {
-            orderIdList.push(item.orderid)
-          })
-          // 图的数据
-          orderAssignmentList({orderIdList:orderIdList}).then(res => {
           let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
-            let tempArr = res.data || {}
+          let arr2 = []
-            let tempArr2 = []
+          arr.map(item => {
-            for (let key in tempArr) {
+            item.orderType = '集团订单'//前端写死订单类型
-              let tempArr3 = []
+            let woIdString = ''//集团订单层添加工单str跳转质量用
+            //=========图数据
+            let arr3 = []
             let obj = {}
-              obj.orderName = tempArr[key][0].orderName
+            obj.orderGroupName = item.name
-              obj.id = key
+            obj.id = item.id
-              obj.num = tempArr[key][0].planQuantity
+            obj.num = item.planQuantity || 0
             let sunNum = 0
-              for (let i = 0; i < tempArr[key].length; i++) {
+            if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
+              for(let i = 0; i < item.orderMonitorVOS.length; i++) {
+                item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型
+                item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid
+                item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum
+                woIdString+=item.orderMonitorVOS[i].woIdString?item.orderMonitorVOS[i].woIdString:''
+                //==============图数据
                 let subObj = {}
-                subObj.value = tempArr[key][i].actualAssignmentQuantity
+                subObj.value = item.orderMonitorVOS[i].actualquantity
-                subObj.name = tempArr[key][i].woName
+                subObj.name = item.orderMonitorVOS[i].name
                 if (i < 5) {
                   subObj.color = color[i]
                 } else {
                   subObj.color = color[i%5]
                 }
-                sunNum+=tempArr[key][i].actualAssignmentQuantity
+                sunNum+=(item.orderMonitorVOS[i].actualquantity || 0)
-                tempArr3.push(subObj)
+                arr3.push(subObj)
               }
-              tempArr3.push({
+            }
-                value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
+            item.woIdString = woIdString
-                name: '未下发',
+            arr3.push({
+              value: item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
+              name: '未生产',
               color: '#F5F5F5'
             })
             obj.sunNum = sunNum
-              obj.workOrder = tempArr3
+            obj.order = arr3
-              tempArr2.push(obj)
+            arr2.push(obj)
-            }
+          })
-            this.chartList = tempArr2
+          this.chartList = arr2
           if (this.activeName === 'barChart' && this.chartList.length > 0) {
             this.$nextTick(() => {
               this.$refs.monitoringRingCharts.initChart()
             })
           }
-          })
         }else{
           // 显示无数据的图片
           this.chartList = []
         }
+        console.log(arr)
+        this.list = arr
       })
     },
     // 查询
     buttonClick(val) {
       this.queryParams.name = val.name
       if (val.timeVal && val.timeVal.length > 0) {
-        this.queryParams.startProduceTime[0] = val.timeVal[0] + ' 00:00:00'
+        this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00'
-        this.queryParams.startProduceTime[1] = val.timeVal[1] + ' 23:59:59'
+        this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59'
       } else {
-        this.queryParams.startProduceTime = []
+        this.queryParams.deliveTime = []
       }
       this.getPage()
     },
@@ -296,9 +318,15 @@ export default {
       console.log(val)
       switch (val.type) {
         case 'orderDetail':
-          this.$router.push({
+          if (val.data.orderType === '集团订单') {
+            this.$router.push({// 去厂务订单详情
+              path: '/order/base/order-manage/order-detail-data?orderIdString='+ val.data.orderIds.join(',')
+            })
+          }else{
+            this.$router.push({// 去工单详情
               path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
             })
+          }
           break
         case 'qualityDetail':
           this.$router.push({
@@ -306,9 +334,9 @@ export default {
           })
           break
         default:
-          this.$router.push({
+          // this.$router.push({
-            path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
+          //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
-          })
+          // })
         }
     },
     toggleTab() {

src/views/quality/base/qualityScrapLog/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-18 14:07:08
+ * @LastEditTime: 2024-02-28 09:58:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,35 +15,11 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="8">
-        <el-form-item label="班组" prop="teamId">
-          <el-select v-model="dataForm.teamId" placeholder="请选择班组">
-            <el-option v-for="dict in teamList" :key="dict.id" :label="dict.name" :value="dict.id" />
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span="8">
         <el-form-item label="数量" prop="num">
           <el-input v-model="dataForm.num" placeholder="请输入数量" />
         </el-form-item>
       </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="8">
-        <el-form-item label="产线" prop="lineId">
-          <el-select v-model="dataForm.lineId" placeholder="请选择产线">
-            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item label="报废原因" prop="detId">
-          <el-select v-model="dataForm.detId" placeholder="请选择报废原因">
-            <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-
       <el-col :span="8">
         <el-form-item label="报废时间" prop="logTime">
           <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
@@ -54,12 +30,28 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span="8">
-        <el-form-item label="来源" prop="source">
+        <el-form-item label="产线" prop="lineId">
-          <el-select v-model="dataForm.source" placeholder="请选择来源">
+          <el-select v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
-            <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="8">
+        <el-form-item label="工段" prop="sectionId">
+          <el-select v-model="dataForm.sectionId" placeholder="请选择工段">
+            <el-option v-for="dict in sectionList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废原因" prop="detId">
+          <el-select v-model="dataForm.detId" placeholder="请选择报废原因" multiple>
+            <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="描述" prop="description">
           <el-input v-model="dataForm.description" placeholder="请输入描述" />
@@ -76,7 +68,7 @@
 </template>
 
 <script>
-import basicAdd from '../../../core/mixins/basic-add';
+import basicAdd from './basic-add';
 import {
   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
   getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@@ -99,6 +91,7 @@ export default {
       workOrderList: [],
       detList:[],
       teamList: [],
+      sectionList:[],
       sourceList: [
         {
           id: 1,
@@ -117,6 +110,7 @@ export default {
         workOrderId: null,
         teamId: undefined,
         num: undefined,
+        sectionId:undefined,
         lineId:undefined,
         description:undefined,
         // description: undefined,
@@ -137,6 +131,7 @@ export default {
 		this.getDict()
     console.log('我看看', this.dataForm)
     this.getCurrentTime()
+    this.getWorksectionById()
 	},
   methods: {
     getCurrentTime() {
@@ -197,6 +192,42 @@ export default {
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
+    },
+    async getWorksectionById(lineId) {
+      if (lineId) {
+        const { code, data } = await this.$axios({
+          url: '/base/core-workshop-section/listByParentId',
+          method: 'get',
+          params: {
+            id: lineId,
+          },
+        });
+        if (code == 0) {
+          console.log(data)
+          this.sectionList = data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        }
+      } else {
+        this.$axios({
+          url: '/base/core-workshop-section/listAll',
+          method: 'get',
+          // params: {
+          //   id: lineId,
+          // },
+        }).then((res) => {
+          // console.log(data)
+          this.sectionList = res.data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        })
+      }
     },
 		// setMaterialCode() {
 		// 	const chooseM = this.materialList.filter(item => {

src/views/quality/base/qualityScrapLog/basic-add.js

@@ -0,0 +1,106 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-02-28 09:51:25
+ * @LastEditTime: 2024-02-28 10:05:00
+ * @LastEditors: zhp
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        createURL: '',
+        updateURL: '',
+        infoURL: '',
+        codeURL: '',
+        getOption: false,
+        isGetCode: false,
+        optionArrUrl: [],
+        optionArr: {}
+      },
+      visible: false,
+      setData: false
+    }
+  },
+  created() {
+  },
+  activated() {
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            console.log(response)
+            this.dataForm = response.data
+            this.dataForm.detId = response.data.detIdList
+            this.dataForm.logTime = new Date(response.data.createTime)
+
+            // if (this.setData) {
+            //   this.setDataForm()
+            // }
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
+		getCode() {
+			this.urlOptions.codeURL()
+				.then(({ data: res }) => {
+					this.dataForm.code = res;
+				})
+				.catch(() => {});
+		},
+    getArr() {
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      this.urlOptions.optionArrUrl.forEach((item, index) => {
+        item(params).then(({ data: res }) => {
+          this.$set(this.urlOptions.optionArr, `arr${index}`, res.list)
+        })
+          .catch(() => {
+          });
+      });
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        let str = this.dataForm.detId.join(',')
+        this.dataForm.detId = str
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+    formClear() {
+      this.$refs.dataForm.resetFields()
+    }
+  }
+}

src/views/quality/base/qualityScrapLog/detail-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-12-01 10:58:25
+ * @LastEditTime: 2024-02-28 10:13:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -15,43 +15,19 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="工单号" prop="workOrderId">
-            <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号" disabled>
+            <el-select disabled v-model="dataForm.workOrderId" placeholder="请选择工单号">
               <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="班组" prop="teamId">
+          <el-form-item label="数量" prop="num">
-            <el-select v-model="dataForm.teamId" placeholder="请选择班组" disabled>
+            <el-input disabled v-model="dataForm.num" placeholder="请输入数量" />
-              <el-option v-for="dict in teamList" :key="dict.id" :label="dict.name" :value="dict.id" />
-            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="数量" prop="sum">
-            <el-input v-model="dataForm.sum" placeholder="请输入数量" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="产线" prop="lineId">
-            <el-select v-model="dataForm.lineId" placeholder="请选择产线" disabled>
-              <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="报废原因" prop="detId">
-            <el-select v-model="dataForm.detId" placeholder="请选择报废原因" disabled>
-              <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item label="报废时间" prop="logTime">
-            <el-date-picker v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" disabled
+            <el-date-picker disabled v-model="dataForm.logTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -59,12 +35,28 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item label="来源" prop="source">
+          <el-form-item label="产线" prop="lineId">
-            <el-select v-model="dataForm.source" placeholder="请选择来源" disabled>
+            <el-select disabled v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
-              <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+              <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="工段" prop="sectionId">
+            <el-select v-model="dataForm.sectionId" placeholder="请选择工段" disabled>
+              <el-option v-for="dict in sectionList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="报废原因" prop="detId">
+            <el-select v-model="dataForm.detId" placeholder="请选择报废原因" multiple disabled>
+              <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="描述" prop="description">
             <el-input v-model="dataForm.description" placeholder="请输入描述" disabled />
@@ -147,6 +139,7 @@ export default {
 		this.getDict()
     console.log('我看看', this.dataForm)
     this.getCurrentTime()
+    // this.getWorksectionById()
 	},
   methods: {
     // init() {
@@ -198,6 +191,7 @@ export default {
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
+
       getTeamList().then((res) => {
         console.log(res);
         // console.log(response);
@@ -207,15 +201,45 @@ export default {
             id: item.id
           }
         })
+        this.$axios({
+          url: '/base/core-workshop-section/listAll',
+          method: 'get',
+          // params: {
+          //   id: lineId,
+          // },
+        }).then((res) => {
+          // console.log(data)
+          this.sectionList = res.data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        })
+        // if (code == 0) {
+
+        // }
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
     },
-		setMaterialCode() {
+    async getWorksectionById(lineId) {
-			const chooseM = this.materialList.filter(item => {
+        const { code, data } = await this.$axios({
-				return item.id === this.dataForm.materialId
+          url: '/base/core-workshop-section/listByParentId',
-			})
+          method: 'get',
-			this.dataForm.materialCode = chooseM[0].code
+          params: {
+            id: lineId,
+          },
+        });
+        if (code == 0) {
+          console.log(data)
+          this.sectionList = data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        }
     }
 	},
 };

src/views/quality/base/qualityScrapLog/index.vue

@@ -30,31 +30,40 @@ import {
 } from '@/api/base/qualityScrapLog';
 
 const tableProps = [
-	{
+	// {
-		prop: 'createTime',
+	// 	prop: 'createTime',
-		label: '添加时间',
+	// 	label: '添加时间',
-		filter: parseTime
+	// 	filter: parseTime
-  },
+  // },
-  {
-    prop: 'workOrderName',
-    label: '工单'
-  },
-  {
-    prop: 'teamName',
-    label: '班组'
-  },
-	{
-    prop: 'detContent',
-    label: '报废原因'
-	},
   {
     prop: 'logTime',
     label: '报废时间',
     filter: parseTime
   },
+  {
+    prop: 'lineName',
+    label: '产线名称'
+  },
+  {
+    prop: 'sectionName',
+    label: '工段'
+  },
+  {
+    prop: 'workOrderName',
+    label: '工单名称'
+  },
   {
     prop: 'num',
     label: '数量'
+  },
+	{
+    prop: 'detContent',
+    label: '报废原因'
+	},
+  {
+    prop: 'source',
+    label: '来源',
+    filter: (val) => val == 1 ? '平板端' : '网页端'
   },
 ];
 

src/views/quality/monitoring/statisticalData/index.vue

@@ -286,6 +286,7 @@ export default {
     //   this.searchBarFormConfig[0].defaultSelect = [];
     // }
     this.getList()
+    this.getDict()
   },
 	methods: {
     /** 获取搜索栏的产线列表 */
@@ -320,7 +321,7 @@ export default {
     // },
     getList() {
       this.getDataList()
-      this.getDict()
+      // this.getDict()
     },
 		/** 查询列表 */
     async getDataList() {
@@ -330,7 +331,7 @@ export default {
       const {
         data: { data, otherList, otherMap, nameData },
       } = await getStatisticalDataPage(this.queryParams)
-      console.log(this.queryParams);
+      // console.log(this.queryParams);
       this.dynamicProps = this.filterNameData(nameData)
       this.list = this.filterData(data);
     },
@@ -373,7 +374,7 @@ export default {
 
         this.getList()
       }
-     console.log(val);
+    //  console.log(val);
     }
 		/** 搜索按钮操作 */
 		// handleQuery() {

src/views/specialEquipment/basic/FireFighthing.vue

@@ -59,10 +59,11 @@
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
+			:isFireEquipment="true"
 			@update-mode="editMode = $event"
 			:data-id="form.id"
 			:sections="[
@@ -108,14 +109,14 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/firefightingDrawer';
 
 import {
 	createEquipment,
@@ -403,25 +404,41 @@ export default {
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
+			this.editVisible = true;
-			getEquipment(id).then((response) => {
+			this.$nextTick(() => {
-				this.form = response.data;
+				this.$refs['drawer'].init();
-				this.open = true;
-				this.title = '修改设备';
 			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// this.editMode = 'edit';
+			// const id = row.id;
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改设备';
+			// });
 		},
-		handleDetail(row) {
+		handleDetail(row, mode='detail') {
-			this.reset();
+			const {id} = row;
-			this.showUploadComponents = false;
+			this.form.id = id;
-			const id = row.id;
+			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
-			getEquipment(id).then((response) => {
+			this.editVisible = true;
-				this.form = response.data;
+			this.$nextTick(() => {
-				this.open = true;
+				this.$refs['drawer'].init();
-				this.title = '查看详情';
+			})
-			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// const id = row.id;
+			// this.editMode = 'detail';
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '查看详情';
+			// });
 		},
 		/** 提交按钮 */
 		submitForm() {

src/views/specialEquipment/basic/Manage.vue

@@ -59,7 +59,7 @@
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
@@ -108,14 +108,14 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/manageDrawer';
 
 import {
 	createEquipment,
@@ -388,25 +388,41 @@ export default {
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
+			this.editVisible = true;
-			getEquipment(id).then((response) => {
+			this.$nextTick(() => {
-				this.form = response.data;
+				this.$refs['drawer'].init();
-				this.open = true;
-				this.title = '修改设备';
 			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// this.editMode = 'edit';
+			// const id = row.id;
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '修改设备';
+			// });
 		},
-		handleDetail(row) {
+		handleDetail(row, mode='detail') {
-			this.reset();
+			const {id} = row;
-			this.showUploadComponents = false;
+			this.form.id = id;
-			const id = row.id;
+			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
-			getEquipment(id).then((response) => {
+			this.editVisible = true;
-				this.form = response.data;
+			this.$nextTick(() => {
-				this.open = true;
+				this.$refs['drawer'].init();
-				this.title = '查看详情';
+			})
-			});
+			// this.reset();
+			// this.showUploadComponents = false;
+			// const id = row.id;
+			// this.editMode = 'detail';
+			// getEquipment(id).then((response) => {
+			// 	this.form = response.data;
+			// 	this.open = true;
+			// 	this.title = '查看详情';
+			// });
 		},
 		/** 提交按钮 */
 		submitForm() {

src/views/specialEquipment/basic/Safety.vue

@@ -55,11 +55,11 @@
 				:has-files="true"
 				:disabled="editMode === 'detail'"
 				:rows="computedRows" />
-			<!-- :has-files="['files', 'files2']" -->
 		</base-dialog>
+		<!-- :has-files="['files', 'files2']" -->
 
 		<!-- 设备 详情 - 编辑 -->
-		<!-- <EquipmentDrawer
+		<EquipmentDrawer
 			v-if="editVisible"
 			ref="drawer"
 			:mode="editMode"
@@ -108,15 +108,14 @@
 			]"
 			@refreshDataList="getList"
 			@cancel="cancelEdit"
-			@destroy="cancelEdit" /> -->
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import EquipmentDrawer from '../components/EquipmentDrawer';
+import EquipmentDrawer from '../components/safetyDrawer';
-
 import {
 	createEquipment,
 	updateEquipment,
@@ -386,26 +385,35 @@ export default {
 			this.editMode = 'add';
 		},
 		/** 修改按钮操作 */
+		// handleUpdate(row) {
+		// 	this.reset();
+		// 	this.showUploadComponents = false;
+		// 	this.editMode = 'edit';
+		// 	const id = row.id;
+		// 	getEquipment(id).then((response) => {
+		// 		this.form = response.data;
+		// 		this.open = true;
+		// 		this.title = '修改设备';
+		// 	});
+		// },
 		handleUpdate(row) {
 			this.reset();
+			this.form.id = row.id;
 			this.showUploadComponents = false;
 			this.editMode = 'edit';
-			const id = row.id;
+			this.editVisible = true;
-			getEquipment(id).then((response) => {
+			this.$nextTick(() => {
-				this.form = response.data;
+				this.$refs['drawer'].init();
-				this.open = true;
-				this.title = '修改设备';
 			});
 		},
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
-			this.reset();
+			const { id } = row;
-			this.showUploadComponents = false;
+			this.form.id = id;
-			const id = row.id;
+			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
-			getEquipment(id).then((response) => {
+			this.editVisible = true;
-				this.form = response.data;
+			this.$nextTick(() => {
-				this.open = true;
+				this.$refs['drawer'].init();
-				this.title = '查看详情';
 			});
 		},
 		/** 提交按钮 */

src/views/specialEquipment/check/CheckOrderListTable.vue

@@ -0,0 +1,238 @@
+<!-- 
+    filename: WaitingListTable.vue
+    author: liubin
+    date: 2024-02-05 16:12:55
+    description: 
+-->
+
+<template>
+	<el-table
+		:data="tableDataWithIndex"
+		:border="true"
+		@selection-change="handleSelectionChange"
+		style="width: 100%"
+		:header-cell-style="{
+			background: '#f2f4f9',
+			color: '#606266',
+		}"
+		class="waiting-list-table">
+		<el-table-column
+			type="selection"
+			:width="50"
+			:selectable="checkSelectable" />
+		<el-table-column prop="_pageIndex" width="80" align="center">
+			<template slot="header">
+				<el-popover placement="bottom-start" width="300" trigger="click">
+					<div class="setting-box" style="max-height: 400px; overflow-y: auto">
+						<el-checkbox
+							v-for="(item, index) in tablePropsLabelList"
+							:key="'cb' + index"
+							v-model="selectedBox[index]"
+							:label="item.label" />
+					</div>
+					<i slot="reference" class="el-icon-s-tools" />
+				</el-popover>
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[0]"
+			label="巡检单名称"
+			prop="name"></el-table-column>
+		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
+			<template slot-scope="scope">
+				{{ scope.row.department || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[2]"
+			label="巡检时间"
+			prop="planCheckTime">
+			<template slot-scope="scope">
+				{{ scope.row.planCheckTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[3]"
+			label="班次"
+			prop="groupClass">
+			<template slot-scope="scope">
+				{{ scope.row.groupClass || '---' }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[4]"
+			label="确认截止时间"
+			prop="confirmDueTime">
+			<template slot-scope="scope">
+				{{ scope.row.confirmDueTime | timeFilter }}
+			</template>
+		</el-table-column>
+		<el-table-column
+			v-if="selectedBox[5]"
+			width="150"
+			label="备注"
+			prop="remark">
+			<template slot-scope="scope">
+				{{ scope.row.remark }}
+			</template>
+		</el-table-column>
+
+		<el-table-column width="188" label="操作">
+			<template slot-scope="scope">
+				<el-tooltip content="确认" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						:disabled="!checkSelectable(scope.row)"
+						@click="$emit('confirm', scope.row)">
+						确认
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="查看详情" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('detail', scope.row)">
+						<i class="iconfont icon-detail primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="编辑" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('edit', scope.row)">
+						<i class="iconfont icon-edit primary-color" />
+					</el-button>
+				</el-tooltip>
+				<!-- line  -->
+				<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
+				<el-tooltip content="删除" placement="top">
+					<el-button
+						type="text"
+						style="margin: 5px 0; padding: 0"
+						@click="$emit('delete', scope.row)">
+						<i class="iconfont icon-delete delete-color" />
+					</el-button>
+				</el-tooltip>
+			</template>
+		</el-table-column>
+	</el-table>
+</template>
+
+<script>
+import moment from 'moment';
+
+export default {
+	name: 'CheckOrderListTable',
+	components: {},
+	props: ['tableData', 'page', 'limit'],
+	filters: {
+		timeFilter: (val) =>
+			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
+	},
+	data() {
+		return {
+			tablePropsLabelList: [
+				{
+					label: '巡检单名称',
+				},
+				{
+					label: '部门',
+				},
+				{
+					label: '巡检时间',
+				},
+				{
+					label: '班次',
+				},
+				{
+					label: '确认截止时间',
+				},
+				{
+					label: '备注',
+				},
+			],
+			selectedBox: [true, true, true, true, true, true],
+			selectedOrder: [],
+		};
+	},
+	computed: {
+		tableDataWithIndex() {
+			return this.tableData.map((item, index) => ({
+				...item,
+				_pageIndex: (this.page - 1) * this.limit + index + 1,
+			}));
+		},
+	},
+	methods: {
+		checkSelectable(row, index) {
+			return true;
+			// return (
+			// 	row.relatePlan == 2 ||
+			// 	(row.relatePlan == 1 &&
+			// 		(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
+			// );
+		},
+		handleSelectionChange(val) {
+			this.selectedOrder = val;
+		},
+	},
+};
+</script>
+
+<style scoped>
+@import './iconfont/iconfont.css';
+.delete-color {
+	color: #ff5454;
+}
+.primary-color {
+	color: #0b58ff;
+}
+
+.baseTable .show-col-btn {
+	margin-right: 5px;
+	line-height: inherit;
+	cursor: pointer;
+}
+.baseTable .el-icon-refresh {
+	cursor: pointer;
+}
+</style>
+<style>
+.waiting-list-table .el-table__body tr.current-row > td.el-table__cell {
+	background-color: #eaf1fc;
+}
+.waiting-list-table.el-table .el-table__cell {
+	padding: 0;
+	height: 35px;
+}
+.waiting-list-table .addButton {
+	width: 100%;
+	height: 35px;
+	border-top: none;
+	color: #0b58ff;
+	border-color: #ebeef5;
+	border-radius: 0;
+}
+.waiting-list-table .addButton:hover {
+	color: #0b58ff;
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+.waiting-list-table .addButton:focus {
+	border-color: #ebeef5;
+	background-color: #fff;
+}
+
+.el-tooltip__popper.is-dark {
+	background: rgba(0, 0, 0, 0.6) !important;
+}
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+	border-top-color: rgba(0, 0, 0, 0.4) !important;
+}
+</style>

src/views/specialEquipment/check/Config.vue

@@ -2,7 +2,7 @@
     filename: Content.vue
     author: liubin
     date: 2023-12-12 13:53:22
-    description: 
+    description: 巡检单设置
 -->
 
 <template>
@@ -59,6 +59,7 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
+import { parseTime } from '../../core/mixins/code-filter';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
@@ -68,7 +69,7 @@ export default {
 		return {
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
-			searchBarKeys: ['equipmentId', 'name', 'specialType'],
+			searchBarKeys: ['name'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-setting:addInsp')
 					? {
@@ -83,12 +84,12 @@ export default {
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check-setting:update')
+				// this.$auth.hasPermi('equipment:check-setting:update')
-					? {
+				// 	? {
-							type: 'detail',
+				// 			type: 'detail',
-							btnName: '查看详情',
+				// 			btnName: '查看详情',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
@@ -99,55 +100,54 @@ export default {
 			tableProps: [
 				{
 					prop: 'name',
-					label: '配置名',
+					label: '巡检单名称',
-					width: 110,
+					width: 100,
 					showOverflowtooltip: true,
 				},
-				{ prop: 'lineName', label: '产线', showOverflowtooltip: true },
 				{
-					prop: 'equipmentCategory',
+					prop: 'code',
-					label: '设备大类',
+					label: '巡检单编码',
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'department',
+					label: '部门',
+					width: 100,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planCheckTime',
+					label: '计划巡检时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{
+					width: 144,
+					prop: 'confirmTimeLimit',
+					label: '确认时限',
+					showOverflowtooltip: true,
 					filter: (val) =>
-						val != null ? ['-', '安全', '消防', '特种'][val] : '-',
+						val != null && val > 24
+							? `${(val - (val % 24)) / 24}天${val % 24}小时`
+							: `${val}小时`,
 				},
-				{ prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
+				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
+				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
 				{
-					prop: 'equipmentCode',
+					prop: 'createTime',
-					label: '设备编码',
+					label: '创建时间',
-					minWidth: 150,
 					showOverflowtooltip: true,
+					filter: parseTime,
 				},
-				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'remark', label: '备注' },
-				{ prop: 'remark', label: '描述' },
-				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '配置名称',
+					label: '巡检单名称',
-					placeholder: '请输入配置名称',
+					placeholder: '请输入巡检单名称',
 					param: 'name',
 				},
-				{
-					type: 'select',
-					label: '设备大类',
-					placeholder: '请选择设备大类',
-					param: 'specialType',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备名称',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
-				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -175,65 +175,18 @@ export default {
 				// 	color: 'warning',
 				// },
 			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '配置名称',
-						prop: 'name',
-						rules: [
-							{ required: true, message: '配置名称不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '配置编码',
-						prop: 'code',
-						url: '/base/equipment-check-config/getCode',
-						rules: [
-							{ required: true, message: '配置编码不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-						rules: [
-							{
-								required: true,
-								message: '设备名称不能为空',
-								trigger: 'change',
-							},
-						],
-					},
-					{
-						input: true,
-						label: '设备编码', // TODO: 和设备名称联动估计
-						prop: 'equipmentCode',
-					},
-				],
-			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				equipmentId: null,
 				name: null,
-				special: true,
+				status: 0,
-				specialType: null,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-config',
+			basePath: '/base/equipment-check-order',
 			mode: null,
 			allSpecialEquipments: [],
 		};
@@ -290,10 +243,9 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
-			this.$refs.add.formClear();
+			this.$refs.add.reset();
 			this.open = false;
 			this.title = '';
-			// this.reset();
 		},
 		/** 表单重置 */
 		reset() {
@@ -318,7 +270,6 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
 			this.open = true;
 			this.title = '添加巡检设置';
 			this.$nextTick(() => {
@@ -327,17 +278,10 @@ export default {
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			// this.reset();
-			// const id = row.id;
-			// this.info({ id }).then((response) => {
-			// 	this.form = response.data;
-			// 	this.open = true;
-			// 	this.title = '修改巡检设置';
-			// });
 			this.open = true;
 			this.title = '修改巡检设置';
 			this.$nextTick(() => {
-				this.$refs.add.init(row.id);
+				this.$refs.add.init(row);
 			});
 		},
 		/** 提交按钮 */
@@ -401,27 +345,31 @@ export default {
 				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
-		handleAddDetail({ id }) {
+		handleAddDetail(row) {
 			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = '添加巡检';
+			this.addOrEditTitle = '添加内容';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
+				this.$refs.addOrUpdate.init(row);
 			});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
 				.confirm('是否确认导出所有巡检设置?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						params: {
+							name: this.queryParams.name,
+							status: 0,
+							special: true,
+						},
+						responseType: 'blob',
+					});
 				})
 				.then((response) => {
-					this.$download.excel(response, '巡检设置.xls');
+					this.$download.excel(response, '巡检单设置.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/specialEquipment/check/Content-add.vue

@@ -0,0 +1,196 @@
+<!--
+ * @Author: lb
+ * @Date: 2024-2-23 09:16:25
+ * @LastEditors: lb
+ * @LastEditTime: 2024-2-23 09:16:25
+ * @Description: 设备巡检待确认弹窗
+-->
+<template>
+	<el-form
+		ref="form"
+		:model="dataForm"
+		:rules="dataRule"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="128px"
+		v-loading="formLoading"
+		label-position="top">
+		<el-row :gutter="20">
+			<el-col>
+				<el-form-item label="巡检单名称" prop="name">
+					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
+				</el-form-item>
+			</el-col>
+			<el-col>
+				<el-form-item label="部门" prop="departmentId">
+					<el-select
+						v-model="dataForm.departmentId"
+						:placeholder="`请选择部门`">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col>
+				<el-form-item label="班次" prop="groupClass">
+					<el-select
+						v-model="dataForm.groupClass"
+						filterable
+						clearable
+						multiple
+						style="width: 100%"
+						placeholder="请选择班次">
+						<el-option
+							v-for="d in groupOptions"
+							:key="d.value"
+							:label="d.label"
+							:value="d.label" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<!-- <el-col>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-col> -->
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+export default {
+	name: 'ContentAdd',
+	data() {
+		return {
+			formLoading: false,
+			dataForm: {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				// special: true,
+			},
+			dataRule: {
+				name: [
+					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' },
+				],
+			},
+			equipmentOptions: [],
+			groupOptions: [],
+			departmentOptions: [],
+		};
+	},
+	mounted() {
+		this.initOptions();
+	},
+	methods: {
+		reset() {
+			this.dataForm = {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				// special: true,
+			};
+		},
+
+		async initOptions() {
+			this.formLoading = true;
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+			];
+			try {
+				const [dpt, grp] = await Promise.all(
+					urls.map((url) => this.$axios(url))
+				);
+				if (dpt.code == 0) {
+					this.departmentOptions = dpt.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+				}
+				if (grp.code == 0) {
+					this.groupOptions = grp.data.map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+				}
+				this.formLoading = false;
+			} catch (err) {
+				this.formLoading = false;
+				console.error(err);
+			}
+		},
+
+		async init(row) {
+			if (!row || !row.id) {
+				return;
+			}
+			const res = await this.$axios({
+				url: '/base/equipment-check-order/get?id=' + row.id,
+			});
+			if (res.code == 0) {
+				Object.keys(this.dataForm).forEach((key) => {
+					this.dataForm[key] = res.data[key];
+					if (key == 'groupClass') {
+						this.dataForm.groupClass = res.data.groupClass.split(',');
+					}
+				});
+			}
+		},
+
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
+		async dataFormSubmit() {
+			let valid = false;
+			try {
+				valid = await this.$refs.form.validate();
+			} catch (err) {}
+			if (!valid) return;
+
+			// let confirmed = false;
+			// try {
+			// 	confirmed = await this.getConfirmed();
+			// } catch (err) {
+			// 	confirmed = false;
+			// }
+			const res = await this.$axios({
+				url:
+					'/base/equipment-check-order' +
+					(this.dataForm.id ? '/update' : '/create'),
+				method: this.dataForm.id ? 'put' : 'post',
+				data: {
+					...this.dataForm,
+					special: true,
+					status: 1,
+					// status: confirmed ? 2 : 1,
+					groupClass: this.dataForm.groupClass.join(','),
+					checkPerson: this.$store.getters.userId,
+				},
+			});
+			if (res.code == 0) {
+				this.$emit('refreshDataList');
+				this.$message.success(this.dataForm.id ? '更新成功' : '创建成功');
+				return res.data;
+			}
+			return null;
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+</style>

src/views/specialEquipment/check/Content-add_detail.vue

@@ -0,0 +1,515 @@
+<!-- 
+    filename: Content-edit.vue
+    author: liubin
+    date: 2024-2-24 11:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">添加巡检内容</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<SmallTitle>巡检内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div
+						v-if="!disableEdit && !disableModifyDetail"
+						style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加内容
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							v-if="!disableEdit"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">
+					{{ disableEdit ? '返回' : '取消' }}
+				</el-button>
+				<el-button
+					v-if="!disableEdit"
+					type="primary"
+					:loading="btnLoading"
+					@click="handleConfirm">
+					保存
+				</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			departmentList: [],
+			inspectorOptions: [],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				orderId: null,
+				program: null,
+				checkResult: null,
+				equipmentId: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检结果',
+						prop: 'checkResult',
+						rules: [
+							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+			groupOptions: [],
+			disableEdit: false,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		disableModifyDetail() {
+			return this.form && this.form.confirmTimeLimit != undefined;
+		},
+		attrTableProps() {
+			return [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '巡检项目',
+				},
+				{
+					prop: 'checkResult',
+					label: '巡检结果',
+				},
+			];
+		},
+	},
+	mounted() {
+		this.formLoading = true;
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+
+		getConfirmed() {
+			return this.$confirm('是否直接确认巡检记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+
+		async handleConfirm() {
+			if (this.attrList.length == 0) {
+				return this.$message.error('请添加巡检内容');
+			}
+
+			let confirmed = false;
+			try {
+				confirmed = await this.getConfirmed();
+			} catch (err) {
+				confirmed = false;
+			}
+
+			if (confirmed) {
+				const res = await this.$axios({
+					url:
+						'/base/equipment-check-order/confirm?confirmPerson=' +
+						this.$store.getters.nickname,
+					method: 'put',
+					data: [this.row.id],
+				});
+				if (res.code == 0) {
+					this.$message.success('已确认');
+				}
+			}
+
+			// this.btnLoading = true;
+			// this.$nextTick(async () => {
+			// 	const { code, data } = await this.$axios({
+			// 		url: '/base/equipment-check-order/update',
+			// 		method: 'put',
+			// 		data: {
+			// 			...this.form,
+			// 			groupClass: this.form.groupClass.join(','),
+			// 			checkPerson: this.form.checkPerson.join(','),
+			// 		},
+			// 	});
+			// 	if (code == 0) {
+			// 		this.$modal.msgSuccess('更新成功');
+			// 	}
+			// 	this.btnLoading = false;
+			// 	this.$emit('refreshDataList');
+			// 	this.handleCancel();
+			// });
+			this.$emit('refreshDataList');
+			this.handleCancel();
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row, detail) {
+			if (detail) this.disableEdit = true;
+			this.visible = true;
+			this.row = row;
+			this.getAttrList(row);
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					orderId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		handleCancel() {
+			if (!this.attrList.length) {
+				return this.$message.error('请添加巡检内容');
+			}
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				orderId: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加巡检内容';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑巡检单详情';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该巡检内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-check-order-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-check-order-det/update'
+							: '/base/equipment-check-order-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: { ...this.attrForm, orderId: this.row.id },
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/specialEquipment/check/Content-edit.vue

@@ -0,0 +1,732 @@
+<!-- 
+    filename: Content-edit.vue
+    author: liubin
+    date: 2024-2-24 11:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">{{ disableEdit ? '详情' : '编辑' }}</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="巡检单名称" prop="name">
+									<el-input
+										v-model="form.name"
+										:disabled="disableEdit"
+										placeholder="请输入巡检单名称" />
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="departmentId">
+									<el-select
+										v-model="form.departmentId"
+										filterable
+										clearable
+										:disabled="disableEdit"
+										:placeholder="`请选择部门`">
+										<el-option
+											v-for="opt in departmentOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="班次" prop="groupClass">
+									<el-select
+										v-model="form.groupClass"
+										filterable
+										clearable
+										multiple
+										:disabled="disableEdit"
+										style="width: 100%"
+										placeholder="请选择班次">
+										<el-option
+											v-for="d in groupOptions"
+											:key="d.value"
+											:label="d.label"
+											:value="d.label" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检人" prop="checkPerson">
+									<!-- :rules="[
+										{
+											required: true,
+											message: '请选择巡检人',
+											trigger: 'blur',
+										},
+									]" -->
+									<el-select
+										v-model="form.checkPerson"
+										:placeholder="`请选择巡检人`"
+										multiple
+										clearable
+										:disabled="disableEdit"
+										filterable>
+										<el-option
+											v-for="opt in inspectorOptions"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检时间" prop="planCheckTime">
+									<el-date-picker
+										v-model="form.planCheckTime"
+										type="datetime"
+										:disabled="disableEdit"
+										placeholder="请选择计划开始时间"
+										value-format="timestamp"></el-date-picker>
+								</el-form-item>
+							</el-col>
+
+							<!-- <el-col :span="24">
+								<el-form-item label="备注" prop="remark">
+									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+								</el-form-item>
+							</el-col> -->
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>巡检内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div
+						v-if="!disableEdit && !disableModifyDetail"
+						style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加内容
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							v-if="!disableEdit && !disableModifyDetail"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">
+					{{ disableEdit ? '返回' : '取消' }}
+				</el-button>
+				<el-button
+					v-if="!disableEdit"
+					type="primary"
+					:loading="btnLoading"
+					@click="handleConfirm">
+					保存
+				</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			departmentList: [],
+			inspectorOptions: [],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				orderId: null,
+				program: null,
+				checkResult: null,
+				equipmentId: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检结果',
+						prop: 'checkResult',
+						rules: [
+							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+			groupOptions: [],
+			disableEdit: false,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+		disableModifyDetail() {
+			return this.form && this.form.confirmTimeLimit != undefined;
+		},
+		attrTableProps() {
+			return [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '巡检项目',
+				},
+				{
+					prop: 'checkResult',
+					label: '巡检结果',
+					subcomponent: this.disableModifyDetail
+						? {
+								name: 'TableCellInput',
+								props: ['injectData'],
+								data() {
+									return {
+										inputvalue: null,
+									};
+								},
+								mounted() {
+									this.inputvalue = this.injectData.checkResult;
+								},
+								methods: {
+									async handleValueChange(newCheckResult) {
+										document.body.style.cursor = 'wait';
+										await this.$axios({
+											url: '/base/equipment-check-order-det/update',
+											method: 'put',
+											data: {
+												orderId: this.injectData.orderId,
+												equipmentId: this.injectData.equipmentId,
+												program: this.injectData.program,
+												id: this.injectData.id,
+												checkResult: newCheckResult,
+											},
+										});
+										document.body.style.cursor = 'default';
+									},
+								},
+								render: function (h) {
+									return (
+										<el-input
+											size="small"
+											key={this.injectData.id}
+											v-model={this.inputvalue}
+											onChange={this.handleValueChange}
+										/>
+									);
+								},
+						  }
+						: null,
+				},
+			];
+		},
+	},
+	mounted() {
+		this.formLoading = true;
+		this.getList('department');
+		this.getList('groupClass');
+		this.getList('inspector');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-check-order/update',
+					method: 'put',
+					data: {
+						...this.form,
+						groupClass: this.form.groupClass.join(','),
+						checkPerson: this.form.checkPerson.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row, detail) {
+			if (detail) this.disableEdit = true;
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			console.log('row', row);
+			const res = await this.$axios(
+				'/base/equipment-check-order/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				this.form.groupClass = res.data.groupClass.split(',');
+				this.form.checkPerson = res.data.checkPerson?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					orderId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[0]);
+					this.departmentList = res.data || [];
+					break;
+				case 'inspector':
+					let inspectorList = [];
+					const userlist = await this.$axios({
+						url: '/system/user/page',
+						params: { pageNo: 1, pageSize: 100 },
+					});
+					if (userlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							(userlist.data?.list || []).map((item) => ({
+								label: item.username,
+								value: item.id,
+							}))
+						);
+					}
+					const workerlist = await this.$axios('/base/core-worker/listAll');
+					if (workerlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							workerlist.data.map((item) => ({
+								label: item.name,
+								value: item.id,
+							}))
+						);
+					}
+					this.inspectorOptions = inspectorList;
+					break;
+				case 'groupClass':
+					res = await this.$axios(urls[1]);
+					this.groupOptions = (res.data || []).map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				orderId: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加巡检内容';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑巡检单详情';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该巡检内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-check-order-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-check-order-det/update'
+							: '/base/equipment-check-order-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: { ...this.attrForm, orderId: this.row.id },
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/specialEquipment/check/Content.vue

@@ -2,32 +2,26 @@
     filename: Content.vue
     author: liubin
     date: 2023-12-12 13:53:22
-    description: 
+    description: 巡检单设置
 -->
 
 <template>
-	<div class="app-container SpecialEquipmentCheckContent">
+	<div class="app-container SpecialEquipmentCheckConfig">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<!-- 列表 -->
+		<CheckOrderListTable
-		<base-table
+			ref="check-order-list-table"
-			:table-props="tableProps"
+			:table-data="list"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
-			:table-data="list"
+			@edit="handleEdit"
-			@emitFun="handleEmitFun">
+			@detail="handleDetail"
-			<method-btn
+			@delete="handleDelete"
-				v-if="tableBtn.length"
+			@confirm="handleConfirm" />
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
-		</base-table>
 
 		<!-- 分页组件 -->
 		<pagination
@@ -43,44 +37,61 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="submitForm">
+			@confirm="handleSubmit">
-			<DialogForm
+			<add ref="add" @refreshDataList="successSubmit" />
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="false"
-				:rows="rows" />
 		</base-dialog>
+
+		<edit
+			ref="content-edit"
+			v-if="editOpen"
+			@refreshDataList="getList"
+			@destroy="editOpen = false" />
+
+		<AddCheckDet
+			ref="content-detail"
+			v-if="detOpen"
+			@refreshDataList="getList"
+			@destroy="detOpen = false" />
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { deleteCheck } from '@/api/equipment/base/inspection/settings';
+import addOrUpdata from './add-or-updata.vue';
+import add from './Content-add.vue';
+import { parseTime } from '../../core/mixins/code-filter';
+import CheckOrderListTable from './CheckOrderListTable.vue';
+import edit from './Content-edit.vue';
+import AddCheckDet from './Content-add_detail.vue';
 
 export default {
-	name: 'SpecialEquipmentCheckContent',
+	name: 'SpecialEquipmentCheckConfig',
-	components: {},
+	components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
-			searchBarKeys: ['content'],
+			editOpen: false,
+			detOpen: false,
+			addOrUpdateVisible: false,
+			addOrEditTitle: '',
+			searchBarKeys: ['name'],
 			tableBtn: [
-				// this.$auth.hasPermi('equipment:check:update')
+				{
-				// 	? {
+					type: 'confirm',
-				// 			type: 'detail',
+					btnName: '确认',
-				// 			btnName: '详情',
+					showTip: '确认',
-				// 	  }
+				},
-				// 	: undefined,
+				this.$auth.hasPermi('equipment:check-setting:update')
-				this.$auth.hasPermi('equipment:check:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check:delete')
+				{
+					type: 'detail',
+					btnName: '巡检内容详情',
+				},
+				this.$auth.hasPermi('equipment:check-setting:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -88,22 +99,42 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'program', label: '巡检项目', showOverflowtooltip: true },
 				{
-					prop: 'content',
+					prop: 'name',
-					label: '巡检内容',
+					label: '巡检单名称',
-					minWidth: 150,
+					width: 100,
 					showOverflowtooltip: true,
 				},
-				{ prop: 'code', label: '巡检内容编码', showOverflowtooltip: true },
+				{
-				{ prop: 'remark', label: '备注', showOverflowtooltip: true },
+					prop: 'department',
+					label: '部门',
+					width: 100,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'planCheckTime',
+					label: '巡检时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+				},
+				{
+					prop: 'confirmDueTime',
+					label: '确认截止时间',
+					showOverflowtooltip: true,
+					filter: parseTime,
+					// filter: (val) =>
+					// 	val != null && val > 24
+					// 		? `${(val - (val % 24)) / 24}天${val % 24}小时`
+					// 		: `${val}小时`,
+				},
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '巡检内容',
+					label: '巡检单名称',
-					placeholder: '请输入巡检内容',
+					placeholder: '请输入巡检单名称',
-					param: 'content',
+					param: 'name',
 				},
 				{
 					type: 'button',
@@ -115,97 +146,88 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:check:create') ? 'button' : '',
+					type: this.$auth.hasPermi('equipment:check-setting:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
-				// {
-				// 	type: this.$auth.hasPermi('equipment:check:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			rows: [
-				[
 				{
-						input: true,
+					type: 'button',
-						label: '巡检内容编号',
+					btnName: '导出',
-						prop: 'code',
+					name: 'export',
-						url: '/base/equipment-check/getCode',
+					plain: true,
-						rules: [
+					color: 'warning',
-							{
-								required: true,
-								message: '巡检内容编号不能为空',
-								trigger: 'blur',
-							},
-						],
 				},
 				{
-						input: true,
+					type: 'button',
-						label: '巡检项目',
+					btnName: '批量确认',
-						prop: 'program',
+					name: 'batch-confirm',
-						rules: [
+					plain: true,
-							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+					color: 'primary',
-						],
 				},
 			],
-				[
-					{
-						input: true,
-						label: '巡检内容',
-						prop: 'content',
-						rules: [
-							{ required: true, message: '巡检内容不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '备注',
-						prop: 'remark',
-					},
-				],
-			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				content: null,
+				name: null,
+				status: 1,
 			},
 			// 表单参数
-			form: {
+			form: {},
-				code: '',
+			basePath: '/base/equipment-check-order',
-				program: '',
-				id: undefined,
-				content: '',
-			},
-			basePath: '/base/equipment-check',
 			mode: null,
+			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		// this.initSearchBar();
+		this.initSearchBar();
 		this.getList();
 	},
 	methods: {
-		// initSearchBar() {
+		async handleSubmit() {
-		// 	this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+			const id = await this.$refs.add.dataFormSubmit();
-		// 		this.$set(
+
-		// 			this.searchBarFormConfig[0],
+			setTimeout(() => {
-		// 			'selectOptions',
+				this.handleAddDetail(id);
-		// 			data.map((item) => ({
+			}, 500);
-		// 				name: item.name,
+		},
-		// 				id: item.id,
+
-		// 			}))
+		handleAddDetail(id) {
-		// 		);
+			this.detOpen = true;
-		// 	});
+			this.$nextTick(() => {
-		// },
+				this.$refs['content-detail'].init({ id });
+			});
+		},
+
+		successSubmit() {
+			this.cancel();
+			this.getList();
+		},
+
+		initSearchBar() {
+			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
+				this.allSpecialEquipments = data.filter((item) => item.special);
+				this.setSearchBarEquipmentList(data.filter((item) => item.special));
+			});
+		},
+
+		setSearchBarEquipmentList(eqList) {
+			this.$set(
+				this.searchBarFormConfig[2],
+				'selectOptions',
+				eqList.map((item) => ({
+					name: item.name,
+					id: item.id,
+				}))
+			);
+		},
+
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -216,80 +238,102 @@ export default {
 				this.loading = false;
 			});
 		},
+
 		/** 取消按钮 */
 		cancel() {
+			this.$refs.add.reset();
 			this.open = false;
-			this.mode = null;
+			this.title = '';
-			this.reset();
 		},
-		/** 表单重置 */
+
-		reset() {
+		/** search bar click */
-			this.form = {
+		async searchBarClicked(btn) {
-				id: null,
+			switch (btn.btnName) {
-				name: null,
+				/** 批量确认 */
-				content: null,
+				case 'batch-confirm':
-				program: null,
+					if (this.$refs['check-order-list-table'].selectedOrder.length == 0) {
-				remark: null,
+						this.$message.warning('请选择待确认的巡检单');
-			};
+						return;
-			this.resetForm('form');
+					}
+					const res = await this.$axios({
+						url:
+							'/base/equipment-check-order/confirm?confirmPerson=' +
+							this.$store.getters.userId,
+						method: 'put',
+						data: this.$refs['check-order-list-table'].selectedOrder.map(
+							(item) => item.id
+						),
+					});
+					if (res.code == 0) {
+						this.$message.success('确认成功');
+						this.getList();
+					}
+					break;
+			}
 		},
+
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
 			this.getList();
 		},
-		/** 重置按钮操作 */
+
-		resetQuery() {
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			// this.reset();
 			this.open = true;
-			this.title = '添加巡检内容';
+			this.title = '新增巡检单';
+			this.$nextTick(() => {
+				this.$refs.add.init();
+			});
 		},
+
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
-			const id = row.id;
-			this.info({ id }).then((response) => {
-				this.form = response.data;
 			this.open = true;
-				this.title = '修改巡检内容';
+			this.title = '修改巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init(row);
 			});
 		},
-		/** 提交按钮 */
+
-		submitForm() {
+		/** 编辑 */
-			this.$refs['form'].validate((valid) => {
+		handleEdit(row, detail) {
-				if (!valid) {
+			this.editOpen = true;
-					return;
+			this.$nextTick(() => {
-				}
+				this.$refs['content-edit'].init(row, detail ?? false);
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.post(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
 			});
 		},
-		/** 删除按钮操作 */
+
+		/** 确认巡检单 */
+		handleConfirm(row) {
+			const id = row.id;
+			this.$modal
+				.confirm('是否确认巡检单"' + row.name + '"?')
+				.then(() => {
+					return this.$axios({
+						url:
+							'/base/equipment-check-order/confirm?confirmPerson=' +
+							this.$store.getters.userId,
+						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
+						method: 'put',
+						data: [id],
+					});
+				})
+				.then((res) => {
+					this.getList();
+					res.code == 0 && this.$modal.msgSuccess('确认成功');
+					res.code != 0 && this.$modal.msgError('确认失败');
+				})
+				.catch(() => {});
+		},
+
+		/** 删除巡检单 */
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该巡检项目?')
+				.confirm('是否确认删除巡检单"' + row.name + '"?')
-				.then(function () {
+				.then(() => {
-					// return this.del({ id });
+					return this.del({ id });
-					return deleteCheck(id);
 				})
 				.then(() => {
 					this.getList();
@@ -297,29 +341,29 @@ export default {
 				})
 				.catch(() => {});
 		},
-		handleDetail({ id }) {
+
-			this.reset();
+		handleDetail(row) {
-			this.mode = 'detail';
+			this.handleEdit(row, true);
-			this.info({ id }).then((response) => {
-				this.form = response.data;
-				this.open = true;
-				this.title = '修改巡检内容';
-			});
 		},
+
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
-				.confirm('是否确认导出所有巡检内容?')
+				.confirm('是否确认导出所有巡检设置?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						// params: {
+						// 	name: this.queryParams.name,
+						// 	status: 1,
+						// 	special: true,
+						// },
+						responseType: 'blob',
+					});
 				})
 				.then((response) => {
-					this.$download.excel(response, '巡检内容.xls');
+					this.$download.excel(response, '巡检单待确认.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});
@@ -327,8 +371,3 @@ export default {
 	},
 };
 </script>
-
-<style scoped lang="scss">
-.SpecialEquipmentCheckContent {
-}
-</style>

src/views/specialEquipment/check/Record-add.vue

@@ -1,504 +0,0 @@
-<!-- 
-    filename: dialogForm.vue
-    author: liubin
-    date: 2023-10-31 15:55:13
-    description: 
--->
-
-<template>
-	<el-drawer
-		ref="drawer"
-		:visible.sync="visible"
-		:show-close="false"
-		:wrapper-closable="isdetail"
-		class="drawer"
-		size="55%"
-		@closed="$emit('destroy')">
-		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
-		</small-title>
-
-		<el-form
-			ref="dataForm"
-			style="margin: 0 16px; padding: 0 16px"
-			:model="dataForm"
-			:rules="dataRule"
-			label-width="100px"
-			label-position="top"
-			v-loading="formLoading">
-			<el-row :gutter="20">
-				<el-col :span="8">
-					<el-form-item
-						label="设备大类"
-						prop="equipmentCategory"
-						:rules="[
-							{ required: true, message: '请选择设备大类', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.equipmentCategory"
-							:disabled="isdetail"
-							:placeholder="`请选择设备大类`"
-							filterable
-							@change="handleEqTypeChange">
-							<el-option
-								v-for="opt in equipmentTypeOptions"
-								:key="opt.value"
-								:label="opt.label"
-								:value="opt.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item
-						label="设备名称"
-						prop="equipmentId"
-						:rules="[
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.equipmentId"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择设备名称"
-							@change="setConfig">
-							<el-option
-								v-for="dict in equipmentOptions"
-								:key="dict.value"
-								:label="dict.label"
-								:value="dict.value" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<!-- <el-form-item label="物料名称" prop="name">
-						<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
-					</el-form-item> -->
-					<el-form-item
-						label="巡检配置名称"
-						prop="configId"
-						:rules="[
-							{ required: true, message: '巡检配置不能为空', trigger: 'blur' },
-						]">
-						<el-select
-							v-model="dataForm.configId"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择巡检配置"
-							@change="setInspectionContet">
-							<el-option
-								v-for="dict in configList"
-								:key="dict.id"
-								:label="dict.name"
-								:value="dict.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="设备编码" prop="equipmentCode">
-						<el-input
-							v-model="dataForm.equipmentCode"
-							disabled
-							clearable
-							placeholder="请输入设备编码" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="8">
-					<el-form-item label="巡检人" prop="responsible">
-						<el-input
-							v-model="dataForm.responsible"
-							:disabled="isdetail"
-							clearable
-							placeholder="请输入巡检人" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="巡检时间" prop="actualTime">
-						<el-date-picker
-							v-model="dataForm.actualTime"
-							type="datetime"
-							:disabled="isdetail"
-							format="yyyy-MM-dd HH:mm:ss"
-							value-format="timestamp"
-							placeholder="选择巡检时间" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="数据来源" prop="origin">
-						<el-select
-							v-model="dataForm.origin"
-							filterable
-							clearable
-							:disabled="isdetail"
-							style="width: 100%"
-							placeholder="请选择数据来源">
-							<el-option key="1" label="手动" :value="1" />
-							<el-option key="2" label="PDA" :value="2" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
-
-			<el-form-item label="巡检内容">
-				<base-table
-					:table-props="tableProps"
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-data="list" />
-			</el-form-item>
-			<el-form-item label="巡检详情" prop="description">
-				<editor
-					v-if="!isdetail"
-					v-model="dataForm.description"
-					:min-height="150" />
-				<div
-					v-else
-					v-html="dataForm.description"
-					style="padding: 5px; margin-left: 5px; border: 1px solid #dfdfdf" />
-			</el-form-item>
-			<el-form-item label="附件">
-				<FileUpload
-					v-model="file"
-					:limit="1"
-					:f-name="fileName"
-					:disabled="isdetail"
-					@name="setFileName" />
-			</el-form-item>
-		</el-form>
-
-		<div v-if="!isdetail" class="drawer-body__footer">
-			<el-button @click="goback()">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-		</div>
-	</el-drawer>
-</template>
-
-<script>
-import SmallTitle from './SmallTitle.vue';
-import {
-	createCheckLog,
-	updateCheckLog,
-	getcheckConfigByEqList,
-	getEqCheckLog,
-} from '@/api/equipment/base/inspection/record';
-import { getEquipmentAll } from '@/api/base/equipment';
-import Editor from '@/components/Editor';
-import { getCheckDetPage } from '@/api/equipment/base/inspection/settings';
-// import FileUpload from "@/components/FileUpload";
-// import { parseTime } from '../../../../core/mixins/code-filter';
-// import attrAdd from './attr-add';
-import FileUpload from '@/components/FileUpload';
-
-const tableBtn = [
-	{
-		type: 'delete',
-		btnName: '删除',
-	},
-];
-
-const tableProps = [
-	{
-		prop: 'program',
-		label: '巡检项目',
-	},
-	{
-		prop: 'content',
-		label: '巡检内容',
-	},
-];
-
-export default {
-	name: 'AddRecord',
-	model: {
-		prop: 'dataForm',
-		event: 'update',
-	},
-	emits: ['update'],
-	components: { SmallTitle, Editor, FileUpload },
-	props: {
-		// dataForm: {
-		// 	type: Object,
-		// 	default: () => ({}),
-		// },
-		// disabled: {
-		// 	type: Boolean,
-		// 	default: false
-		// },
-	},
-	data() {
-		return {
-			tableBtn,
-			tableProps,
-			addOrUpdateVisible: false,
-			formLoading: true,
-			visible: false,
-			isdetail: false,
-			dataForm: {
-				id: undefined,
-				configId: undefined,
-				equipmentId: undefined,
-				actualTime: undefined,
-				responsible: undefined,
-				description: undefined,
-				equipmentCode: undefined,
-				equipmentCategory: undefined,
-				origin: 1,
-				files: [],
-			},
-			equipmentTypeOptions: [
-				{ label: '安全设备', value: 1 },
-				{ label: '消防设备', value: 2 },
-				{ label: '特种设备', value: 3 },
-			],
-			list: [],
-			eqList: [],
-			configList: [],
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
-			},
-			file: '',
-			fileName: '',
-			dataRule: {
-				responsible: [
-					{ required: true, message: '巡检人不能为空', trigger: 'blur' },
-				],
-				actualTime: [
-					{ required: true, message: '巡检时间不能为空', trigger: 'blur' },
-				],
-			},
-		};
-	},
-	mounted() {
-		this.getDict();
-	},
-	methods: {
-		setFileName(val) {
-			this.fileName = val;
-		},
-		async getDict() {
-			const res = await getEquipmentAll();
-			this.eqList = res.data;
-			this.handleEqTypeChange();
-
-			const configres = await getcheckConfigByEqList();
-			this.configList = configres.data;
-		},
-		async setConfig() {
-			const configres = await getcheckConfigByEqList({
-				equipmentId: this.dataForm.equipmentId,
-			});
-			this.configList = configres.data;
-			this.dataForm.configId =
-				this.configList.filter((it) => {
-					return it.id === this.dataForm.configId;
-				})[0]?.id ?? undefined;
-			this.dataForm.equipmentCode =
-				this.eqList.filter((item) => {
-					return item.id === this.dataForm.equipmentId;
-				})[0]?.code ?? undefined;
-		},
-		goback() {
-			this.$emit('refreshDataList');
-			this.visible = false;
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		/** 模拟透传 ref  */
-		validate(cb) {
-			return this.$refs.dataForm.validate(cb);
-		},
-		resetFields(args) {
-			return this.$refs.dataForm.resetFields(args);
-		},
-		initData() {
-			this.list = [];
-			this.file = '';
-			this.fileName = '';
-		},
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
-			this.visible = true;
-
-			// const scrollContainer = this.$refs.dataForm;
-			// const scrollPosition = scrollContainer.scrollTop;
-			// console.log('12', scrollPosition);
-
-			this.$nextTick(() => {
-				this.$refs['dataForm'].resetFields();
-
-				if (this.dataForm.id) {
-					// 获取巡检记录
-					getEqCheckLog(this.dataForm.id).then((response) => {
-						this.formLoading = false;
-						this.dataForm = response.data;
-						if (this.dataForm.files.length > 0) {
-							this.file = this.dataForm.files[0].fileUrl;
-							this.fileName = this.dataForm.files[0].fileName;
-						}
-						this.dataForm.description = this.dataForm.description || '无';
-						this.setConfig();
-						this.setInspectionContet();
-					});
-				} else {
-					// if (this.urlOptions.isGetCode) {
-					//   this.getCode()
-					// }
-				}
-			});
-			this.formLoading = false;
-		},
-		setInspectionContet() {
-			// 根据巡检配置名称获得巡检配置详细对应巡检内容
-			getCheckDetPage({
-				pageNo: 1,
-				pageSize: 99,
-				configId: this.dataForm.configId,
-			}).then((response) => {
-				this.list = response.data.list;
-				this.listQuery.total = response.data.total;
-			});
-		},
-		// 新增 / 修改
-		addNew(id) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
-			});
-		},
-		handleEqTypeChange(type) {
-			this.dataForm.equipmentId = null;
-			this.dataForm.equipmentCode = null;
-			if (type) {
-				this.equipmentOptions = this.eqList
-					.filter((item) => item.special)
-					.filter((item) => item.specialType === type)
-					.map((item) => ({ label: item.name, value: item.id }));
-			} else
-				this.equipmentOptions = this.eqList
-					// .filter((item) => item.special)
-					.map((item) => ({
-						label: item.name,
-						value: item.id,
-					}));
-			// this.$emit('update', this.form)
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (!valid) {
-					return false;
-				}
-				if (this.file) {
-					const temp = this.file.split(','); // 获取文件个数
-					let arry = [];
-					temp.forEach((item, index) => {
-						arry.push({
-							fileName: this.fileName,
-							fileType: 2,
-							fileUrl: item,
-						});
-					});
-					this.dataForm.files = arry;
-				} else {
-					this.dataForm.files = [];
-				}
-
-				// 修改的提交
-				if (this.dataForm.id) {
-					updateCheckLog(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-					return;
-				}
-				// 添加的提交
-				createCheckLog(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.visible = false;
-					this.$emit('refreshDataList');
-				});
-			});
-		},
-	},
-};
-</script>
-
-<style scoped>
-.el-date-editor,
-.el-select {
-	width: 100%;
-}
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-.action_btn {
-	float: right;
-	margin: 5px 15px;
-	font-size: 14px;
-}
-.add {
-	color: #0b58ff;
-}
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .el-form-item__label {
-	padding: 0;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-}
-.drawer >>> .el-drawer__body {
-	flex: 1;
-	height: 1px;
-	margin: 10px 0;
-	display: flex;
-	flex-direction: column;
-}
-
-.drawer >>> .content {
-	padding: 30px 24px;
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	/* height: 100%; */
-}
-
-.drawer >>> .visual-part {
-	flex: 1 auto;
-	max-height: 76vh;
-	overflow: hidden;
-	overflow-y: scroll;
-	padding-right: 10px; /* 调整滚动条样式 */
-}
-
-.drawer >>> .el-form,
-.drawer >>> .attr-list {
-	padding: 0 16px;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>

src/views/specialEquipment/check/Record-detail.vue

@@ -0,0 +1,636 @@
+<!-- 
+    filename: Record-detail.vue
+    author: liubin
+    date: 2024-2-24 11:38:56
+    description: 
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">查看详情</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<div class="form-part" style="margin-bottom: 32px">
+					<!-- <el-skeleton v-if="!showForm" animated /> -->
+					<el-form
+						class="equipment-info-form"
+						ref="form"
+						:model="form"
+						label-width="200px"
+						label-position="top"
+						v-loading="formLoading">
+						<el-row :gutter="20">
+							<el-col :span="8">
+								<el-form-item label="巡检单名称" prop="name">
+									{{ form.name }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="部门" prop="department">
+									{{ form.department }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="班次" prop="groupClass">
+									{{ form.groupClass }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检人" prop="checkPerson">
+									{{ form.checkPerson }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="巡检时间" prop="planCheckTime">
+									{{ form.planCheckTime | parseTime }}
+								</el-form-item>
+							</el-col>
+
+							<el-col :span="8">
+								<el-form-item label="确认人" prop="confirmPerson">
+									{{ form.confirmPerson }}
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+
+				<SmallTitle>巡检内容</SmallTitle>
+
+				<div style="margin-top: 12px; position: relative">
+					<!-- <SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" /> -->
+				</div>
+
+				<div style="margin-top: 12px; position: relative">
+					<div
+						v-if="!disableEdit"
+						style="position: absolute; top: -40px; right: 0">
+						<el-button @click="handleAddAttr" type="text">
+							<i class="el-icon-plus"></i>
+							添加内容
+						</el-button>
+					</div>
+					<base-table
+						v-loading="attrListLoading"
+						:table-props="attrTableProps"
+						:page="attrQuery?.params.pageNo || 1"
+						:limit="attrQuery?.params.pageSize || 10"
+						:table-data="attrList"
+						@emitFun="handleEmitFun">
+						<method-btn
+							slot="handleBtn"
+							label="操作"
+							v-if="!disableEdit"
+							:method-list="tableBtn"
+							@clickBtn="handleTableBtnClick" />
+					</base-table>
+
+					<!-- 分页组件 -->
+					<pagination
+						v-show="attrTotal > 0"
+						:total="attrTotal"
+						:page.sync="attrQuery.params.pageNo"
+						:limit.sync="attrQuery.params.pageSize"
+						@pagination="getAttrList" />
+				</div>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">
+					{{ disableEdit ? '返回' : '取消' }}
+				</el-button>
+				<el-button
+					v-if="!disableEdit"
+					type="primary"
+					:loading="btnLoading"
+					@click="handleConfirm">
+					保存
+				</el-button>
+			</div>
+		</div>
+
+		<!-- 属性对话框 -->
+		<base-dialog
+			:dialogTitle="attrTitle"
+			:dialogVisible="attrFormVisible"
+			width="35%"
+			:append-to-body="true"
+			custom-class="baseDialog"
+			@close="closeAttrForm"
+			@cancel="closeAttrForm"
+			@confirm="submitAttrForm">
+			<DialogForm
+				v-if="attrFormVisible"
+				ref="attrForm"
+				v-model="attrForm"
+				:rows="attrRows" />
+		</base-dialog>
+	</el-drawer>
+</template>
+
+<script>
+import { parseTime } from '../../core/mixins/code-filter';
+import DialogForm from '../../../components/DialogForm/index.vue';
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle, DialogForm },
+	props: ['dataId'], // dataId 作为一个通用的存放id的字段
+	filters: { parseTime },
+	data() {
+		return {
+			visible: false,
+			btnLoading: false,
+			form: {},
+			formLoading: false,
+			departmentList: [],
+			inspectorOptions: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '巡检项目',
+				},
+				{
+					prop: 'checkResult',
+					label: '巡检结果',
+				},
+			],
+			attrList: [],
+			attrTotal: 0,
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				orderId: null,
+				program: null,
+				checkResult: null,
+				equipmentId: null,
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						select: true,
+						label: '设备名称',
+						prop: 'equipmentId',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检项目',
+						prop: 'program',
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '巡检结果',
+						prop: 'checkResult',
+						rules: [
+							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
+						],
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+					equipmentName: null,
+				},
+			}, // 属性列表的请求
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备名称',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			// syncFileListFlag: null,
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
+				{
+					type: 'delete',
+					btnName: '删除',
+				},
+			],
+			row: null,
+			groupOptions: [],
+			disableEdit: false,
+		};
+	},
+	computed: {
+		departmentOptions() {
+			return (this.departmentList || []).map((item) => ({
+				id: item.id,
+				label: item.name,
+				value: item.id,
+			}));
+		},
+	},
+	mounted() {
+		// this.formLoading = true;
+		// this.getList('department');
+		// this.getList('groupClass');
+		// this.getList('inspector');
+	},
+	methods: {
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.attrQuery.params.equipmentName = btn.equipmentName;
+					this.getAttrList();
+					break;
+			}
+		},
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: '/base/equipment-check-order/update',
+					method: 'put',
+					data: {
+						...this.form,
+						groupClass: this.form.groupClass.join(','),
+						checkPerson: this.form.checkPerson.join(','),
+					},
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+				}
+				this.btnLoading = false;
+				this.$emit('refreshDataList');
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init(row, detail) {
+			if (detail) this.disableEdit = true;
+			this.visible = true;
+			this.row = row;
+			this.getInfo(row);
+			this.getAttrList(row);
+		},
+
+		async getInfo(row) {
+			const res = await this.$axios(
+				'/base/equipment-check-order/get?id=' + row.id
+			);
+			if (res.code == 0) {
+				this.form = res.data;
+				// this.form.groupClass = res.data.groupClass.split(',');
+				// this.form.checkPerson = res.data.checkPerson?.split(',');
+				this.formLoading = false;
+			}
+			this.formLoading = false;
+		},
+
+		async getAttrList(row, condition = {}) {
+			if (!row) row = this.row;
+			this.attrListLoading = true;
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/page',
+				method: 'get',
+				params: {
+					...this.attrQuery.params,
+					orderId: row.id,
+					...condition,
+				},
+			});
+			if (res.code == 0) {
+				this.attrList = res.data.list;
+				this.attrTotal = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		async getList(source = 'department') {
+			const urls = [
+				'/base/core-department/listAll',
+				'/base/group-classes/listAll',
+			];
+			let res;
+			switch (source) {
+				case 'department':
+					res = await this.$axios(urls[0]);
+					this.departmentList = res.data || [];
+					break;
+				case 'inspector':
+					let inspectorList = [];
+					const userlist = await this.$axios({
+						url: '/system/user/page',
+						params: { pageNo: 1, pageSize: 100 },
+					});
+					if (userlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							(userlist.data?.list || []).map((item) => ({
+								label: item.username,
+								value: item.id,
+							}))
+						);
+					}
+					const workerlist = await this.$axios('/base/core-worker/listAll');
+					if (workerlist.code == 0) {
+						inspectorList = inspectorList.concat(
+							workerlist.data.map((item) => ({
+								label: item.name,
+								value: item.id,
+							}))
+						);
+					}
+					this.inspectorOptions = inspectorList;
+					break;
+				case 'groupClass':
+					res = await this.$axios(urls[1]);
+					this.groupOptions = (res.data || []).map((item) => ({
+						label: item.name,
+						value: item.id,
+					}));
+					break;
+			}
+			this.formLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs.form.validate(async (valid) => {
+				if (valid) {
+					await this.$axios({
+						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: 'post', // isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		resetAttrform() {
+			this.attrForm = {
+				id: null,
+				orderId: null,
+				equipmentId: null,
+				program: null,
+				checkResult: null,
+			};
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.row.id) return this.$message.error('请先选中保养记录');
+			this.resetAttrform();
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: '/base/equipment-check-order-det/get',
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑巡检单详情';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该巡检内容?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: '/base/equipment-check-order-det/delete?id=' + attrId,
+						method: 'delete',
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? '/base/equipment-check-order-det/update'
+							: '/base/equipment-check-order-det/create',
+						method: isEdit ? 'put' : 'post',
+						data: { ...this.attrForm, orderId: this.row.id },
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-date-editor,
+.drawer >>> .el-select {
+	width: 100%;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/specialEquipment/check/Record.vue

@@ -11,7 +11,6 @@
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
-			@select-changed="handleSearchBarChange"
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
@@ -25,7 +24,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="120"
+				:width="70"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@@ -38,49 +37,28 @@
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
-		<!-- 对话框(添加 / 修改) -->
+		<RecordDetail
-		<base-dialog
+			ref="record-detail"
-			:dialogTitle="title"
+			v-if="detailOpen"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
-			@confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="true"
-				:rows="rows" />
-		</base-dialog>
-
-		<addRecord
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
 			@refreshDataList="getList"
-			@destroy="addOrUpdateVisible = false" />
+			@destroy="detailOpen = false" />
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import addRecord from './Record-add.vue';
-import {
-	exportCheckLogExcel,
-	deleteEqCheckLog,
-} from '@/api/equipment/base/inspection/record';
 import { parseTime } from '../../core/mixins/code-filter';
+import RecordDetail from './Record-detail.vue';
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 export default {
 	name: 'SpecialEquipmentCheckRecord',
-	components: { addRecord },
+	components: { RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+			detailOpen: false,
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'actualTime', 'specialType'],
+			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@@ -88,57 +66,83 @@ export default {
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('equipment:check-record:update')
+				// this.$auth.hasPermi('equipment:check-record:update')
-					? {
+				// 	? {
-							type: 'edit',
+				// 			type: 'edit',
-							btnName: '修改',
+				// 			btnName: '修改',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
-				this.$auth.hasPermi('equipment:check-record:delete')
+				// this.$auth.hasPermi('equipment:check-record:delete')
-					? {
+				// 	? {
-							type: 'delete',
+				// 			type: 'delete',
-							btnName: '删除',
+				// 			btnName: '删除',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'configName', label: '配置名称' },
+				{ prop: 'name', label: '巡检单名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'department', label: '部门' },
-				{
+				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
-					prop: 'origin',
+				{ prop: 'groupClass', label: '班次' },
-					label: '数据来源',
+				// {
-					filter: (val) => ['', '手动', 'PDA'][val],
+				// 	prop: '_detail',
-				},
+				// 	label: '巡检内容',
-				// { prop: 'sectionName', label: '计划巡检时间' },
+				// 	subcomponent: {
-				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
+				// 		name: 'ViewDetail',
-				// { prop: 'maintenanceDetail', label: '完成状态' },
+				// 		props: ['injectData'],
-				{ prop: 'responsible', label: '巡检人' },
+				// 		data() {
+				// 			return {};
+				// 		},
+				// 		methods: {
+				// 			handleClick() {
+				// 				this.$emit('emitData', {
+				// 					action: this.injectData.label,
+				// 					value: this.injectData,
+				// 				});
+				// 			},
+				// 		},
+				// 		render: function (h) {
+				// 			return (
+				// 				<el-button type="text" onClick={this.handleClick}>
+				// 					详情
+				// 				</el-button>
+				// 			);
+				// 		},
+				// 	},
+				// },
+				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '设备大类',
+				// 	placeholder: '请选择设备大类',
+				// 	param: 'specialType',
+				// 	onchange: true,
+				// 	selectOptions: [
+				// 		{ id: 1, name: '安全设备' },
+				// 		{ id: 2, name: '消防设备' },
+				// 		{ id: 3, name: '特种设备' },
+				// 	],
+				// 	filterable: true,
+				// },
+				// {
+				// 	type: 'select',
+				// 	label: '设备',
+				// 	placeholder: '请选择设备',
+				// 	param: 'equipmentId',
+				// 	filterable: true,
+				// },
 				{
-					type: 'select',
+					type: 'input',
-					label: '设备大类',
+					label: '巡检单名称',
-					placeholder: '请选择设备大类',
+					placeholder: '请输入巡检单名称',
-					param: 'specialType',
+					param: 'name',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '巡检时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -146,7 +150,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'actualTime',
+					param: 'actualCheckTime',
 					// width: 350,
 				},
 				{
@@ -167,137 +171,35 @@ export default {
 					plain: true,
 					color: 'primary',
 				},
-				{
+				// {
-					type: this.$auth.hasPermi('equipment:check-record:create')
+				// 	type: this.$auth.hasPermi('equipment:check-record:create')
-						? 'button'
+				// 		? 'button'
-						: '',
+				// 		: '',
-					btnName: '新增',
+				// 	btnName: '新增',
-					name: 'add',
+				// 	name: 'add',
-					plain: true,
+				// 	plain: true,
-				},
+				// },
-			],
-			rows: [
-				[
-					{
-						input: true,
-						label: '维修单号',
-						prop: 'repairOrderNumber',
-					},
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-						},
-						rules: [
-							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						// TODO: 和班组联动
-						select: true,
-						label: '维修工',
-						prop: 'repairman',
-						// url: '/base/core-equipment/listAll',
-						bind: {
-							filterable: true,
-							clearable: true,
-							multiple: true,
-						},
-						rules: [
-							{ required: true, message: '维修工不能为空', trigger: 'blur' },
-						],
-					},
-					{
-						input: true,
-						label: '联系方式',
-						prop: 'repairmanPhone',
-					},
-				],
-				[
-					{
-						datetime: true,
-						label: '故障发生时间',
-						prop: 'faultTime',
-						rules: [
-							{
-								required: true,
-								message: '故障发生时间不能为空',
-								trigger: 'blur',
-							},
-						],
-						bind: {
-							format: 'yyyy-MM-dd HH:mm:ss',
-							'value-format': 'timestamp',
-							// 'value-format': 'yyyy-MM-dd HH:mm:ss',
-							clearable: true,
-						},
-					},
-					{
-						select: true,
-						label: '故障级别',
-						prop: 'faultLevel', // 数据字典
-						options: this.getDictDatas(this.DICT_TYPE.FAULT_LEVEL),
-					},
-				],
 			],
+
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				maintenanceStatus: null,
-				createTime: null,
-				equipmentId: null,
 				special: true,
-				specialType: null,
+				status: 2,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-log',
+			basePath: '/base/equipment-check-order',
 			mode: null,
-			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		this.initSearchBar();
 		this.getList();
 	},
 	methods: {
-		initSearchBar() {
-			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-				this.allSpecialEquipments = data.filter((item) => item.special);
-				this.setSearchBarEquipmentList(data.filter((item) => item.special));
-			});
-		},
-		// 设备大类改变
-		handleSearchBarChange({ param, value }) {
-			if ('specialType' === param) {
-				if (!value) {
-					this.setSearchBarEquipmentList(this.allSpecialEquipments);
-					return;
-				}
-				this.setSearchBarEquipmentList(
-					this.allSpecialEquipments.filter((item) => item.specialType == value)
-				);
-			}
-		},
-		setSearchBarEquipmentList(eqList) {
-			this.$set(
-				this.searchBarFormConfig[1],
-				'selectOptions',
-				eqList.map((item) => ({
-					name: item.name,
-					id: item.id,
-				}))
-			);
-		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@@ -312,128 +214,44 @@ export default {
 		cancel() {
 			this.open = false;
 			this.mode = null;
-			this.reset();
-		},
-		/** 表单重置 */
-		reset() {
-			this.form = {
-				id: null,
-				repairOrderNumber: null,
-				equipmentId: null,
-				repairman: null,
-				repairmanPhone: null,
-				faultTime: null,
-				faultLevel: null,
-				maintenanceStartTime: null,
-				maintenanceFinishTime: null,
-				faultType: null,
-				repairMode: null,
-				maintenanceStatus: null,
-				faultDetail: null,
-				maintenanceDetail: null,
-				remark: null,
-				files: [
-					// {
-					// 	fileName: '',
-					// 	fileType: '',
-					// 	fileUrl: '',
-					// },
-				],
-			};
-			this.resetForm('form');
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
 			this.getList();
 		},
-		/** 重置按钮操作 */
+
-		resetQuery() {
+		handleDetail(row) {
-			this.resetForm('queryForm');
+			this.detailOpen = true;
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			// this.reset();
-			// this.open = true;
-			// this.title = '添加维修记录';
-			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init();
+				this.$refs['record-detail'].init(row, true);
-			});
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			// this.reset();
-			// const id = row.id;
-			// this.info({ id }).then((response) => {
-			// 	this.form = response.data;
-			// 	this.open = true;
-			// 	this.title = '修改维修记录';
-			// });
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(row.id);
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs['form'].validate((valid) => {
-				if (!valid) {
-					return;
-				}
-				// 修改的提交
-				if (this.form.id != null) {
-					this.put(this.form).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.open = false;
-						this.getList();
-					});
-					return;
-				}
-				// 添加的提交
-				this.post(this.form).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.open = false;
-					this.getList();
-				});
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const id = row.id;
-			this.$modal
-				.confirm(
-					'是否删除设备巡检记录配置名称为"' + row.configName + '"的数据项?'
-				)
-				.then(function () {
-					return deleteEqCheckLog(id);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		handleDetail({ id }) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
+
 		/** 导出按钮操作 */
 		handleExport() {
-			// 处理查询参数
-			let params = { ...this.queryParams };
-			params.pageNo = undefined;
-			params.pageSize = undefined;
 			this.$modal
 				.confirm('是否确认导出所有设备巡检记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportCheckLogExcel(params);
+					return this.$axios({
+						url: '/base/equipment-check-order/export-excel',
+						params: {
+							name: this.queryParams.name,
+							status: 2,
+							special: true,
+						},
+						responseType: 'blob',
+					});
 				})
 				.then((response) => {
+					// const link = document.createElement('a');
+					// link.href = window.URL.createObjectURL(new Blob([response]));
+					// link.download = '设备巡检记录.xls';
+					// document.body.appendChild(link);
+					// link.click();
+					// document.body.removeChild(link);
+					// window.URL.revokeObjectURL(link.href);
 					this.$download.excel(response, '设备巡检记录.xls');
 					this.exportLoading = false;
 				})

src/views/specialEquipment/check/add-or-updata.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
+ * @LastEditors: lb
- * @LastEditTime: 2023-12-01 11:02:43
+ * @LastEditTime: 2024-02-22 11:02:43
  * @Description:
 -->
 <template>
@@ -24,7 +24,7 @@
 					@keyup.enter.native="dataFormSubmit()"
 					label-position="top">
 					<el-row :gutter="20">
-						<el-col :span="8">
+						<!-- <el-col :span="8">
 							<el-form-item label="设备大类" prop="equipmentCategory">
 								<span>
 									{{
@@ -34,21 +34,20 @@
 									}}
 								</span>
 							</el-form-item>
-						</el-col>
+						</el-col> -->
 						<el-col :span="8">
-							<el-form-item label="设备名称" prop="equipmentName">
+							<el-form-item label="巡检单名称" prop="name">
-								{{ dataForm.equipmentName }}
+								{{ dataForm.name }}
-								<!-- <el-input v-model="dataForm.equipmentName" disabled clearable placeholder="请输入设备名称" /> -->
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="设备编码" prop="equipmentCode">
+							<el-form-item label="部门" prop="department">
-								{{ dataForm.equipmentCode }}
+								{{ dataForm.department }}
-								<!-- <el-input
+							</el-form-item>
-									v-model="dataForm.equipmentCode"
+						</el-col>
-									clearable
+						<el-col :span="8">
-									disabled
+							<el-form-item label="巡检时间" prop="planCheckTime">
-									placeholder="请输入设备编码" /> -->
+								{{ dataForm.planCheckTime | parseTime }}
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -87,8 +86,8 @@
 						@clickBtn="handleClick" />
 				</base-table>
 				<pagination
-					v-show="listQuery.total > 0"
+					v-show="checkDetList.total > 0"
-					:total="listQuery.total"
+					:total="checkDetList.total"
 					:page.sync="listQuery.pageNo"
 					:limit.sync="listQuery.pageSize"
 					:page-sizes="[5, 10, 15]"
@@ -103,20 +102,17 @@
 		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			:config-id="dataForm.id"
+			:orderId="dataForm.id"
+			@closed="addOrUpdateVisible = false"
 			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
 <script>
-import {
-	getEqCheck,
-	getCheckDetPage,
-	deleteCheckDet,
-} from '@/api/equipment/base/inspection/settings';
 import SmallTitle from './SmallTitle';
 import attrAdd from './attr-add';
 import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+import { parseTime } from '../../core/mixins/code-filter';
 
 const tableBtn = [
 	{
@@ -129,50 +125,35 @@ const tableBtn = [
 	},
 ];
 const tableProps = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
 	{
 		prop: 'program',
-		label: '巡检项目',
+		label: '检查项目',
-	},
-	{
-		prop: 'content',
-		label: '巡检内容',
-	},
-	{
-		prop: 'code',
-		label: '巡检内容编码',
-	},
-	{
-		prop: 'description',
-		label: '备注',
 	},
 ];
 
 export default {
 	components: { SmallTitle, attrAdd },
+	filters: {
+		parseTime,
+	},
 	data() {
 		return {
 			tableBtn,
 			tableProps,
 			addOrUpdateVisible: false,
-			urlOptions: {
-				infoURL: getEqCheck,
-			},
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
-				total: 0,
 			},
 			dataForm: {
 				id: undefined,
-				code: undefined,
+				name: undefined,
-				name: '',
+				department: undefined,
-				materialType: undefined,
+				planCheckTime: undefined,
-				productType: undefined,
-				area: undefined,
-				specifications: undefined,
-				processTime: 0,
-				remark: undefined,
-				unit: undefined,
 			},
 			checkDetList: [],
 			visible: false,
@@ -204,7 +185,7 @@ export default {
 	methods: {
 		initData() {
 			this.checkDetList.splice(0);
-			this.listQuery.total = 0;
+			this.checkDetList.total = 0;
 		},
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -231,39 +212,35 @@ export default {
 					})
 					.catch(() => {});
 			} else {
-				this.addNew(raw.data.id);
+				console.log('handle click....', raw);
+				this.addNew(raw.data);
 			}
 		},
-		getList() {
+		async getList() {
 			// 获取巡检项目分页
-			getCheckDetPage({
+			const res = await this.$axios({
-				...this.listQuery,
+				url: '/base/equipment-check-order-det/page',
-				configId: this.dataForm.id,
+				params: { ...this.listQuery, orderId: this.dataForm.id },
-			}).then((response) => {
-				this.checkDetList = response.data.list;
-				this.listQuery.total = response.data.total;
 			});
+			if (res.code == 0) {
+				this.checkDetList = res.data.list;
+				this.checkDetList.total = res.data.total;
+			}
 		},
-		init(id, isdetail) {
+		init(row, isdetail) {
 			this.initData();
 			this.isdetail = isdetail || false;
-			this.dataForm.id = id || undefined;
+			this.dataForm.id = row.id;
 			this.visible = true;
 
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
-
 				if (this.dataForm.id) {
-					// 获取设备巡检详情
-					this.urlOptions.infoURL(id).then((response) => {
-						this.dataForm = response.data;
-					});
 					// 获取设备项目列表
+					Object.keys(this.dataForm).forEach((key) => {
+						this.dataForm[key] = row[key];
+					});
 					this.getList();
-				} else {
-					if (this.urlOptions.isGetCode) {
-						this.getCode();
-					}
 				}
 			});
 		},