From c8b65690b946b28b179796fbe2f020e732043c58 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 08 一月 2026 18:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业

---
 src/views/productionManagement/workOrder/index.vue |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 255e317..34b368d 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -61,9 +61,9 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
           <el-button type="primary"
                      @click="handleUpdate">纭畾</el-button>
+          <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
         </span>
       </template>
     </el-dialog>
@@ -164,7 +164,7 @@
       <el-form :model="reportForm"
                label-width="120px">
         <el-form-item label="寰呯敓浜ф暟閲�">
-          <el-input v-model="reportForm.remainingQuantity"
+          <el-input v-model="reportForm.planQuantity"
                     readonly
                     style="width: 300px" />
         </el-form-item>
@@ -184,9 +184,9 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
           <el-button type="primary"
                      @click="handleReport">纭畾</el-button>
+          <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
         </span>
       </template>
     </el-dialog>
@@ -211,10 +211,17 @@
     {
       label: "宸ュ崟缂栧彿",
       prop: "workOrderNo",
+      width: "140",
+    },
+    {
+      label: "鐢熶骇璁㈠崟鍙�",
+      prop: "productOrderNpsNo",
+      width: "140",
     },
     {
       label: "浜у搧鍚嶇О",
       prop: "productName",
+      width: "140",
     },
     {
       label: "瑙勬牸",
@@ -229,20 +236,34 @@
       prop: "processName",
     },
     {
+      label: "寰呯敓浜ф暟閲�",
+      prop: "planQuantity",
+      width: "140",
+    },
+    {
+      label: "璁″垝鐢熶骇鏁伴噺",
+      prop: "quantity",
+      width: "140",
+    },
+    {
       label: "璁″垝寮�濮嬫椂闂�",
       prop: "planStartTime",
+      width: "140",
     },
     {
       label: "璁″垝缁撴潫鏃堕棿",
       prop: "planEndTime",
+      width: "140",
     },
     {
       label: "瀹為檯寮�濮嬫椂闂�",
       prop: "actualStartTime",
+      width: "140",
     },
     {
       label: "瀹為檯缁撴潫鏃堕棿",
       prop: "actualEndTime",
+      width: "140",
     },
     {
       label: "鎿嶄綔",
@@ -268,6 +289,7 @@
           clickFun: row => {
             showReportDialog(row);
           },
+          disabled: row => row.planQuantity <= 0,
         },
       ],
     },
@@ -283,7 +305,7 @@
   const transferCardRowData = ref(null);
   const reportDialogVisible = ref(false);
   const reportForm = reactive({
-    remainingQuantity: 0,
+    planQuantity: 0,
     quantity: 0,
     userName: "",
     workOrderId: "",
@@ -367,7 +389,7 @@
 
   const showReportDialog = row => {
     currentReportRowData.value = row;
-    reportForm.remainingQuantity = 1;
+    reportForm.planQuantity = row.planQuantity;
     reportForm.quantity = row.quantity;
     reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
     reportForm.workOrderId = row.id;
@@ -379,13 +401,19 @@
   };
 
   const handleReport = () => {
+    if (reportForm.planQuantity <= 0) {
+      ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+      });
+      return;
+    }
     if (!reportForm.quantity || reportForm.quantity <= 0) {
       ElMessageBox.alert("璇疯緭鍏ユ湁鏁堢殑鏈鐢熶骇鏁伴噺", "鎻愮ず", {
         confirmButtonText: "纭畾",
       });
       return;
     }
-    if (reportForm.quantity > reportForm.remainingQuantity) {
+    if (reportForm.quantity > reportForm.planQuantity) {
       ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
         confirmButtonText: "纭畾",
       });

--
Gitblit v1.9.3