From 1423088dc8c981320de0ea9ebd72ed5ab25f6b86 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 19 三月 2026 09:37:55 +0800
Subject: [PATCH] 金鹰黄金 1.设备报修、设备保养添加监督人字段

---
 src/views/equipmentManagement/upkeep/Form/ApproveModal.vue  |    9 ++++++++-
 src/views/equipmentManagement/upkeep/index.vue              |    2 ++
 src/views/equipmentManagement/repair/Modal/ApproveModal.vue |    9 ++++++++-
 src/views/equipmentManagement/repair/index.vue              |    2 ++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentManagement/repair/Modal/ApproveModal.vue b/src/views/equipmentManagement/repair/Modal/ApproveModal.vue
index 9077b84..74f3605 100644
--- a/src/views/equipmentManagement/repair/Modal/ApproveModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/ApproveModal.vue
@@ -38,6 +38,9 @@
             <el-radio :value="3">涓嶉�氳繃</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="鐩戠潱浜�" prop="supervisoryName">
+          <el-input v-model="form.supervisoryName" placeholder="璇疯緭鍏ョ洃鐫d汉" clearable style="width: 100%" />
+        </el-form-item>
       </el-form>
     </div>
   </FormDialog>
@@ -62,10 +65,12 @@
 const formRef = ref();
 const form = ref({
   decision: undefined, // 0 閫氳繃 3 涓嶉�氳繃
+  supervisoryName: undefined, // 鐩戠潱浜�
 });
 
 const rules = {
   decision: [{ required: true, message: "璇烽�夋嫨瀹℃壒缁撴灉", trigger: "change" }],
+  supervisoryName: [{ required: true, message: "璇烽�夋嫨鐩戠潱浜�", trigger: "change" }],
 };
 
 const statusText = (status) => {
@@ -89,6 +94,7 @@
   await nextTick();
   await loadDetail(repairId);
   form.value.decision = undefined;
+  form.value.supervisoryName = undefined;
 };
 
 const handleClose = () => {
@@ -96,12 +102,13 @@
   id.value = undefined;
   detail.value = {};
   form.value.decision = undefined;
+  form.value.supervisoryName = undefined;
 };
 
 const updateStatus = async (status) => {
   loading.value = true;
   try {
-    const { code } = await editRepair({ id: id.value, status });
+    const { code } = await editRepair({ id: id.value, status, supervisoryName: form.value.supervisoryName });
     if (code === 200) {
       ElMessage.success("瀹℃壒鎴愬姛");
       emits("ok");
diff --git a/src/views/equipmentManagement/repair/index.vue b/src/views/equipmentManagement/repair/index.vue
index 86e6848..35391e0 100644
--- a/src/views/equipmentManagement/repair/index.vue
+++ b/src/views/equipmentManagement/repair/index.vue
@@ -227,6 +227,8 @@
         prop: "maintenanceTime",
         formatData: (cell) => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
       },
+      { prop: "auditName", label: "瀹℃牳浜�", width: 120 },
+	{ prop: "supervisoryName", label: "鐩戠潱浜�", width: 120 },
       {
         label: "鐘舵��",
         align: "center",
diff --git a/src/views/equipmentManagement/upkeep/Form/ApproveModal.vue b/src/views/equipmentManagement/upkeep/Form/ApproveModal.vue
index eb74cec..c7a9329 100644
--- a/src/views/equipmentManagement/upkeep/Form/ApproveModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/ApproveModal.vue
@@ -41,6 +41,9 @@
             <el-radio label="瀹℃牳涓嶉�氳繃">瀹℃牳涓嶉�氳繃</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="鐩戠潱浜�" prop="supervisoryName">
+          <el-input v-model="form.supervisoryName" placeholder="璇疯緭鍏ョ洃鐫d汉" clearable style="width: 100%" />
+        </el-form-item>
       </el-form>
     </div>
   </FormDialog>
@@ -64,10 +67,12 @@
 const formRef = ref();
 const form = ref({
   decision: undefined, // 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃
+  supervisoryName: undefined, // 鐩戠潱浜�
 });
 
 const rules = {
   decision: [{ required: true, message: "璇烽�夋嫨瀹℃壒缁撴灉", trigger: "change" }],
+  supervisoryName: [{ required: true, message: "璇烽�夋嫨鐩戠潱浜�", trigger: "change" }],
 };
 
 const statusText = (status) => status || "-";
@@ -87,18 +92,20 @@
   visible.value = true;
   await nextTick();
   form.value.decision = undefined;
+  form.value.supervisoryName = undefined;
 };
 
 const handleClose = () => {
   visible.value = false;
   detail.value = {};
   form.value.decision = undefined;
+  form.value.supervisoryName = undefined;
 };
 
 const updateStatus = async (status) => {
   loading.value = true;
   try {
-    const payload = { ...(detail.value || {}), status };
+    const payload = { ...(detail.value || {}), status, supervisoryName: form.value.supervisoryName };
     const { code } = await deviceMaintenanceTaskEdit(payload);
     if (code === 200) {
       ElMessage.success("瀹℃壒鎴愬姛");
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 6102415..c51395f 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -351,6 +351,8 @@
 	},
 	{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
 	{ prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
+	{ prop: "auditName", label: "瀹℃牳浜�", width: 120 },
+	{ prop: "supervisoryName", label: "鐩戠潱浜�", width: 120 },
   {
     label: "鐘舵��",
     align: "center",

--
Gitblit v1.9.3