From 12098c0239fb1f57cf0e86553920c87b355fec13 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 30 三月 2026 16:03:14 +0800
Subject: [PATCH] 成品质检增加检品数量和总数量

---
 src/views/productionManagement/productionOrder/New.vue             |    5 ++---
 src/views/productionManagement/workOrder/index.vue                 |   12 ------------
 src/views/qualityManagement/finalInspection/components/formDia.vue |   19 +++++++++++++------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/views/productionManagement/productionOrder/New.vue b/src/views/productionManagement/productionOrder/New.vue
index 59c04bd..a72528e 100644
--- a/src/views/productionManagement/productionOrder/New.vue
+++ b/src/views/productionManagement/productionOrder/New.vue
@@ -166,9 +166,8 @@
     const product = products[0];
     formState.value.productId = product.productId;
     formState.value.productName = product.productName;
-    const productNameArr = product.productName.split('-');
-    if (productNameArr.length === 3 && productNameArr[0] && productNameArr[1] !== '') {
-      formState.value.manufacturingTeam = productNameArr[1].charAt(0) + '绫昏溅闂�';
+    if (product.parentName === '涓�绫讳骇鍝�') {
+      formState.value.manufacturingTeam = product.parentName.charAt(0) + '绫昏溅闂�';
     }
 
     formState.value.productModelName = product.model;
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 1d3c8a5..78d184d 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -212,18 +212,6 @@
                     @input="handleScrapQtyInput" />
         </el-form-item></el-col>
         <el-col :span="12">
-          <el-form-item label="妫�鍝佹暟閲�"
-                      prop="inspectedQuantity">
-          <el-input v-model.number="reportForm.inspectedQuantity"
-                    type="number"
-                    min="0"
-                    step="1"
-                    style="width: 300px"
-                    placeholder="璇疯緭鍏ユ鍝佹暟閲�"
-                    @input="handleInspectedQuantity"/>
-        </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="鐝粍淇℃伅">
           <el-select v-model="reportForm.userId"
                      style="width: 300px"
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 332b3fd..38902e4 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -49,11 +49,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="UID鐮侊細" prop="uidNo">
-              <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
@@ -62,7 +57,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="鏁伴噺锛�" prop="quantity">
+            <el-form-item label="UID鐮侊細" prop="uidNo">
+              <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="妫�鍝佹暟閲忥細" prop="inspectedQuantity">
+              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inspectedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="鎬绘暟閲忥細" prop="quantity">
               <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
             </el-form-item>
           </el-col>
@@ -186,6 +191,7 @@
     testStandardId: "",
     unit: "",
     uidNo: "",
+    inspectedQuantity: "",
     quantity: "",
     checkCompany: "",
     checkResult: "",
@@ -198,6 +204,7 @@
     productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     testStandardId: [{required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
     unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+    inspectedQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
     checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
     checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],

--
Gitblit v1.9.3