From 84d0d2da3d5a00ec2a1612b23bd611cd1321121e Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 17 四月 2026 11:35:57 +0800
Subject: [PATCH] fix(生产管理): 修复工单报产和审核逻辑

---
 src/views/productionManagement/productionReporting/index.vue |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 1f16a83..5e956e8 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>
@@ -180,6 +188,9 @@
   import { productionProductMainListPage, productAudit } from "@/api/productionManagement/productionProductMain.js";
   import { userListNoPageByTenantId } from "@/api/system/user.js";
   import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
+  import useUserStore from "@/store/modules/user";
+
+  const userStore = useUserStore();
 
   const data = reactive({
     searchForm: {
@@ -209,13 +220,18 @@
       width: 120,
     },
     {
+      label: "宸ュ簭",
+      prop: "process",
+      width: 120,
+    },
+    {
       label: "鎶ュ伐浜哄憳",
       prop: "nickName",
       width: 120,
     },
-    {
-      label: "宸ュ簭",
-      prop: "process",
+     {
+      label: "瀹℃牳浜�",
+      prop: "auditUserName",
       width: 120,
     },
      {
@@ -231,6 +247,11 @@
         const typeMap = { 0: "info", 1: "success", 2: "danger" };
         return typeMap[val] ?? "";
       },
+    },
+    {
+      label: "鏈�缁堝鏍镐汉",
+      prop: "sureAuditUserName",
+      width: 120,
     },
     {
       label: "宸ュ崟缂栧彿",
@@ -268,11 +289,6 @@
       width: 120,
     },
     {
-      label: "瀹℃牳浜�",
-      prop: "auditUserName",
-      width: 120,
-    },
-    {
       label: "澶囨敞淇℃伅",
       prop: "auditOpinion",
       minWidth: 120,
@@ -305,11 +321,10 @@
         },
         {
           name:"瀹℃牳",
-          color: "#E6A23C",
           clickFun: row => {
             handleAudit(row);
           },
-          disabled: row => Number(row?.auditStatus) !== 0, // 宸插鏍告椂绂佺敤瀹℃牳鎸夐挳
+          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
         },
       ],
     },
@@ -503,12 +518,10 @@
 
    // 瀹℃牳
   const handleAudit = (row) => {
-    if (Number(row?.auditStatus) === 1) {
-      ElMessage.warning("璇ュ伐鍗曞凡瀹℃牳");
-      return;
-    }
     // 閲嶇疆琛ㄥ崟锛岄粯璁ら�夋嫨閫氳繃
     form.value = {
+      sureAuditUserId: userStore.id,
+      sureAuditUserName: userStore.nickName,
       auditResult: "1",
       remarks: "",
     };
@@ -536,9 +549,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