解决冲突

2024-03-01 15:28:12 +08:00 · 2024-03-01 15:28:12 +08:00 · f685a65a1f
commit f685a65a1f
parent d8c126fccf 4f14b32a83
47 changed files with 1065 additions and 541 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,7 +1,7 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-29 08:34:48
+ # @LastEditTime: 2024-03-01 15:27:52
 # @LastEditors: zhp
 # @Description:
 ###
--- a/src/api/base/coreWorkOrder.js
+++ b/src/api/base/coreWorkOrder.js
@ -153,3 +153,12 @@ export function createConCoreWOr(data) {
    data: data
  })
 }
+
+// 修改分配产量
+export function updateConCoreWOr(data) {
+  return request({
+    url: '/base/core-order-con-work-order/update',
+    method: 'put',
+    data: data
+  })
+}
--- a/src/api/equipment/base/inspection/record.js
+++ b/src/api/equipment/base/inspection/record.js
@ -1,7 +1,7 @@
 /*
 * @Author: Do not edit
 * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2024-02-26 09:29:53
+ * @LastEditTime: 2024-02-28 18:16:56
 * @LastEditors: DY
 * @Description: 
 */
@ -52,6 +52,17 @@ export function exportCheckLogExcel(query) {
  })
 }

+// 导出设备巡检单记录
+export function exportCheckOrderExcel(query) {
+  return request({
+    url: '/base/equipment-check-order/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+
 // 根据设备获得所有巡检配置列表
 export function getcheckConfigByEqList(query) {
  return request({
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@ -87,6 +87,7 @@ const user = {
    // 获取用户信息
    GetInfo({ commit, state }) {
      return new Promise((resolve, reject) => {
+        console.log('GetInfo')
        getInfo().then(res => {
          // 没有 data 数据，赋予个默认值
          if (!res) {
@ -96,7 +97,7 @@ const user = {
                user: {
                  id: '',
                  avatar: '',
-                  userName: '',
+                  username: '',
                  nickname: ''
                }
              }
@ -113,7 +114,7 @@ const user = {
            commit('SET_ROLES', ['ROLE_DEFAULT'])
          }
          commit('SET_ID', user.id)
-          commit('SET_NAME', user.userName)
+          // commit('SET_NAME', user.username) //无效调用，接口未提供username值
          commit('SET_NICKNAME', user.nickname)
          commit('SET_AVATAR', avatar)
          resolve(res)
--- a/src/utils/equipment-module.js
+++ b/src/utils/equipment-module.js
@ -0,0 +1,4 @@
+import { getDictData } from './dict';
+
+export const groupConnectWorkshop = (groupName, workshopValue) =>
+	`${groupName} - ${getDictData('workshop', workshopValue)?.label}`;
--- a/src/views/base/coreEquipmentLineBind/dialogForm.vue
+++ b/src/views/base/coreEquipmentLineBind/dialogForm.vue
@ -83,20 +83,14 @@
 			<el-col :span="12">
 				<el-form-item
 					label="工段排序"
-					prop="sort"
-					:rules="[
-						{
-							type: 'number',
-							trigger: 'change',
-							message: '请输入正确的数字类型',
-							transform: (val) => Number(val),
-						},
-					]">
-					<el-input
+					prop="sort">
+					<el-input-number
 						v-model="dataForm.sort"
 						clearable
+						controls-position="right"
 						@change="$emit('update', dataForm)"
-						placeholder="请输入工段排序" />
+						placeholder="请输入工段排序"
+						style="width: 100%" />
 				</el-form-item>
 			</el-col>
 		</el-row>
--- a/src/views/base/coreProduct/add-or-updata.vue
+++ b/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-27 15:38:04
+ * @LastEditTime: 2024-02-29 15:01:25
 * @Description:
 -->
 <template>
@ -325,7 +325,7 @@ export default {
 		init(row, isdetail) {
 			this.initData();
 			this.isdetail = isdetail || false;
-			this.dataForm.id = row.id || undefined;
+			this.dataForm.id = row?.id || undefined;
 			this.isedit = row?.id && row?.externalCode ? true : false;
 			console.log('你好', this.isedit)
 			this.visible = true;
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@ -253,7 +253,9 @@ export default {
            if (this.dataForm.priority !== undefined) {
              this.dataForm.priority = String(this.dataForm.priority)
            }
-            this.dataForm.priority 
+            if (this.dataForm.roomNameDict !== undefined) {
+              this.dataForm.roomNameDict = String(this.dataForm.roomNameDict)
+            }
          });
        } else {
          if (this.urlOptions.isGetCode) {
--- a/src/views/base/coreWorkOrder/allocation.vue
+++ b/src/views/base/coreWorkOrder/allocation.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-16 09:14:35
+ * @LastEditTime: 2024-02-29 10:01:52
 * @Description:
 -->
 <template>
@ -41,12 +41,12 @@
 					<el-table-column prop="priority" label="优先级" />
 					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.isallocation"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.isallocation"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">
@ -104,7 +104,7 @@

 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
+import { getConOrderList, updateConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
 import SmallTitle from '../material/SmallTitle';
 // import { parseTime } from '../../core/mixins/code-filter';
 // import attrAdd from './attr-add';
@ -159,8 +159,8 @@ export default {
 					// });
 					// return;
 				}
-					// 添加的提交
-				createConCoreWOr({
+					// 修改的提交
+				updateConCoreWOr({
 					...row,
 					workOrderId: this.dataForm.id
 				}).then((response) => {
@ -173,16 +173,17 @@ export default {
 			}
 		},
 		getList() {
-			// 获取产品Bom详细列表
+			// 获取工单分配详细列表
 			getConOrderList({
 				...this.listQuery,
 				workOrderId: this.dataForm.id
 			}).then((response) => {
 				this.tableData = response.data.map(item => {
 					item.isEdit = false
+					item.isallocation = item.actualAssignmentQuantity ? true : false
 					return item
 				});
-				this.listQuery.total = response.data.total;
+				this.listQuery.total = response.data.length;
 			});
 		},
 		// 构造一行
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-12-26 16:59:25
+ * @LastEditTime: 2024-02-29 15:35:02
 * @Description:
 -->
 <template>
@ -45,7 +45,7 @@
 						</el-col>
 						<el-col :span="3">
 							<div class="blodTip">工单来源</div>
-							<div class="lightTip">{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}</div>
+							<div class="lightTip">{{ dataForm.triggerOrigin === 1 ? 'MES-手动' : dataForm.triggerOrigin === 2 ? 'MES-订单下发' : 'ERP'}}</div>
 						</el-col>
 						<el-col :span="3">
 							<div class="blodTip">所属订单</div>
@ -218,7 +218,7 @@

 <script>
 // import basicAdd from '../../core/mixins/basic-add';
-import { getCoreWO, getMaterialBomPage, getConOrderList, getCoreWOListById } from "@/api/base/coreWorkOrder";
+import { getCoreWO, getCoreWOMaPage, getConOrderList, getCoreWOListById } from "@/api/base/coreWorkOrder";
 // import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
@ -261,8 +261,9 @@ const tableProps = [

 const tableProps1 = [
 	{
-		prop: 'materialName',
-		label: '物料名称'
+		prop: 'material',
+		label: '物料名称',
+		filter: publicFormatter('material')
 	},
 	{
 		prop: 'unit',
@ -270,7 +271,7 @@ const tableProps1 = [
 		filter: publicFormatter('unit_dict')
 	},
 	{
-		prop: 'num',
+		prop: 'remaining',
 		label: '剩余生产预计消耗'
 	},
 ];
@ -431,11 +432,17 @@ export default {
 				// this.listQuery.total = response.data.total;
 			});
 			// 获取预使用原料列表
-			if (this.dataForm.planProductId) {
-				getMaterialBomPage({
-					productId: this.dataForm.planProductId,
+			console.log()
+			if (this.dataForm.id) {
+				getCoreWOMaPage({
+					workOrderId: this.dataForm.id,
+					pageNo: 1,
+					pageSize: 100
 				}).then((response) => {
-					this.materialList = response.data;
+					this.materialList = response.data.records.map((item) => {
+						item.remaining = item?.num * this.dataForm.remainingQuantity || 0
+						return item
+					});
 					// this.listQuery.total = response.data.length;
 				});
 			}
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@ -197,17 +197,7 @@ export default {
 								{
 									name: 'status',
 									type: 'equal',
-									value: 2
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 3
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 4
+									value: 1
 								}
 							]
 						}
@ -241,6 +231,11 @@ export default {
 									name: 'status',
 									type: 'equal',
 									value: 2
+								},
+								{
+									name: 'status',
+									type: 'equal',
+									value: 3
 								}
 							]
 						}
@ -266,23 +261,23 @@ export default {
 								]
 							}
 					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-work-order:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-							showParam: {
-								type: '|',
-								data: [
-									{
-										name: 'status',
-										type: 'equal',
-										value: 1
-									}
-								]
-							}
-					  }
 					: undefined
+          // this.$auth.hasPermi(`base:core-work-order:delete`)
+					// ? {
+					// 		type: 'delete',
+					// 		btnName: '删除',
+					// 		showParam: {
+					// 			type: '|',
+					// 			data: [
+					// 				{
+					// 					name: 'status',
+					// 					type: 'equal',
+					// 					value: 1
+					// 				}
+					// 			]
+					// 		}
+					//   }
+					// : undefined
 			].filter((v)=>v),
 			tableData: [],
 			formConfig: [
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@ -233,10 +233,6 @@ export default {
    // 增加
    emitButtonClick1() {
      let n = this.tableData1.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
      let obj = {}
      obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
      obj.endTime = ''
@ -245,10 +241,6 @@ export default {
    },
    emitButtonClick2() {
      let n = this.tableData2.length
-      // if (n >=3) {
-      //   this.$modal.msgWarning('最多可添加3档计价')
-      //   return false
-      // }
      let obj = {}
      obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
      obj.endUsed = 0
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-27 09:41:00
+ * @LastEditTime: 2024-02-29 14:59:28
 * @Description:
 -->
 <template>
@ -27,13 +27,14 @@
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="巡检单名称" prop="name">
-								<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
+								<el-input v-model="dataForm.name" :disabled="isdetail" placeholder="请输入巡检单名称" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="部门" prop="departmentId">
 								<el-select
 									v-model="dataForm.departmentId"
+									:disabled="isdetail"
 									:placeholder="`请选择部门`">
 									<el-option
 										v-for="opt in departmentOptions"
@ -50,14 +51,14 @@
 									filterable
 									clearable
 									multiple
-									:disabled="isedit"
+									:disabled="isdetail"
 									style="width: 100%"
 									placeholder="请选择班次">
 									<el-option
 										v-for="d in groupOptions"
 										:key="d.id"
-										:label="d.name"
-										:value="d.id" />
+										:label="d.label"
+										:value="d.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@ -70,8 +71,9 @@
 									:placeholder="`请选择巡检人`"
 									multiple
 									clearable
-									:disabled="isedit"
-									filterable>
+									:disabled="isdetail"
+									filterable
+									style="width: 100%">
 									<el-option
 										v-for="opt in inspectorOptions"
 										:key="opt.value"
@ -85,7 +87,7 @@
 								<el-date-picker
 									v-model="dataForm.planCheckTime"
 									type="datetime"
-									:disabled="isedit"
+									:disabled="isdetail"
 									placeholder="请选择巡检时间"
 									value-format="timestamp"></el-date-picker>
 							</el-form-item>
@ -142,7 +144,8 @@
 		<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>
+			<el-button v-if="isshowConfirm" type="primary" @click="confirmIns()">保存</el-button>
+			<el-button v-else type="primary" @click="dataFormSubmit()">保存</el-button>
 		</div>

 		<attr-add
@ -163,6 +166,7 @@ import attrAdd from './attr-add';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import { getCoreDepartmentList } from "@/api/base/coreDepartment";
 import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+import { getDictDataLabel } from '@/utils/dict';

 const tableBtn = [
 	{
@ -205,6 +209,7 @@ export default {
 			tableProps,
 			topBtnConfig,
 			addOrUpdateVisible: false,
+			isshowConfirm: false,
 			urlOptions: {
 			  isGetCode: false,
 				createURL: createCheckOrder,
@ -242,8 +247,8 @@ export default {
        id: undefined,
        name: '',
 				departmentId: undefined,
-				groupClass: undefined,
-        checkPerson: undefined,
+				groupClass: [],
+        checkPerson: [],
 				planCheckTime: undefined
 			},
 			detList: [],
@ -267,7 +272,10 @@ export default {
 		async getDict() {
 			// 班次列表
 			const res = await groupClassesListAll();
-			this.groupOptions = res.data || [];
+			this.groupOptions = res.data.map((item) => {
+				item.label = item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict)
+				return item
+			}) || [];
 			// 部门列表
 			const res1 = await getCoreDepartmentList();
 			this.departmentOptions = res1.data || []
@ -314,6 +322,7 @@ export default {
 		initData() {
 			this.detList.splice(0);
 			this.listQuery.total = 0;
+			this.isshowConfirm = false;
 		},
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@ -373,6 +382,16 @@ export default {
 					// 获取巡检单详情
 					this.urlOptions.infoURL(id).then(response => {
            this.dataForm = response.data
+						if (this.dataForm.groupClass && this.dataForm.groupClass !== ''){
+							this.dataForm.groupClass = response.data?.groupClass.split(',')
+						} else {
+							this.dataForm.groupClass = []
+						}
+						if (this.dataForm.checkPerson && this.dataForm.checkPerson !== '') {
+							this.dataForm.checkPerson = response.data?.checkPerson.split(',')
+						} else {
+							this.dataForm.checkPerson = []
+						}
          });
 					// 获取巡检内容列表
 					this.getList();
@ -398,6 +417,41 @@ export default {
 				this.$refs.addOrUpdate.init(id);
 			});
 		},
+		getConfirmed() {
+			return this.$confirm('是否直接确认巡检记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
+		async confirmIns() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				this.$nextTick(() => {
+					this.getConfirmed().then(confirm => {
+						this.$axios({
+							url:
+								'/base/equipment-check-order/confirm?confirmPerson=' +
+								this.$store.getters.userId,
+								method: 'put',
+								data: [this.dataForm.id],
+						}).then(res =>{
+							if (res.code == 0) {
+								this.visible = false; 
+								this.$emit("refreshDataList");
+								this.$message.success('已确认');
+							}
+						})
+					}).catch(() => {
+						this.visible = false; 
+						this.$emit("refreshDataList");
+						this.$message.success('取消确认');
+					})
+				})
+			});
+		},
 		// 表单提交
    dataFormSubmit() {
      this.$refs["dataForm"].validate((valid) => {
@ -429,6 +483,7 @@ export default {
 				}).then(response => {
          this.$modal.msgSuccess("新增成功");
 					this.idAttrShow = true
+					this.isshowConfirm = true
 					this.dataForm.id = response.data
          // this.visible = false;
          this.$emit("refreshDataList");
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@ -172,24 +172,27 @@ export default {
 		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();
-					}
+					this.$modal
+						.confirm('是否确认所有选中巡检单"?')
+						.then(() => {
+							return this.$axios({
+								url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,
+								method: 'put',
+								data: this.$refs['waiting-list-table'].selectedPlan.map(
+									(item) => item.id
+								),
+							});
+						})
+						.then((res) => {
+							this.getList();
+							res.code == 0 && this.$modal.msgSuccess('确认成功');
+							res.code != 0 && this.$modal.msgError('确认失败');
+						})
+						.catch(() => {});
 					break;
 			}
 		},
@ -328,7 +331,7 @@ export default {
    // },

 		getConfirmed() {
-			return this.$confirm('是否直接确认保养记录', '提示', {
+			return this.$confirm('是否直接确认巡检记录', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@ -388,17 +391,16 @@ export default {
 		},
 		/** 确认 */
 		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],
+							this.$store.getters.userId,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
-						// data: [row.id],
+						data: [row.id],
 					});
 				})
 				.then((res) => {
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@ -63,7 +63,7 @@ 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 { exportCheckOrderExcel, 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');
@ -130,19 +130,25 @@ export default {
 				// { prop: 'responsible', label: '巡检人' },
 			],
 			searchBarFormConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '巡检单名称',
+				// 	placeholder: '请选择巡检单',
+				// 	param: 'name',
+				// 	filterable: true
+				// },
 				{
-					type: 'select',
+					type: 'input',
 					label: '巡检单名称',
-					placeholder: '请选择巡检单',
-					param: 'name',
-					filterable: true
+					placeholder: '请输入巡检单',
+					param: 'name'
 				},
 				// 开始结束时间 
 				{
 					type: 'datePicker',
 					label: '巡检时间',
-					dateType: 'daterange', // datetimerange
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange', // datetimerange
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
@ -257,7 +263,12 @@ export default {
 		};
 	},
 	created() {
-		this.initSearchBar();
+		let end = moment().format('YYYY-MM-DD 08:00:00')
+		const current = new Date()
+    let start = parseTime(new Date(current.getFullYear(), current.getMonth(), current.getDate() - 3, 8, 0, 0))
+    this.searchBarFormConfig[1].defaultSelect = [start, end]
+		this.queryParams.actualCheckTime = [start, end]
+		// this.initSearchBar();
 		this.getList();
 	},
 	methods: {
@ -272,22 +283,23 @@ export default {
 				break;
 			}
 		},
-		initSearchBar() {
-			this.http('/base/core-equipment/page', 'get', {
-				special: false,
-				pageNo: 1,
-				pageSize: 99,
-			}).then(({ data }) => {
-				this.$set(
-					this.searchBarFormConfig[0],
-					'selectOptions',
-					(data?.list || []).map((item) => ({
-						name: item.name,
-						id: item.id,
-					}))
-				);
-			});
-		},
+		// initSearchBar() {
+		// 	this.http('/base/equipment-check-order/page', 'get', {
+		// 		special: false,
+		// 		pageNo: 1,
+		// 		pageSize: 99,
+		// 		status: 2
+		// 	}).then(({ data }) => {
+		// 		this.$set(
+		// 			this.searchBarFormConfig[0],
+		// 			'selectOptions',
+		// 			(data?.list || []).map((item) => ({
+		// 				name: item.name,
+		// 				id: item.id,
+		// 			}))
+		// 		);
+		// 	});
+		// },
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
@ -419,7 +431,7 @@ export default {
 				.confirm('是否确认导出所有设备巡检记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportCheckLogExcel(params);
+					return exportCheckOrderExcel(params);
 				})
 				.then((response) => {
 					this.$download.excel(response, '设备巡检记录.xls');
--- a/src/views/equipment/base/inspection/Settings/add.vue
+++ b/src/views/equipment/base/inspection/Settings/add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-24 20:50:51
+ * @LastEditTime: 2024-02-29 14:58:37
 * @Description:
 -->
 <template>
@ -53,6 +53,7 @@
 						type="datetime"
 						:placeholder="`请选择计划巡检时间`"
 						value-format="timestamp"
+						:default-time="'8:00:00'"
 						style="width: 100%" />
 				</el-form-item>
 			</el-col>
@ -77,8 +78,8 @@
 						<el-option
 							v-for="d in groupOptions"
 							:key="d.id"
-							:label="d.name"
-							:value="d.id" />
+							:label="d.label"
+							:value="d.label" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@ -98,6 +99,7 @@ import basicAdd from '../../../../core/mixins/basic-add';
 import { getCheckOrder, getOrderCode, createCheckOrder, updateCheckOrder } from "@/api/equipment/base/inspection/settings";
 import { getCoreDepartmentList } from "@/api/base/coreDepartment";
 import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+import { getDictDataLabel } from '@/utils/dict';
 // import { getEquipmentAll } from '@/api/base/equipment'

 export default {
@ -139,16 +141,48 @@ export default {
      }
 		};
 	},
+	created() {
+		const currenttime = new Date()
+		this.dataForm.planCheckTime = new Date(currenttime.getFullYear(), currenttime.getMonth(), currenttime.getDate(), 8, 0, 0).getTime()
+		console.log('11', this.dataForm.planCheckTime, currenttime)
+	},
 	mounted() {
 		this.getDict()
 	},
 	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 => {
+            this.dataForm = response.data
+						if (response.data.groupClass === '') {
+							this.dataForm.groupClass = []
+						} else {
+							this.dataForm.groupClass = response.data?.groupClass.split(',') || undefined
+						}
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
 		async getDict() {
 			// 部门列表
 			const res = await getCoreDepartmentList();
 			this.departmentOptions = res.data || [];
 			const res1 = await groupClassesListAll();
-			this.groupOptions = res1.data || [];
+			this.groupOptions = res1.data.map((item) => {
+				item.label = item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict)
+				return item
+			}) || [];
 			// const res = await getEquipmentAll()
 			// this.eqList = res.data
 		},
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -97,11 +97,11 @@ export default {
 				{ prop: 'name', label: '巡检单名称', width: 110, showOverflowtooltip: true },
 				{ prop: 'code', label: '巡检单编码', minWidth: 150, showOverflowtooltip: true },
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
-				{ prop: 'planCheckTime', label: '计划巡检时间', filter: parseTime },
+				{ prop: 'planCheckTime', label: '计划巡检时间', width: 150, filter: parseTime },
 				{ prop: 'confirmTimeLimit', label: '确认时限', showOverflowtooltip: true },
 				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
-				{ prop: 'checkPerson', label: '创建人', minWidth: 150, showOverflowtooltip: true },
-				{ prop: 'createTime', label: '创建时间', filter: parseTime },
+				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
+				{ prop: 'createTime', label: '创建时间', width: 150, filter: parseTime },
 				// { prop: 'responsible', label: '负责人' },
 				{ prop: 'remark', label: '备注' } // TODO: 操作 选项，四个，群里询问
 			],
@ -195,17 +195,20 @@ export default {
 				pageSize: 10,
 				equipmentId: null,
 				name: null,
-				special: false
+				special: false,
+				status: 0
 			},
 			// 表单参数
 			form: {},
 			basePath: '/base/equipment-check-order',
 			mode: null,
+			groupList: []
 		};
 	},
 	created() {
 		this.initSearchBar();
 		this.getList();
+		this.getGroup();
 	},
 	methods: {
 		handleConfirm() {
@ -227,6 +230,11 @@ export default {
 				);
 			});
 		},
+		getGroup() {
+			groupClassesListAll().then(res => {
+				this.groupList = res.data || []
+			})
+		},
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
--- a/src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue
@ -15,10 +15,10 @@
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
-					label="保养计划单号"
+					label="设备保养单号"
 					prop="maintainOrderNumber"
 					:rules="[
-						{ required: true, message: '请输入保养计划单号', trigger: 'blur' },
+						{ required: true, message: '请输入设备保养单号', trigger: 'blur' },
 					]">
 					<el-input
 						v-model="form.maintainOrderNumber"
@ -227,11 +227,6 @@ export default {
 		return {
 			form: {},
 			formLoading: true,
-			equipmentTypeOptions: [
-				{ label: '安全设备', value: 1 },
-				{ label: '消防设备', value: 2 },
-				{ label: '特种设备', value: 3 },
-			],
 			lineList: [],
 			maintainerList: [],
 			departmentList: [],
@ -268,7 +263,7 @@ export default {
 		},
 	},
 	mounted() {
-		// !this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
+		// !this.edit && this.getCode('/base/equipment-maintain-log/getCode');
 		this.getList('maintainer');
 		this.getList('department');
 		this.getList('line');
@ -309,7 +304,7 @@ export default {
 			this.formLoading = true;
 			const response = await this.$axios(url);
 			this.formLoading = false;
-			this.form.code = response.data || '';
+			this.form.maintainOrderNumber = response.data || '';
 		},
 		// initialize
 		async getEquipmentList() {
--- a/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
+++ b/src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue
@ -14,7 +14,7 @@
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
-		<SmallTitle slot="title">编辑</SmallTitle>
+		<SmallTitle slot="title">{{ showTable ? '编辑' : '新增' }}</SmallTitle>

 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
@ -184,49 +184,53 @@
 					</el-form>
 				</div>

-				<SmallTitle>保养内容</SmallTitle>
+				<div v-if="showTable">
+					<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 style="margin-top: 12px; position: relative">
+						<SearchBar
+							:formConfigs="searchBarFormConfig"
+							ref="attr-search-bar"
+							@headBtnClick="handleSearchBarBtnClick" />
 					</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 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>

 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button type="primary" @click="handleConfirm">保存</el-button>
+				<!-- 新增可确认 -->
+				<el-button v-if="isAdd" type="primary" @click="addConfirm">保存</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@ -292,6 +296,8 @@ export default {
 		return {
 			visible: false,
 			btnLoading: false,
+			showTable: false,
+			isAdd: false,
 			form: {},
 			formLoading: false,
 			lineList: [],
@ -387,7 +393,7 @@ export default {
 			attrListLoading: false,
 			// syncFileListFlag: null,
 			tableBtn: [],
-			row: null,
+			row: {},
 		};
 	},
 	computed: {
@ -414,11 +420,19 @@ export default {
 		},
 	},
 	mounted() {
+		!this.edit && this.getCode('/base/equipment-maintain-plan/getCode');
 		this.getList('maintainer');
 		this.getList('department');
 		this.getList('line');
 	},
 	methods: {
+		// getCode
+		async getCode(url) {
+			this.formLoading = true;
+			const response = await this.$axios(url);
+			this.formLoading = false;
+			this.form.maintainOrderNumber = response.data || '';
+		},
 		handleSearchBarBtnClick(btn) {
 			console.log('btn', btn);
 			switch (btn.btnName) {
@ -438,23 +452,106 @@ export default {
 					break;
 			}
 		},
+		async addConfirm() {
+			console.log('11', this.showTable)
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				this.$nextTick(() => {
+					this.getConfirmed().then(confirm => {
+						console.log('111', confirm)
+						this.$axios({
+							url:
+								'/base/equipment-maintain-log/confirm?confirmPerson=' +
+								this.$store.getters.userId,
+								method: 'put',
+								data: [this.form.id],
+						}).then(res =>{
+							if (res.code == 0) {
+								this.visible = false; 
+								this.$emit("refreshDataList");
+								this.$message.success('已确认');
+							}
+						})
+					}).catch(() => {
+						this.visible = false; 
+						this.$emit("refreshDataList");
+						this.$message.success('取消确认');
+					})
+				})
+			});
+		},
+		getConfirmed() {
+			return this.$confirm('是否直接确认保养记录', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			});
+		},
 		async handleConfirm() {
 			this.btnLoading = true;
-			this.$nextTick(async () => {
-				const { code, data } = await this.$axios({
-					url: '/base/equipment-maintain-log/update',  
-					method: 'put',
+			// 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();
+			// });
+			this.$refs['form'].validate((valid) => {
+				if (!valid) {
+					return;
+				}
+				// 修改的提交
+				if (this.form.id != null) {
+					this.$axios({
+						url: '/base/equipment-maintain-log/update',  
+						method: 'put',
+						data: {
+							...this.form,
+							maintainWorker: this.form.maintainWorker.join(','),
+							special: false,
+							relatePlan: 2
+						}
+					}).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.btnLoading = false;
+						this.$emit('refreshDataList');
+						this.handleCancel();
+					});
+					return;
+				}
+
+				// 添加的提交
+				this.$axios({
+					url: '/base/equipment-maintain-log/create',  
+					method: 'post',
 					data: {
 						...this.form,
-						maintainWorker: this.form.maintainWorker.join(',')
-					},
+						maintainWorker: this.form.maintainWorker.join(','),
+						special: false,
+						relatePlan: 2,
+						confirmed: false,
+					}
+				}).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.btnLoading = false;
+					this.form.id = response.data
+					this.row.id = response.data
+					this.showTable = true
+					this.isAdd = true
+					this.$emit('refreshDataList');
+					// this.handleCancel();
 				});
-				if (code == 0) {
-					this.$modal.msgSuccess('更新成功');
-				}
-				this.btnLoading = false;
-				this.$emit('refreshDataList');
-				this.handleCancel();
 			});
 		},

@ -464,15 +561,22 @@ export default {

 		init(row) {
 			this.visible = true;
-			this.row = row;
-			this.getInfo(row);
-			this.getAttrList(row);
+			if (row) {
+				this.row = row;
+				this.showTable = row ? true : false;
+				this.$nextTick(() => {
+					if (row.id) {
+						this.getInfo(row.id);
+						this.getAttrList(row.id);
+					}
+				})
+			}
 		},

-		async getInfo(row) {
+		async getInfo(id) {
 			this.formLoading = true;
 			const res = await this.$axios(
-				'/base/equipment-maintain-log/get?id=' + row.id
+				'/base/equipment-maintain-log/get?id=' + id
 			);
 			if (res.code == 0) {
 				this.form = res.data;
@ -482,15 +586,15 @@ export default {
 			this.formLoading = false;
 		},

-		async getAttrList(row, condition = {}) {
-			if (!row) row = this.row;
+		async getAttrList(id, condition = {}) {
+			if (!id) id = this.row.id;
 			this.attrListLoading = true;
 			const res = await this.$axios({
 				url: '/base/equipment-maintain-log-det/page',
 				method: 'get',
 				params: {
 					...this.attrQuery.params,
-					logId: row.id,
+					logId: id,
 					...condition,
 				},
 			});
--- a/src/views/equipment/base/maintain/Confirm/index.vue
+++ b/src/views/equipment/base/maintain/Confirm/index.vue
@ -258,17 +258,27 @@ export default {
 						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();
-					}
+					this.$modal
+						.confirm('是否确认所有选中保养单"?')
+						.then(() => {
+							return 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();
+					// }
+						})
+						.then((res) => {
+							this.getList();
+							res.code == 0 && this.$modal.msgSuccess('确认成功');
+							res.code != 0 && this.$modal.msgError('确认失败');
+						})
+						.catch(() => {});
 					break;
 			}
 		},
@ -412,9 +422,13 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加待确认保养记录';
+			// this.reset();
+			// this.open = true;
+			// this.title = '添加待确认保养记录';
+			this.openUnplannedDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.unplanned.init();
+			});
 		},

 		getConfirmed() {
@ -478,15 +492,25 @@ export default {
 		},
 		/** 确认 */
 		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();
-			}
+			this.$modal
+				.confirm('是否确认保养单"' + row.maintainOrderNumber + '"?')
+				.then(() => {
+					return this.$axios({
+						url: '/base/equipment-maintain-log/confirm',
+						method: 'put',
+						data: [row.id],
+					});
+			// if (res.code == 0) {
+			// 	this.$message.success('确认成功');
+			// 	this.getList();
+			// }
+				})
+				.then((res) => {
+					this.getList();
+					res.code == 0 && this.$modal.msgSuccess('确认成功');
+					res.code != 0 && this.$modal.msgError('确认失败');
+				})
+				.catch(() => {});
 		},
 		/** 编辑 */
 		async handleEdit(row) {
--- a/src/views/equipment/base/maintain/Monitor/index.vue
+++ b/src/views/equipment/base/maintain/Monitor/index.vue
@ -47,6 +47,7 @@
 		<add-content
 			v-if="addContent"
 			ref="addContent"
+			:plan="true"
 			@refreshDataList="addContent = false" />
 	</div>
 </template>
@ -141,7 +142,7 @@ export default {
 					label: '上次实际保养时间',
 					filter: parseTime,
 				},
-				{ prop: 'nextMaintainTime', label: '下次计划保养时间', filter: parseTime },
+				{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime },
 				{ prop: 'maintainer', label: '计划保养人员' },
 				// { prop: 'equipmentName', label: '设备名称' },
 				// { prop: 'equipmentCode', label: '设备编码' },
@ -219,13 +220,13 @@ export default {
 			params.pageNo = undefined;
 			params.pageSize = undefined;
 			this.$modal
-				.confirm('是否确认导出所有设备保养监控数据项?')
+				.confirm('是否确认导出所有设备保养计划数据项?')
 				.then(() => {
 					this.exportLoading = true;
 					return exportMaintainMonitorExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '设备保养监控.xls');
+					this.$download.excel(response, '设备保养计划.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => { });
--- a/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-27 10:33:31
+ * @LastEditTime: 2024-02-28 19:52:13
 * @Description:
 -->
 <template>
@ -22,7 +22,6 @@
 				:rules="dataRule"
 				ref="dataForm"
 				@keyup.enter.native="dataFormSubmit()"
-				label-width="100px"
 				label-position="top">
 				<el-row :gutter="20">
 					<el-col :span="8">
@ -62,19 +61,19 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="保养频率" prop="maintenancePeriod">
+						<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-form-item label="确认时限(h)" 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-form-item label="保养时长(h)" 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>
@ -220,6 +219,12 @@ export default {
 					// 获取计划详情
 					this.urlOptions.infoURL({ id: this.dataForm.id }).then(response => {
            this.dataForm = response.data
+						if (response.data?.maintainer) {
+							this.dataForm.maintainer = response.data?.maintainer.split(',') || undefined
+						} else {
+							this.$set(this.dataForm, 'maintainer', undefined)
+							this.dataForm.maintainer = undefined
+						}
          });
 					// 获取产品属性列表
 					// this.getList();
--- a/src/views/equipment/base/maintain/PlanConfig/addContent.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/addContent.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-23 19:48:12
+ * @LastEditTime: 2024-02-28 19:37:19
 * @Description:
 -->
 <template>
@ -13,7 +13,7 @@
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
-			{{ '添加内容' }}
+			{{ plan ? '详情' : '添加内容' }}
 		</small-title>
 		<div class="content">
 			<div class="visual-part">
@ -62,7 +62,7 @@
          </template>
        </div>
 				<base-table
-					:table-props="tableProps"
+					:table-props="plan ? tableProps1 : tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
 					:table-data="planList">
@ -85,7 +85,7 @@

 			<div v-if="!isdetail" class="drawer-body__footer">
 				<el-button style="" @click="goback()">取消</el-button>
-				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+				<el-button type="primary" @click="goback()">确定</el-button>
 			</div>

 		</div>
@ -128,13 +128,35 @@ const tableProps = [
 	},
 ];

+const tableProps1 = [
+	{
+		prop: 'equipmentName',
+		label: '设备名称',
+	},
+	{
+		prop: 'program',
+		label: '保养项目',
+	},
+	{
+		prop: 'maintenanceDes',
+		label: '保养描述',
+	},
+];
+
 export default {
 	mixins: [basicAdd],
 	components: { SmallTitle, attrAdd },
+	props: {
+    plan: {
+      type: Boolean,
+      default: false
+    }
+  },
 	data() {
 		return {
 			tableBtn,
 			tableProps,
+			tableProps1,
 			addOrUpdateVisible: false,
 			urlOptions: {
 			  isGetCode: false,
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@ -160,6 +160,7 @@ export default {
 					label: '保养计划名称',
 					placeholder: '请选择计划名称',
 					param: 'maintainPlanId',
+					filterable: true
 				},
 				// 开始结束时间
 				{
@ -339,6 +340,7 @@ export default {
 				startTime: null,
 				relatePlan: null,
 				equipmentId: null,
+				confirmed: true
 			},
 			// 表单参数
 			form: {},
@ -349,20 +351,20 @@ export default {
 	created() {
 		this.initSearchBar();
 		if (this.$route.query) {
-			this.queryParams.equipmentId =
-				this.$route.query?.equipmentId ?? 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.relatePlan = this.$route.query?.relatePlan ?? undefined;
 			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
+			// this.searchBarFormConfig[0].defaultSelect =
+			// 	this.$route.query.equipmentId ?? undefined;
 			this.searchBarFormConfig[0].defaultSelect =
-				this.$route.query.equipmentId ?? undefined;
-			this.searchBarFormConfig[1].defaultSelect =
 				this.$route.query.maintainPlanId ?? undefined;
-			this.searchBarFormConfig[2].defaultSelect =
+			this.searchBarFormConfig[1].defaultSelect =
 				this.$route.query?.createTime ?? undefined;
-			this.searchBarFormConfig[3].defaultSelect =
-				Number(this.$route.query.relatePlan) ?? undefined;
+			// this.searchBarFormConfig[3].defaultSelect =
+			// 	Number(this.$route.query.relatePlan) ?? undefined;
 		}
 		this.getList();
 		if (this.$route.query.addRecord) {
@ -383,26 +385,27 @@ export default {
 			}
 		},
 		initSearchBar() {
-			this.http('/base/core-equipment/page', 'get', {
-				special: false,
-				pageNo: 1,
-				pageSize: 99
-			}).then(({ data }) => {
-				this.$set(
-					this.searchBarFormConfig[0],
-					'selectOptions',
-					(data?.list || []).map((item) => ({
-						name: item.name,
-						id: item.id,
-					}))
-				);
-			});
+			// this.http('/base/core-equipment/page', 'get', {
+			// 	special: false,
+			// 	pageNo: 1,
+			// 	pageSize: 99
+			// }).then(({ data }) => {
+			// 	this.$set(
+			// 		this.searchBarFormConfig[0],
+			// 		'selectOptions',
+			// 		(data?.list || []).map((item) => ({
+			// 			name: item.name,
+			// 			id: item.id,
+			// 		}))
+			// 	);
+			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
+				special: false
 			}).then(({ data }) => {
 				this.$set(
-					this.searchBarFormConfig[1],
+					this.searchBarFormConfig[0],
 					'selectOptions',
 					(data?.list || []).map((item) => ({
 						name: item.name,
@ -544,6 +547,7 @@ export default {
 			let params = { ...this.queryParams };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
+			params.confirmed = true;
 			this.$modal
 				.confirm('是否确认导出所有保养记录?')
 				.then(() => {
--- a/src/views/equipment/base/repair/Repair--add.vue
+++ b/src/views/equipment/base/repair/Repair--add.vue
@ -680,7 +680,8 @@ export default {
 					file.type === 'image/jpg';
 				return isJPG;
 			};
-			return checkFileSize() && checkFileType();
+			return checkFileSize();
+			// return checkFileSize() && checkFileType();
 		},

 		// handlers
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@ -17,7 +17,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
-				:width="180"
+				:width="90"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
@ -111,11 +111,13 @@ export default {
 				{
 					prop: 'maintenanceStartTime',
 					label: '维修开始时间',
+					width: 150, 
 					filter: parseTime,
 				},
 				{
 					prop: 'maintenanceFinishTime',
 					label: '维修结束时间',
+					width: 150, 
 					filter: parseTime,
 				},
 				// { prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
@ -128,7 +130,7 @@ export default {
 				{ prop: 'maintenanceDetail', label: '维修描述', subcomponent: htmls }, // 没有参数
 				// { prop: 'repairman', label: '维修工', minWidth: 100, showOverflowtooltip: true },
 				// { prop: 'repairmanPhone', label: '联系方式', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'remark', label: '备注', minWidth: 120, showOverflowtooltip: true }
+				{ prop: 'remark', label: '备注', minWidth: 90, showOverflowtooltip: true }
 			],
 			searchBarFormConfig: [
 				{
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/src/views/group/monitoring/groupTeamView/index.vue
@ -136,11 +136,11 @@ export default {
      params.teamId = val.data.id
      params.teamName = val.data.name
      this.workOrderList.map(item => {
-        if (this.queryParams.workOrderId === item.id) {
+        if (val.data.workOrderId === item.id) {
          this.workOrderName = item.name
        }
      })
-      params.workOrderId = this.queryParams.workOrderId
+      params.workOrderId = val.data.workOrderId
      params.workOrderName = this.workOrderName
      params.roomNameDict = val.data.roomNameDict
      this.$nextTick(() => {
--- a/src/views/group/monitoring/teamProduction/components/searchArea.vue
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@ -0,0 +1,97 @@
+<template>
+  <el-form :inline="true" class="demo-form-inline">
+    <span class="blue-block"></span>
+    <el-form-item label="班次信息">
+      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
+        <el-option
+          v-for="item in classesArr"
+          :key="item.id"
+          :label="(item.roomName?item.roomName:'')+'-'+item.name"
+          :value="item.id">
+          <span>{{ item.roomName }}-{{item.name}}</span>
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="班组信息">
+      <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="上班时间">
+      <el-date-picker
+        v-model="queryParams.tiemStr"
+        type="daterange"
+        format='yyyy-MM-dd'
+        value-format='yyyy-MM-dd'
+        range-separator='-'
+        style="width: 250px;"
+        size="small">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="small" @click="search">查询</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+export default {
+  name: 'searchArea',
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        classesId: '',
+        teamName: '',
+        tiemStr: ''
+      },
+      classesArr: [],
+    }
+  },
+  mounted() {
+    this.getGroupClass()
+  },
+  methods: {
+    getGroupClass() {
+      groupClassesListAll().then(res => {
+        this.classesArr = res.data || []
+      })
+    },
+    // 查询
+    search() {
+      console.log(this.queryParams)
+      this.$emit('submit', this.queryParams)
+    }
+  }
+}
+</script>
+<style lang="scss">
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+}
+.demo-form-inline {
+  .blue-block {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    margin-top: 10px;
+  }
+}
+</style>
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@ -1,11 +1,12 @@
 <template>
  <div class="app-container">
    <!-- 搜索工作栏 -->
-    <search-bar
+    <search-area @submit="buttonClick"/>
+    <!-- <search-bar
      :formConfigs="formConfig"
      ref="searchBarForm"
      @headBtnClick="buttonClick"
-    />
+    /> -->
    <!-- 列表 -->
    <base-table
      :page="queryParams.pageNo"
@ -34,10 +35,11 @@
  </div>
 </template>
 <script>
-import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
+import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 import { publicFormatter } from '@/utils/dict'
+import SearchArea from './components/searchArea'
 const tableProps = [
  {
    prop: 'roomNameDict',
@ -139,12 +141,11 @@ export default {
      paramVisible: false
    }
  },
-  components: { TeamProductionDetail },
+  components: { TeamProductionDetail, SearchArea },
  mounted() {
    window.addEventListener('resize', () => {
      this.tableH = this.tableHeight(260)
    })
-    this.getGroupClass()
    this.getList()
  },
  methods: {
@ -163,11 +164,6 @@ export default {
        this.total = res.data.total || 0
      })
    },
-    getGroupClass() {
-      groupClassesListAll().then(res => {
-        this.formConfig[0].selectOptions = res.data || []
-      })
-    },
    handleClick(val) {
      console.log(val)
      this.paramVisible = true
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@ -236,13 +236,8 @@ export default {
              btnName: '终止',
              showTip: '终止',
              showParam: {
-                type: '|',
+                type: '&',
                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
                  {
                    type: 'equal',
                    name: 'status',
@ -283,7 +278,7 @@ export default {
                  {
                    type: 'less',
                    name: 'status',
-                    value: 3
+                    value: 2
                  }
                ]
              }
@ -383,9 +378,9 @@ export default {
    },
    // 完成,终止，作废
    handleEditStatus(val, tip, status) {
-      console.log(val)
+      let _this = this
      if (val.orderIdNum > 0) {// 有下级订单
-        this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
+        _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
          type: 'warning',
          distinguishCancelAndClose: true,
          confirmButtonText: '同步',
@ -393,26 +388,26 @@ export default {
        }).then(function() {
          console.log('同步')
          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("操作成功");
+            _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("操作成功");
+              _this.getList();
+              _this.$modal.msgSuccess("操作成功");
            })
          }else {
            return console.log('关闭')
          }
        })
      }else{// 无下级订单
-        this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
+        _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
          return groupOrderStatusSet({ id: val.id, status: status})
        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("操作成功");
+          _this.getList();
+          _this.$modal.msgSuccess("操作成功");
        }).catch(() => {});
      }
    },
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@ -175,16 +175,38 @@ export default {
          }
          if (this.isEdit) {
            //编辑
-            orderUpdate({ ...this.form }).then((res) => {
+            orderUpdate({
+              code: this.form.code,
+              name: this.form.name,
+              planQuantity: this.form.planQuantity,
+              planProductId: this.form.planProductId,
+              priority: this.form.priority,
+              planStartTime: this.form.planStartTime,
+              planFinishTime: this.form.planFinishTime,
+              remark: this.form.remark,
+              id: this.form.id,
+              specifications: this.form.specifications
+            }).then((res) => {
              if (res.code === 0) {
                this.$modal.msgSuccess("操作成功");
                this.$emit('successSubmit')
              }
            })
          } else {
-            this.form.status = 1
-            this.form.triggerOrigin = 1
-            orderCreate({ ...this.form }).then((res) => {
+            orderCreate({
+              code: this.form.code,
+              name: this.form.name,
+              planQuantity: this.form.planQuantity,
+              planProductId: this.form.planProductId,
+              priority: this.form.priority,
+              planStartTime: this.form.planStartTime,
+              planFinishTime: this.form.planFinishTime,
+              remark: this.form.remark,
+              id: this.form.id,
+              specifications: this.form.specifications,
+              status: 1,
+              triggerOrigin: 1
+            }).then((res) => {
              if (res.code === 0) {
                this.$modal.msgSuccess("操作成功");
                this.$emit('successSubmit')
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@ -244,20 +244,15 @@ export default {
            btnName: '终止',
            showTip: '终止',
            showParam: {
-              type: '|',
-              data: [
-                {
-                  type: 'equal',
-                  name: 'status',
-                  value: 2
-                },
-                {
-                  type: 'equal',
-                  name: 'status',
-                  value: 3
-                }
-              ]
-            }
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
          }
        : undefined,
      this.$auth.hasPermi('base:order-manage:cancel')
@ -293,7 +288,7 @@ export default {
                  {
                    type: 'less',
                    name: 'status',
-                    value: 3
+                    value: 2
                  }
                ]
              }
--- a/src/views/specialEquipment/check/CheckOrderListTable.vue
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@ -51,10 +51,7 @@
 				{{ scope.row.planCheckTime | timeFilter }}
 			</template>
 		</el-table-column>
-		<el-table-column
-			v-if="selectedBox[3]"
-			label="班次"
-			prop="groupClass">
+		<el-table-column v-if="selectedBox[3]" label="班次" prop="groupClass">
 			<template slot-scope="scope">
 				{{ scope.row.groupClass || '---' }}
 			</template>
@ -129,7 +126,7 @@ import moment from 'moment';
 export default {
 	name: 'CheckOrderListTable',
 	components: {},
-	props: ['tableData', 'page', 'limit'],
+	props: ['tableData', 'page', 'limit', 'permissionGuard'],
 	filters: {
 		timeFilter: (val) =>
 			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
@ -170,12 +167,7 @@ export default {
 	},
 	methods: {
 		checkSelectable(row, index) {
-			return true;
-			// return (
-			// 	row.relatePlan == 2 ||
-			// 	(row.relatePlan == 1 &&
-			// 		(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
-			// );
+			return this.permissionGuard(row);
 		},
 		handleSelectionChange(val) {
 			this.selectedOrder = val;
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@ -121,6 +121,11 @@ export default {
 					showOverflowtooltip: true,
 					filter: parseTime,
 				},
+				{
+					prop: 'checkPeriod',
+					label: '巡检频率(天/次)',
+					showOverflowtooltip: true,
+				},
 				{
 					width: 144,
 					prop: 'confirmTimeLimit',
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@ -50,6 +50,31 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col>
+				<el-form-item label="巡检人" prop="checkPerson">
+					<el-select
+						v-model="dataForm.checkPerson"
+						:placeholder="`请选择巡检人`"
+						multiple
+						clearable
+						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>
+				<el-form-item label="巡检时间" prop="planCheckTime">
+					<el-date-picker
+						v-model="dataForm.planCheckTime"
+						type="datetime"
+						placeholder="请选择计划开始时间"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
 			<!-- <el-col>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@ -60,6 +85,8 @@
 </template>

 <script>
+import { groupConnectWorkshop } from '@/utils/equipment-module';
+
 export default {
 	name: 'ContentAdd',
 	data() {
@ -69,7 +96,9 @@ export default {
 				id: null,
 				name: null,
 				departmentId: null,
-				groupClass: null,
+				groupClass: [],
+				checkPerson: [],
+				planCheckTime: null,
 				// special: true,
 			},
 			dataRule: {
@ -80,6 +109,7 @@ export default {
 			equipmentOptions: [],
 			groupOptions: [],
 			departmentOptions: [],
+			inspectorOptions: [],
 		};
 	},
 	mounted() {
@ -91,7 +121,9 @@ export default {
 				id: null,
 				name: null,
 				departmentId: null,
-				groupClass: null,
+				groupClass: [],
+				checkPerson: [],
+				planCheckTime: null,
 				// special: true,
 			};
 		},
@ -114,10 +146,35 @@ export default {
 				}
 				if (grp.code == 0) {
 					this.groupOptions = grp.data.map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 				}
+				/** get user list and worker list */
+				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.nickname,
+							value: item.nickname,
+						}))
+					);
+				}
+				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.name,
+						}))
+					);
+				}
+				this.inspectorOptions = inspectorList;
+				/** endget */
 				this.formLoading = false;
 			} catch (err) {
 				this.formLoading = false;
@ -127,6 +184,8 @@ export default {

 		async init(row) {
 			if (!row || !row.id) {
+				/** 新增 */
+				this.dataForm.checkPerson = [this.$store.getters.nickname];
 				return;
 			}
 			const res = await this.$axios({
@ -173,8 +232,8 @@ export default {
 					special: true,
 					status: 1,
 					// status: confirmed ? 2 : 1,
-					groupClass: this.dataForm.groupClass.join(','),
-					checkPerson: this.$store.getters.userId,
+					groupClass: this.dataForm.groupClass?.join(','),
+					checkPerson: this.dataForm.checkPerson?.join(','),
 				},
 			});
 			if (res.code == 0) {
--- a/src/views/specialEquipment/check/Content-add_detail.vue
+++ b/src/views/specialEquipment/check/Content-add_detail.vue
@ -268,8 +268,8 @@ export default {
 			}
 		},

-		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+		getConfirmed(message = '是否直接确认巡检记录') {
+			return this.$confirm(message, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@ -281,25 +281,31 @@ export default {
 				return this.$message.error('请添加巡检内容');
 			}

-			let confirmed = false;
+			/** 询问 是否保存记录 */
 			try {
-				confirmed = await this.getConfirmed();
-			} catch (err) {
-				confirmed = false;
-			}
+				if (await this.getConfirmed('是否保存记录')) {
+					/** 询问 是否直接确认 */
+					try {
+						if (await this.getConfirmed('是否直接确认巡检记录')) {
+							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('已确认');
+							}
+						}

-			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.$emit('refreshDataList');
+						this.handleCancel();
+					} catch (err) {
+						this.handleCancel();
+					}
 				}
-			}
+			} catch (err) {}

 			// this.btnLoading = true;
 			// this.$nextTick(async () => {
@ -319,8 +325,6 @@ export default {
 			// 	this.$emit('refreshDataList');
 			// 	this.handleCancel();
 			// });
-			this.$emit('refreshDataList');
-			this.handleCancel();
 		},

 		handleEmitFun(val) {
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@ -29,7 +29,16 @@
 						v-loading="formLoading">
 						<el-row :gutter="20">
 							<el-col :span="8">
-								<el-form-item label="巡检单名称" prop="name">
+								<el-form-item
+									label="巡检单名称"
+									prop="name"
+									:rules="[
+										{
+											required: true,
+											message: '巡检单名称不能为空',
+											trigger: 'blur',
+										},
+									]">
 									<el-input
 										v-model="form.name"
 										:disabled="disableEdit"
@ -196,6 +205,7 @@

 <script>
 import DialogForm from '../../../components/DialogForm/index.vue';
+import { groupConnectWorkshop } from '@/utils/equipment-module';

 const SmallTitle = {
 	name: 'SmallTitle',
@ -230,7 +240,15 @@ export default {
 		return {
 			visible: false,
 			btnLoading: false,
-			form: {},
+			form: {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				checkPerson: null,
+				planCheckTime: null,
+				remark: null,
+			},
 			formLoading: false,
 			departmentList: [],
 			inspectorOptions: [],
@ -411,24 +429,41 @@ export default {
 					break;
 			}
 		},
+		resetForm() {
+			this.form = {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				checkPerson: null,
+				planCheckTime: null,
+				remark: null,
+			};
+		},
 		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('更新成功');
+				try {
+					const valid = await this.$refs['form'].validate();
+					if (!valid) return;
+					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();
+				} catch (err) {
+					this.btnLoading = false;
 				}
-				this.btnLoading = false;
-				this.$emit('refreshDataList');
-				this.handleCancel();
 			});
 		},

@ -445,14 +480,25 @@ export default {
 		},

 		async getInfo(row) {
-			console.log('row', row);
+			this.resetForm();
 			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(',');
+				Object.keys(this.form).forEach((key) => {
+					if (key == 'groupClass' || key == 'checkPerson') {
+						this.form[key] =
+							(res.data[key] &&
+								res.data[key].trim() != '' &&
+								res.data[key].split(',')) ||
+							[];
+					} else {
+						this.form[key] = res.data[key];
+					}
+				});
+				if (!res.data.checkPerson || res.data.checkPerson.trim() == '') {
+					this.form.checkPerson = [this.$store.getters.nickname];
+				}
 				this.formLoading = false;
 			}
 			this.formLoading = false;
@ -497,8 +543,8 @@ export default {
 					if (userlist.code == 0) {
 						inspectorList = inspectorList.concat(
 							(userlist.data?.list || []).map((item) => ({
-								label: item.username,
-								value: item.id,
+								label: item.nickname,
+								value: item.nickname,
 							}))
 						);
 					}
@ -507,7 +553,7 @@ export default {
 						inspectorList = inspectorList.concat(
 							workerlist.data.map((item) => ({
 								label: item.name,
-								value: item.id,
+								value: item.name,
 							}))
 						);
 					}
@ -516,7 +562,7 @@ export default {
 				case 'groupClass':
 					res = await this.$axios(urls[1]);
 					this.groupOptions = (res.data || []).map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 					break;
@ -524,22 +570,6 @@ export default {
 			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;
 		},
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@ -18,6 +18,7 @@
 			:table-data="list"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
+			:permissionGuard="checkConfirmPermission"
 			@edit="handleEdit"
 			@detail="handleDetail"
 			@delete="handleDelete"
@ -177,6 +178,7 @@ export default {
 				pageSize: 10,
 				name: null,
 				status: 1,
+				special: true,
 			},
 			// 表单参数
 			form: {},
@ -255,10 +257,17 @@ export default {
 						this.$message.warning('请选择待确认的巡检单');
 						return;
 					}
-					const res = await this.$axios({
+					let checkPersonParam = '';
+					if (!row.checkPerson || row.checkPerson.trim() == '') {
+						/** 如有必要，更新巡检人 */
+						checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+					}
+
+					const res = this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` +
+							checkPersonParam,
+						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: this.$refs['check-order-list-table'].selectedOrder.map(
 							(item) => item.id
@ -296,6 +305,16 @@ export default {
 			});
 		},

+		/** 按钮、选择权限 */
+		checkConfirmPermission(row) {
+			const isAdmin = false; // 后续再修改
+			return (
+				!row.confirmDueTime ||
+				row.confirmDueTime >= new Date().getTime() ||
+				isAdmin
+			);
+		},
+
 		/** 编辑 */
 		handleEdit(row, detail) {
 			this.editOpen = true;
@ -310,10 +329,16 @@ export default {
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
+					let checkPersonParam = '';
+					if (!row.checkPerson || row.checkPerson.trim() == '') {
+						/** 如有必要，更新巡检人 */
+						checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+					}
+
 					return this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` +
+							checkPersonParam,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: [id],
@ -349,16 +374,16 @@ export default {
 		/** 导出按钮操作 */
 		handleExport() {
 			this.$modal
-				.confirm('是否确认导出所有巡检设置?')
+				.confirm('是否确认导出所有巡检单?')
 				.then(() => {
 					this.exportLoading = true;
 					return this.$axios({
 						url: '/base/equipment-check-order/export-excel',
-						// params: {
-						// 	name: this.queryParams.name,
-						// 	status: 1,
-						// 	special: true,
-						// },
+						params: {
+							name: this.queryParams.name,
+							status: 1,
+							special: true,
+						},
 						responseType: 'blob',
 					});
 				})
--- a/src/views/specialEquipment/check/Record-detail.vue
+++ b/src/views/specialEquipment/check/Record-detail.vue
@ -30,37 +30,37 @@
 						<el-row :gutter="20">
 							<el-col :span="8">
 								<el-form-item label="巡检单名称" prop="name">
-									{{ form.name }}
+									<div style="">{{ form.name }}</div>
 								</el-form-item>
 							</el-col>

 							<el-col :span="8">
 								<el-form-item label="部门" prop="department">
-									{{ form.department }}
+									<div style="">{{ form.department }}</div>
 								</el-form-item>
 							</el-col>

 							<el-col :span="8">
 								<el-form-item label="班次" prop="groupClass">
-									{{ form.groupClass }}
+									<div style="">{{ form.groupClass || '---' }}</div>
 								</el-form-item>
 							</el-col>

 							<el-col :span="8">
 								<el-form-item label="巡检人" prop="checkPerson">
-									{{ form.checkPerson }}
+									<div style="">{{ form.checkPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>

 							<el-col :span="8">
 								<el-form-item label="巡检时间" prop="planCheckTime">
-									{{ form.planCheckTime | parseTime }}
+									<div style="">{{ form.planCheckTime | parseTime }}</div>
 								</el-form-item>
 							</el-col>

 							<el-col :span="8">
 								<el-form-item label="确认人" prop="confirmPerson">
-									{{ form.confirmPerson }}
+									<div style="">{{ form.confirmPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>
 						</el-row>
@ -324,8 +324,8 @@ export default {
 					method: 'put',
 					data: {
 						...this.form,
-						groupClass: this.form.groupClass.join(','),
-						checkPerson: this.form.checkPerson.join(','),
+						groupClass: this.form.groupClass?.join(','),
+						checkPerson: this.form.checkPerson?.join(','),
 					},
 				});
 				if (code == 0) {
@ -401,8 +401,8 @@ export default {
 					if (userlist.code == 0) {
 						inspectorList = inspectorList.concat(
 							(userlist.data?.list || []).map((item) => ({
-								label: item.username,
-								value: item.id,
+								label: item.nickname,
+								value: item.nickname,
 							}))
 						);
 					}
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@ -15,33 +15,17 @@
 		v-loading="formLoading"
 		label-position="top">
 		<el-row :gutter="20">
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="巡检单名称" prop="name">
 					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
 				</el-form-item>
 			</el-col>
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="巡检单编码" prop="code">
 					<el-input v-model="dataForm.code" placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-			<el-col>
-				<el-form-item
-					label="部门"
-					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
-					<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-col :span="12">
 				<el-form-item label="计划巡检时间" prop="planCheckTime">
 					<el-date-picker
 						v-model="dataForm.planCheckTime"
@ -51,15 +35,24 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+				<el-form-item label="巡检频率（天/次）" prop="checkPeriod">
 					<el-input
-						v-model="dataForm.confirmTimeLimit"
-						:placeholder="`请输入确认时限`" />
-					<!-- <el-date-picker
-						v-model="dataForm.confirmTimeLimit"
-						type="datetime"
-						:placeholder="`请选择确认时限`"
-						value-format="timestamp" /> -->
+						v-model="dataForm.checkPeriod"
+						placeholder="请输入巡检频率(天/次)" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<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 :span="12">
@ -79,6 +72,20 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+					<el-input
+						v-model="dataForm.confirmTimeLimit"
+						:placeholder="`请输入确认时限`" />
+					<!-- <el-date-picker
+						v-model="dataForm.confirmTimeLimit"
+						type="datetime"
+						:placeholder="`请选择确认时限`"
+						value-format="timestamp" /> -->
+				</el-form-item>
+			</el-col>
+
 			<el-col>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@ -89,6 +96,8 @@
 </template>

 <script>
+import { groupConnectWorkshop } from '@/utils/equipment-module';
+
 export default {
 	data() {
 		return {
@ -107,6 +116,12 @@ export default {
 			dataRule: {
 				confirmTimeLimit: [
 					{ required: true, message: '确认时限不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
 				],
 				code: [
 					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' },
@ -117,6 +132,15 @@ export default {
 				planCheckTime: [
 					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' },
 				],
+				checkPeriod: [
+					{ required: true, message: '巡检频率不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
+				],
 			},
 			equipmentOptions: [],
 			groupOptions: [],
@ -137,6 +161,7 @@ export default {
 				confirmTimeLimit: null,
 				groupClass: null,
 				remark: null,
+				checkPeriod: null
 				// special: true,
 			};
 		},
@ -160,7 +185,7 @@ export default {
 				}
 				if (grp.code == 0) {
 					this.groupOptions = grp.data.map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 				}
@ -186,7 +211,10 @@ export default {
 				Object.keys(this.dataForm).forEach((key) => {
 					this.dataForm[key] = res.data[key];
 					if (key == 'groupClass') {
-						this.dataForm.groupClass = res.data.groupClass.split(',')
+						this.dataForm.groupClass =
+							res.data.groupClass &&
+							res.data.groupClass.trim() != '' &&
+							res.data.groupClass.split(',');
 					}
 				});
 			}
--- a/src/views/specialEquipment/maintain/CustomDialogForm.vue
+++ b/src/views/specialEquipment/maintain/CustomDialogForm.vue
@ -23,7 +23,7 @@
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="故障发生时间" prop="faultTime">
-								<span>{{ parseTime(dataForm.faultTime) }}</span>
+								<span style="color: #000a;">{{ parseTime(dataForm.faultTime) }}</span>
 							</el-form-item>
 						</el-col>

@ -43,7 +43,7 @@

 						<el-col :span="8">
 							<el-form-item label="故障级别" prop="faultLevel">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}
 								</span>
 							</el-form-item>
@ -51,7 +51,7 @@

 						<el-col :span="8">
 							<el-form-item label="故障类型" prop="faultType">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('fault-type', dataForm.faultType) }}
 								</span>
 							</el-form-item>
@ -59,19 +59,19 @@

 						<el-col :span="8">
 							<el-form-item label="维修工" prop="repairman">
-								<span>{{ dataForm.repairman }}</span>
+								<span style="color: #000a;">{{ dataForm.repairman }}</span>
 							</el-form-item>
 						</el-col>

 						<el-col :span="8">
 							<el-form-item label="联系方式" prop="repairmanPhone">
-								<span>{{ dataForm.repairmanPhone }}</span>
+								<span style="color: #000a;">{{ dataForm.repairmanPhone }}</span>
 							</el-form-item>
 						</el-col>

 						<el-col :span="8">
 							<el-form-item label="维修方式" prop="repairMode">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}
 								</span>
 							</el-form-item>
@ -88,25 +88,25 @@
 										:disabled="disabled"
 										@delete="!disabled && handleDeleteFile(file, col.prop)" />
 								</div>
-								<p v-else>暂无附件</p>
+								<p v-else style="color: #000a;">暂无附件</p>
 							</el-form-item>
 						</el-col>

 						<el-col :span="8">
 							<el-form-item label="创建时间" prop="createTime">
-								<span>{{ parseTime(dataForm.createTime) }}</span>
+								<span style="color: #000a;">{{ parseTime(dataForm.createTime) }}</span>
 							</el-form-item>
 						</el-col>

 						<el-col :span="8">
 							<el-form-item label="创建人" prop="creator">
-								<span>{{ dataForm.creator }}</span>
+								<span style="color: #000a;">{{ dataForm.creator }}</span>
 							</el-form-item>
 						</el-col>

 						<el-col :span="24">
 							<el-form-item label="备注" prop="remark">
-								<span>{{ dataForm.remark }}</span>
+								<span style="color: #000a;">{{ dataForm.remark || '- 无 -' }}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@ -159,8 +159,7 @@ const uploadedFile = {
 			document.body.removeChild(link);
 		},
 	},
-	mounted() {
-	},
+	mounted() {},
 	render: function (h) {
 		return (
 			<div
@ -338,6 +337,10 @@ export default {
 	overflow-y: auto;
 }

+.drawer-body__content >>> .el-form-item__label {
+	font-weight: 700;
+}
+
 .drawer-body__footer {
 	display: flex;
 	justify-content: flex-end;
--- a/src/views/specialEquipment/maintain/Monitor--detail.vue
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@ -27,7 +27,6 @@
 		<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
--- a/src/views/specialEquipment/maintain/PlanConfig--add.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue
@ -44,10 +44,7 @@
 			</el-col>

 			<el-col :span="12">
-				<el-form-item
-					label="部门"
-					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+				<el-form-item label="部门" prop="departmentId">
 					<el-select
 						v-model="form.departmentId"
 						:placeholder="`请选择部门`"
@ -84,10 +81,7 @@
 			</el-col>

 			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="lineId"
-					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+				<el-form-item label="产线" prop="lineId">
 					<el-select
 						v-model="form.lineId"
 						:placeholder="`请选择产线`"
@ -183,6 +177,7 @@
 					label="保养时长(h)"
 					prop="maintainDuration"
 					:rules="[
+						{ required: true, message: '保养时长不能为空', trigger: 'blur' },
 						{
 							type: 'number',
 							message: '请输入正确的数字',
--- a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
@ -27,7 +27,6 @@
 		<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
@ -130,8 +129,8 @@
 			width="35%"
 			:append-to-body="true"
 			custom-class="baseDialog"
-			@close="closeDetailForm"
-			@cancel="closeDetailForm"
+			@close="detailAddVisible = false"
+			@cancel="detailAddVisible = false"
 			@confirm="submitDetailForm">
 			<DialogForm
 				v-if="detailAddVisible"
@ -238,7 +237,7 @@ export default {
 			detailTableProps: [
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'program', label: '保养项目' },
-				{ prop: 'remark', label: '备注' },
+				// { prop: 'remark', label: '备注' },
 			],
 			detailTableQuery: {
 				pageNo: 1,
@ -318,9 +317,21 @@ export default {
 				value: item.id,
 			}));
 		},
+
+		resetForm() {
+			this.detailForm = {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			};
+		},
+
 		closeDetailForm() {
 			this.detailAddVisible = false;
 		},
+
 		async submitDetailForm() {
 			// validation
 			this.$refs.detailForm.validate(async (valid) => {
@ -411,7 +422,10 @@ export default {
 			}
 		},
 		handleAddDetail() {
-			this.detailAddVisible = true;
+			this.resetForm();
+			this.$nextTick(() => {
+				this.detailAddVisible = true;
+			});
 		},
 	},
 };
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@ -63,7 +63,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
-import { publicFormatter } from '@/utils/dict';
 import PlanConfigAdd from './PlanConfig--add.vue';
 import PlanConfigAddContent from './PlanConfig--addContent.vue';

@ -102,8 +101,13 @@ export default {
 				{ prop: 'name', label: '计划名称' },
 				{ prop: 'departmentName', label: '部门' },
 				{ width: 144, prop: 'lineName', label: '产线名' },
-				{ width: 144, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
-				{ width: 144, prop: 'firstMaintenanceTime', label: '首次保养时间' },
+				{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
+				{
+					width: 180,
+					prop: 'firstMaintenanceTime',
+					label: '首次保养时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
 				{ width: 144, prop: 'maintainDuration', label: '保养时长' },
 				{ prop: 'maintainer', label: '计划保养人员' },
 				{
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@ -29,7 +29,7 @@
 			</el-col>

 			<!-- 产线名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="产线名" prop="lineId">
 					<el-select
 						v-model="formFilters.lineId"
@ -45,10 +45,10 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->

 			<!-- 工段名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="工段名" prop="sectionId">
 					<el-select
 						v-model="formFilters.sectionId"
@ -64,7 +64,7 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->

 			<!-- 设备名称  -->
 			<el-col :span="8">
@ -116,16 +116,7 @@

 			<!-- 故障级别  -->
 			<el-col :span="8">
-				<el-form-item
-					label="故障级别"
-					prop="faultLevel"
-					:rules="[
-						{
-							required: true,
-							message: '故障级别不能为空',
-							trigger: 'blur',
-						},
-					]">
+				<el-form-item label="故障级别" prop="faultLevel">
 					<el-select
 						v-model="form.faultLevel"
 						placeholder="故障级别"
@ -216,12 +207,7 @@

 			<!-- 维修工  -->
 			<el-col :span="8">
-				<el-form-item
-					label="维修工"
-					prop="repairman"
-					:rules="[
-						{ required: true, message: '维修工不能为空', trigger: 'blur' },
-					]">
+				<el-form-item label="维修工" prop="repairman">
 					<el-select
 						v-model="form.repairman"
 						@change="$emit('update', form)"
@ -241,12 +227,7 @@

 			<!-- 联系方式  -->
 			<el-col :span="8">
-				<el-form-item
-					label="联系方式"
-					prop="repairmanPhone"
-					:rules="[
-						{ required: true, message: '联系方式不能为空', trigger: 'blur' },
-					]">
+				<el-form-item label="联系方式" prop="repairmanPhone">
 					<el-input
 						v-model="form.repairmanPhone"
 						@change="$emit('update', form)"
@ -257,16 +238,7 @@

 			<!-- 维修方式 - 数据字典  -->
 			<el-col :span="8">
-				<el-form-item
-					label="维修方式"
-					prop="repairMode"
-					:rules="[
-						{
-							required: true,
-							message: '维修方式不能为空',
-							trigger: 'blur',
-						},
-					]">
+				<el-form-item label="维修方式" prop="repairMode">
 					<el-select
 						v-model="form.repairMode"
 						placeholder="维修方式"
@ -308,7 +280,7 @@
 			</el-col>

 			<!-- 备注  -->
-			<el-col :span="24">
+			<el-col :span="8">
 				<el-form-item label="备注" prop="remark">
 					<el-input
 						v-model="form.remark"
@ -544,16 +516,16 @@ export default {
 		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.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 ?? [];
@ -591,9 +563,9 @@ export default {
 			this.formLoading = true;
 			await this.getCode();
 			await this.initEquipment();
-			await this.initLines();
+			// await this.initLines();
 			await this.initWorker();
-			await this.initSections();
+			// await this.initSections();
 			this.formLoading = false;
 			this.isInit = false;
 			this.setInitWorker();
@ -602,36 +574,37 @@ export default {
 		/** 设置默认维修工为用户自己 */
 		setInitWorker() {
 			/** 获取用户自身id */
-			const userId = this.$store.getters.userId;
+			const nickname = this.$store.getters.nickname;
 			this.$nextTick(() => {
-				this.form.repairman = [userId];
+				this.form.repairman = [nickname];
 			});
 		},

 		/** 获取产线 */
-		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 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 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(type = 'special-equipment') {
 			const response = await this.$axios('/base/core-equipment/listAll');
@ -642,8 +615,8 @@ export default {
 					label: item.name,
 					value: item.id,
 				}));
-			this.equipmentOptions = equipmentOptions;
-			this.allSpeicalEquipments = equipmentOptions;
+			this.equipmentOptions = [...equipmentOptions];
+			this.allSpeicalEquipments = [...equipmentOptions];
 		},
 		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
 		async initWorker() {
@ -658,8 +631,8 @@ export default {
 			});
 			list = list.concat(
 				(userList.data?.list || []).map((item) => ({
-					label: item.username,
-					value: item.id,
+					label: item.nickname,
+					value: item.nickname,
 				}))
 			);
 			/** worker */
@ -669,7 +642,7 @@ export default {
 			list = list.concat(
 				(workerList.data || []).map((item) => ({
 					label: item.name,
-					value: item.id,
+					value: item.name,
 				}))
 			);
 			/** setting */
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@ -42,6 +42,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
+			width="60%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@ -146,6 +147,7 @@ export default {
 					label: '故障明细',
 					minWidth: 120,
 					showOverflowtooltip: true,
+					subcomponent: htmls,
 				},
 				{
 					prop: 'maintenanceStartTime',
@ -172,6 +174,7 @@ export default {
 					label: '维修描述',
 					showOverflowtooltip: true,
 					width: 110,
+					subcomponent: htmls,
 				},
 				{
 					prop: 'remark',