From 195770f92f7d739ffba6447fdbf3a3d5b9e009fa Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 24 四月 2026 16:32:57 +0800
Subject: [PATCH] fix(生产订单): 修复绑定工艺路线时的材料规格验证和显示问题

---
 src/views/productionManagement/productionReporting/index.vue |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 52e040a..7275e23 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -134,6 +134,14 @@
       <!-- 瀹℃牳琛ㄥ崟 -->
       <div style=" padding: 15px; border-radius: 4px;">
         <el-form ref="auditFormRef" :model="form" :rules="auditFormRules" label-width="100px">
+          <el-form-item label="鏈�缁堝鏍镐汉" prop="sureAuditUserName">
+            <el-input
+                v-model="form.sureAuditUserName"
+                :rows="4"
+                disabled
+                show-word-limit
+            />
+          </el-form-item>
           <el-form-item label="瀹℃牳缁撴灉" prop="auditResult">
             <el-radio-group v-model="form.auditResult" @change="handleAuditResultChange" size="large">
               <el-radio label=1 >閫氳繃</el-radio>
@@ -218,10 +226,21 @@
     },
     {
       label: "鎶ュ伐浜哄憳",
-      prop: "nickName",
+      prop: "teamNames",
+
       width: 120,
+      dataType: "tag",
+      formatData: val => {
+        if (!val) return [];
+        return val.split(",");
+      }
     },
      {
+      label: "鏈哄彴",
+      prop: "deviceName",
+      width: 120,
+    },
+    {
       label: "瀹℃牳浜�",
       prop: "auditUserName",
       width: 120,
@@ -241,12 +260,17 @@
       },
     },
     {
+      label: "鏈�缁堝鏍镐汉",
+      prop: "sureAuditUserName",
+      width: 120,
+    },
+    {
       label: "宸ュ崟缂栧彿",
       prop: "workOrderNo",
       width: 120,
     },
     {
-      label: "閿�鍞悎鍚屽彿",
+      label: "璁㈠崟缂栧彿",
       prop: "salesContractNo",
       width: 120,
     },
@@ -311,7 +335,7 @@
           clickFun: row => {
             handleAudit(row);
           },
-          disabled: row => Number(row?.auditStatus) !== 0 || row.auditUserId !== userStore.id, // 宸插鏍告垨涓嶆槸鎸囧畾瀹℃牳浜烘椂绂佺敤
+          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
         },
       ],
     },
@@ -505,16 +529,10 @@
 
    // 瀹℃牳
   const handleAudit = (row) => {
-    if (Number(row?.auditStatus) !== 0) {
-      ElMessage.warning("璇ュ伐鍗曞凡瀹℃牳");
-      return;
-    }
-    if (row.auditUserId !== userStore.id) {
-      ElMessage.warning("鎮ㄤ笉鏄宸ュ崟鐨勬寚瀹氬鏍镐汉");
-      return;
-    }
     // 閲嶇疆琛ㄥ崟锛岄粯璁ら�夋嫨閫氳繃
     form.value = {
+      sureAuditUserId: userStore.id,
+      sureAuditUserName: userStore.nickName,
       auditResult: "1",
       remarks: "",
     };
@@ -542,9 +560,10 @@
   };
 
   // 鎻愪氦瀹℃牳
-  const submitAudit = (auditResult) => {
+  const submitAudit = () => {
     auditFormRef.value?.validate().then(() => {
       auditLoading.value = true;
+      console.log(form);
       const auditData = {
         id: auditRowData.value.id,
         auditStatus: Number(form.value.auditResult),

--
Gitblit v1.9.3