From 18a6993750e192fb8af04ce407a72ba20d6024c5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 23 五月 2026 11:50:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光印刷' into dev_天津_阳光印刷

---
 src/views/productionManagement/workOrder/index.vue |   77 ++++++++++++++++++++++----------------
 1 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index c8a13a9..2456dfb 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -192,6 +192,7 @@
                   step="1"
                   placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
                   style="width: 100%"
+                  :class="{ 'over-limit': reportForm.quantity > reportForm.planQuantity }"
                   @input="handleQuantityInput"
               />
             </el-form-item>
@@ -218,6 +219,18 @@
                   step="1"
                   placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
                   @input="handleScrapQtyInput"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="鍔犳斁鏁�" prop="addQty">
+              <el-input
+                  v-model.number="reportForm.addQty"
+                  type="number"
+                  min="0"
+                  step="1"
+                  placeholder="璇疯緭鍏ュ姞鏀炬暟"
               />
             </el-form-item>
           </el-col>
@@ -263,24 +276,24 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="瀹℃牳浜�" prop="auditUserId">
-              <el-select
-                  v-model="reportForm.auditUserId"
-                  placeholder="璇烽�夋嫨瀹℃牳浜�"
-                  clearable
-                  filterable
-                  @change="handleReviewerIdChange"
-              >
-                <el-option
-                    v-for="user in userOptions"
-                    :key="user.userId"
-                    :label="user.nickName"
-                    :value="user.userId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="瀹℃牳浜�" prop="auditUserId">-->
+<!--              <el-select-->
+<!--                  v-model="reportForm.auditUserId"-->
+<!--                  placeholder="璇烽�夋嫨瀹℃牳浜�"-->
+<!--                  clearable-->
+<!--                  filterable-->
+<!--                  @change="handleReviewerIdChange"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                    v-for="user in userOptions"-->
+<!--                    :key="user.userId"-->
+<!--                    :label="user.nickName"-->
+<!--                    :value="user.userId"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
         </el-row>
       </el-form>
@@ -1121,6 +1134,7 @@
   planQuantity: 0,
   quantity: null,
   scrapQty: null,
+  addQty: 0,
   startTime: "",
   endTime: "",
   userName: "",
@@ -1228,7 +1242,7 @@
   scrapQty: [{validator: validateScrapQty, trigger: "blur"}],
   startTime: [{required: true, message: "璇烽�夋嫨寮�濮嬫椂闂�", trigger: "change"}],
   endTime: [{required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change"}],
-  auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
+  // auditUserId: [{required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change"}],
   teamList: [{required: true, message: "璇烽�夋嫨鐝粍", trigger: "change"}],
   deviceId: [{required: true, message: "璇烽�夋嫨璁惧", trigger: "change"}],
 };
@@ -1241,12 +1255,6 @@
   }
   const num = Number(value);
   if (isNaN(num)) {
-    return;
-  }
-  // 濡傛灉瓒呰繃寰呯敓浜ф暟閲�
-  if (num > reportForm.planQuantity) {
-    proxy.$modal.msgWarning("鏈鐢熶骇鏁伴噺涓嶈兘澶т簬寰呯敓浜ф暟閲�");
-    reportForm.quantity = reportForm.planQuantity;
     return;
   }
   // 濡傛灉灏忎簬1锛屾竻闄�
@@ -1456,6 +1464,7 @@
   reportForm.replenishQty = 0;
   reportForm.teamList = [];
   reportForm.scrapQty = 0;
+  reportForm.addQty = 0;
   reportForm.userIds = row.userIds || [];
 
   const ids = (row.userIds || "")
@@ -1464,7 +1473,7 @@
       .filter(Boolean);
 
   reportForm.userIdsList = userTeamOptions.value
-      .filter(item => ids.includes(String(item.userId)))
+      // .filter(item => ids.includes(String(item.userId)))
       .map(item => ({
         userId: item.userId,
         nickName: item.nickName
@@ -1535,12 +1544,12 @@
       return;
     }
 
-    if (quantity > reportForm.planQuantity) {
-      ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
-        confirmButtonText: "纭畾",
-      });
-      return;
-    }
+    // if (quantity > reportForm.planQuantity) {
+    //   ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+    //     confirmButtonText: "纭畾",
+    //   });
+    //   return;
+    // }
 
     const submitData = {
       ...reportForm,
@@ -1805,4 +1814,8 @@
   white-space: normal !important;
   word-break: break-all;
 }
+
+.over-limit .el-input__inner {
+  color: #f56c6c !important;
+}
 </style>

--
Gitblit v1.9.3