From a7a9f53ef126659f664f5cbfe4eb10bebdfc4a6a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 19 五月 2026 23:33:56 +0800
Subject: [PATCH] feat: 设备巡检修改

---
 src/views/equipmentManagement/inspectionManagement/components/formDia.vue |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
index 264584f..722c7a1 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -23,6 +23,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="宸℃楠屾敹浜�" prop="inspectionAcceptor">
+              <el-select v-model="form.inspectionAcceptor" placeholder="璇烽�夋嫨" clearable>
+                <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -129,6 +136,8 @@
     taskName: undefined,
     inspector: '',
     inspectorIds: '',
+    inspectionAcceptor: undefined,
+    inspectionAcceptorId: undefined,
     remarks: '',
     frequencyType: '',
     frequencyDetail: '',
@@ -139,6 +148,7 @@
 	rules: {
 		taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
 		inspector: [{ required: true, message: "璇疯緭鍏ュ贰妫�浜�", trigger: "blur" },],
+		inspectionAcceptor: [{ required: true, message: "璇烽�夋嫨宸℃楠屾敹浜�", trigger: "change" },],
 		dateStr: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
 		frequencyType: [{ required: true, message: "璇烽�夋嫨浠诲姟棰戠巼", trigger: "change" }],
 		frequencyDetail: [
@@ -239,6 +249,10 @@
     } else {
       form.value.inspector = []
     }
+    // 纭繚楠屾敹鍏D鍜屽鍚嶆纭洖鏄�
+    if (form.value.inspectionAcceptorId) {
+      form.value.inspectionAcceptor = form.value.inspectionAcceptorId
+    }
     // 纭繚 isActive 鏈夊�硷紝榛樿鍚敤
     if (form.value.isActive === undefined || form.value.isActive === null) {
       form.value.isActive = 1
@@ -283,6 +297,8 @@
     taskName: undefined,
     inspector: '',
     inspectorIds: '',
+    inspectionAcceptor: undefined,
+    inspectionAcceptorId: undefined,
     remarks: '',
     frequencyType: '',
     frequencyDetail: '',
@@ -302,16 +318,25 @@
           form.value.inspectorIds = form.value.inspector.join(',')
           delete form.value.inspector
         }
-        
+
+        // 澶勭悊楠屾敹鍏�
+        if (form.value.inspectionAcceptor) {
+          const selectedUser = userList.value.find(u => u.userId === form.value.inspectionAcceptor)
+          if (selectedUser) {
+            form.value.inspectionAcceptorId = form.value.inspectionAcceptor
+            form.value.inspectionAcceptor = selectedUser.nickName
+          }
+        }
+
         if (form.value.frequencyType === 'WEEKLY') {
           let frequencyDetail = ''
           frequencyDetail = form.value.week + ',' + form.value.time
           form.value.frequencyDetail = frequencyDetail
         }
-        
+
         let res = await userStore.getInfo()
         form.value.registrantId = res.user.userId
-        
+
         await addOrEditTimingTask(form.value)
         cancel()
         proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')

--
Gitblit v1.9.3