From e705ef7b15c04307d6f37b388564dedfaeef4a55 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期二, 21 四月 2026 15:27:09 +0800
Subject: [PATCH] 阳光彩印web 生产报工的机台展示

---
 src/views/productionManagement/productionReporting/index.vue |   95 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f06131a..43f9df6 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,42 @@
       width: 120,
     },
     {
+      label: "宸ュ簭",
+      prop: "process",
+      width: 120,
+    },
+    {
       label: "鎶ュ伐浜哄憳",
       prop: "nickName",
       width: 120,
     },
+     {
+      label: "鏈哄彴",
+      prop: "deviceName",
+      width: 120,
+    },
     {
-      label: "宸ュ簭",
-      prop: "process",
+      label: "瀹℃牳浜�",
+      prop: "auditUserName",
+      width: 120,
+    },
+     {
+      label: "瀹℃牳鐘舵��",
+      prop: "auditStatus",
+      width: 120,
+      dataType: "tag",
+      formatData: val => {
+        const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
+        return statusMap[val] ?? "鏈煡";
+      },
+      formatType: val => {
+        const typeMap = { 0: "info", 1: "success", 2: "danger" };
+        return typeMap[val] ?? "";
+      },
+    },
+    {
+      label: "鏈�缁堝鏍镐汉",
+      prop: "sureAuditUserName",
       width: 120,
     },
     {
@@ -254,23 +294,9 @@
       width: 120,
     },
     {
-      label: "瀹℃牳浜�",
-      prop: "auditUserName",
-      width: 120,
-    },
-    {
-      label: "瀹℃牳鐘舵��",
-      prop: "auditStatus",
-      width: 120,
-      dataType: "tag",
-      formatData: val => {
-        const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
-        return statusMap[val] ?? "鏈煡";
-      },
-      formatType: val => {
-        const typeMap = { 0: "info", 1: "success", 2: "danger" };
-        return typeMap[val] ?? "";
-      },
+      label: "澶囨敞淇℃伅",
+      prop: "auditOpinion",
+      minWidth: 120,
     },
     {
       label: "鍒涘缓鏃堕棿",
@@ -292,20 +318,18 @@
           },
         },
         {
-          name:"瀹℃牳",
-          // 榛勮壊
-          color: "#E6A23C",
-          clickFun: row => {
-            handleAudit(row);
-          },
-          showHide: row => Number(row?.auditStatus) === 0, // 浠呭綋鏈鏍告椂鏄剧ず瀹℃牳鎸夐挳
-        },
-        {
           name: "鍒犻櫎",
           type: "danger",
           clickFun: row => {
             deleteReport(row);
           },
+        },
+        {
+          name:"瀹℃牳",
+          clickFun: row => {
+            handleAudit(row);
+          },
+          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
         },
       ],
     },
@@ -499,12 +523,10 @@
 
    // 瀹℃牳
   const handleAudit = (row) => {
-    if (Number(row?.auditStatus) === 1) {
-      ElMessage.warning("璇ュ伐鍗曞凡瀹℃牳");
-      return;
-    }
     // 閲嶇疆琛ㄥ崟锛岄粯璁ら�夋嫨閫氳繃
     form.value = {
+      sureAuditUserId: userStore.id,
+      sureAuditUserName: userStore.nickName,
       auditResult: "1",
       remarks: "",
     };
@@ -532,9 +554,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),
@@ -544,7 +567,11 @@
       productAudit(auditData)
         .then(res => {
           if (res.code === 200) {
-            proxy.$modal.msgSuccess(auditResult === 1 ? "瀹℃牳閫氳繃" : "瀹℃牳涓嶉�氳繃");
+            if(form.value.auditResult == 1){
+              proxy.$modal.msgSuccess("瀹℃牳閫氳繃");
+            }else{
+              proxy.$modal.msgError("瀹℃牳涓嶉�氳繃");
+            }
             auditDialogVisible.value = false;
             getList();
           } else {

--
Gitblit v1.9.3