From 6e2a64ec5b6982fa06cce6fa22defe48af474d2c Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 27 四月 2026 17:11:24 +0800
Subject: [PATCH] 阳光印刷Web:  新增工单管理功能并优化生产流程界面

---
 src/views/productionManagement/workOrder/index.vue |   49 ++++++++++++++-----------------------------------
 1 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 177fc8a..c9accb9 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -244,9 +244,9 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="鏈哄彴" prop="machineId">
+            <el-form-item label="鏈哄彴" prop="deviceId">
               <el-select
-                  v-model="reportForm.machineId"
+                  v-model="reportForm.deviceId"
                   placeholder="璇烽�夋嫨鏈哄彴"
                   filterable
                   clearable
@@ -400,8 +400,8 @@
 
 const handleDeviceChange = (val) => {
   const device = deviceOptions.value.find(item => item.id === val)
-  reportForm.machineName = device?.deviceName || ""
-  reportForm.machineId = val || ""
+  reportForm.deviceName = device?.deviceName || ""
+  reportForm.deviceId = val || ""
 }
 
 const normalizeArray = (val) => {
@@ -500,14 +500,6 @@
     label: "宸ュ簭鍚嶇О",
     prop: "processName",
   },
-  // {
-  //   label: "鏈哄彴鍚嶇О",
-  //   prop: "deviceName",
-  // },
-  {
-    label: "鏈哄彴鍚嶇О",
-    prop: "deviceNames",
-  },
   {
     label: "闇�姹傛暟閲�",
     prop: "planQuantity",
@@ -523,11 +515,6 @@
     prop: "completionStatus",
     dataType: "slot",
     slot: "completionStatus",
-    width: "140",
-  },
-  {
-    label: "鎶ュ伐浜�",
-    prop: "userNames",
     width: "140",
   },
   {
@@ -562,10 +549,6 @@
         clickFun: row => {
           handleEdit(row);
         },
-        // 褰撻渶姹傛暟閲忕瓑浜庡畬鎴愭暟閲忕殑鏃跺�欙紝鎸夐挳涓嶅彲鐐瑰嚮
-        disabled: row =>
-            Number(row?.planQuantity) === Number(row?.completeQuantity) ||
-            !canOperateByReportWorker.value(row),
       },
       {
         name: "娴佽浆鍗�",
@@ -584,10 +567,6 @@
         clickFun: row => {
           showReportDialog(row);
         },
-        disabled: row =>
-            Number(row?.planQuantity) <= Number(row?.completeQuantity) ||
-            row.planQuantity <= 0 ||
-            !canOperateByReportWorker.value(row),
       },
       // {
       //   name:"瀹℃牳",
@@ -631,7 +610,7 @@
   userId: "",
   productMainId: null,
   teamList: [],
-  machineId: null,
+  deviceId: null,
 });
 
 // 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
@@ -728,7 +707,7 @@
   endTime: [{required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change"}],
   auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
   teamList: [{required: true, message: "璇烽�夋嫨鐝粍", trigger: "change"}],
-  machineId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
+  deviceId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
 };
 
 // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
@@ -903,10 +882,10 @@
 };
 
 const handleEdit = row => {
-  if (!isCurrentUserReportWorker(row)) {
-    ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶缂栬緫");
-    return;
-  }
+  // if (!isCurrentUserReportWorker(row)) {
+  //   ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶缂栬緫");
+  //   return;
+  // }
   editrow.value = JSON.parse(JSON.stringify(row));
   editDialogVisible.value = true;
 };
@@ -926,10 +905,10 @@
 };
 
 const showReportDialog = row => {
-  if (!isCurrentUserReportWorker(row)) {
-    ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶鎶ュ伐");
-    return;
-  }
+  // if (!isCurrentUserReportWorker(row)) {
+  //   ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶鎶ュ伐");
+  //   return;
+  // }
   currentReportRowData.value = row;
   reportForm.planQuantity = row.planQuantity - row.completeQuantity;
   reportForm.quantity =

--
Gitblit v1.9.3