From 3ee030be4874f7a6ca341cc5d2affe18a06ff970 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 14:05:58 +0800
Subject: [PATCH] 原料页面:增加数量

---
 src/views/qualityManagement/rawMaterial/components/formDia.vue |   22 +++++++++++++++-------
 src/views/qualityManagement/rawMaterial/index.vue              |   12 ++++++------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/qualityManagement/rawMaterial/components/formDia.vue b/src/views/qualityManagement/rawMaterial/components/formDia.vue
index c8ed6c6..9e47f37 100644
--- a/src/views/qualityManagement/rawMaterial/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -34,6 +34,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+              <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="30">
           <el-col :span="12">
@@ -42,8 +47,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="鎵瑰彿锛�" prop="batchNo">
-              <el-input style="width: 100%" v-model="form.batchNo" placeholder="璇疯緭鍏�" clearable/>
+            <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" controls-position="right"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -60,8 +66,8 @@
           <el-col :span="12">
             <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
               <el-select v-model="form.checkResult">
-                <el-option label="鍚堟牸" :value="0"/>
-                <el-option label="涓嶅悎鏍�" :value="1"/>
+                <el-option label="鍚堟牸" :value="1"/>
+                <el-option label="涓嶅悎鏍�" :value="0"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -141,9 +147,10 @@
     productName: "",
     productId: "",
     productModelId: "",
+    quantity: undefined,
     model: "",
     batchNo: "",
-    checkType: "",
+    checkType: undefined,
     checkResult: "",
     unit: "",
     checkUserName: "",
@@ -153,8 +160,9 @@
     checkUserName: [{required: false, message: "璇烽�夋嫨妫�楠屽憳", trigger: "blur"}],
     productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
     productModelId: [{required: true, message: "璇烽�夋嫨浜у搧鍨嬪彿", trigger: "change"}],
-    batchNo: [{required: false, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
-    checkType: [{required: false, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "blur"}],
+    quantity: [{required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur"}],
+    batchNo: [{required: true, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
+    checkType: [{required: true, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "change"}],
     checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
   },
 });
diff --git a/src/views/qualityManagement/rawMaterial/index.vue b/src/views/qualityManagement/rawMaterial/index.vue
index 9994a63..279c80a 100644
--- a/src/views/qualityManagement/rawMaterial/index.vue
+++ b/src/views/qualityManagement/rawMaterial/index.vue
@@ -108,6 +108,10 @@
     prop: "model",
   },
   {
+    label: "鏁伴噺(鍚�)",
+    prop: "quantity",
+  },
+  {
     label: "鎵规鍙�",
     prop: "batchNo",
     width: 120
@@ -122,9 +126,9 @@
     prop: "checkResult",
     dataType: "tag",
     formatType: (params) => {
-      if (params === 1) {
+      if (params === 0) {
         return "danger";
-      } else if (params === 0) {
+      } else if (params === 1) {
         return "success";
       } else {
         return null;
@@ -188,10 +192,6 @@
         disabled: (row) => {
           // 宸叉彁浜ゅ垯绂佺敤
           if (row.inspectState == 1) return true;
-          // 濡傛灉妫�楠屽憳鏈夊�硷紝鍙湁褰撳墠鐧诲綍鐢ㄦ埛鑳芥彁浜�
-          if (row.checkUserName) {
-            return row.checkUserName !== userStore.nickName;
-          }
           return false;
         }
       },

--
Gitblit v1.9.3