From 79a53d2f9a9a1fab7a1d889c27b8d2e2f6db0fe2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 四月 2026 10:37:01 +0800
Subject: [PATCH] fix: 出厂检修改

---
 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 596026d..067f760 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -90,16 +90,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="妫�楠岀敤绮夊墏/娑叉儏鍐碉細" prop="inspectMaterialCondition">
-              <el-radio-group v-model="form.inspectMaterialCondition">
-                <el-radio label="绮夊墏">绮夊墏</el-radio>
-                <el-radio label="娑蹭綋">娑蹭綋</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
             <el-form-item label="鐢熶骇鏃ユ湡锛�" prop="productionDate">
               <el-date-picker
                   v-model="form.productionDate"
@@ -113,7 +103,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="鏈夋晥鏈燂細" prop="validityDate">
               <el-date-picker
                   v-model="form.validityDate"
@@ -125,21 +115,29 @@
                   style="width: 100%"
               />
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="UID鐮侊細" prop="uidNo">
               <el-input v-model="form.uidNo" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
-              <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
+            <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+              <el-input
+                v-model="form.batchNo"
+                placeholder="璇疯緭鍏�"
+                clearable
+                :disabled="operationType === 'edit'"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30">
+          <el-col :span="12">
+            <el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
+              <el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
               <el-select v-model="form.checkResult">
@@ -251,6 +249,15 @@
 
 const dialogFormVisible = ref(false);
 const operationType = ref('')
+
+const validateBatchNo = (rule, value, callback) => {
+  if (value === undefined || value === null || String(value).trim() === '') {
+    callback(new Error('璇疯緭鍏ユ壒鍙�'));
+    return;
+  }
+  callback();
+};
+
 const data = reactive({
   form: {
     checkTime: "",
@@ -261,6 +268,7 @@
     productModelId: "",
     model: "",
     uidNo: "",
+    batchNo: "",
     testStandardId: "",
     unit: "",
     quantity: "",
@@ -300,6 +308,7 @@
       }
     ],
     checkCompany: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
+    batchNo: [{ required: true, validator: validateBatchNo, trigger: "blur" }],
     checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
   },
 });
@@ -393,6 +402,7 @@
     productModelId: "",
     model: "",
     uidNo: "",
+    batchNo: "",
     testStandardId: "",
     unit: "",
     quantity: "",
@@ -482,6 +492,7 @@
   form.value.productModelId = undefined;
   form.value.unit = undefined;
   form.value.uidNo = undefined;
+  form.value.batchNo = "";
   modelOptions.value = [];
   currentProductId.value = value
   form.value.productName = findNodeById(productOptions.value, value);

--
Gitblit v1.9.3