From ccb00a17b9119200b8c8d29a177bcc129dd4c982 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:43:13 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/qualityManagement/rawMaterial/components/formDia.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterial/components/formDia.vue b/src/views/qualityManagement/rawMaterial/components/formDia.vue
index c8ed6c6..5b333af 100644
--- a/src/views/qualityManagement/rawMaterial/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -23,8 +23,6 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
<el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable
@@ -60,8 +58,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>
@@ -143,7 +141,7 @@
productModelId: "",
model: "",
batchNo: "",
- checkType: "",
+ checkType: undefined,
checkResult: "",
unit: "",
checkUserName: "",
@@ -153,8 +151,8 @@
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"}],
+ batchNo: [{required: true, message: "璇疯緭鍏ユ壒娆�", trigger: "blur"}],
+ checkType: [{required: true, message: "璇烽�夋嫨妫�楠岀被鍨�", trigger: "change"}],
checkResult: [{required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change"}],
},
});
--
Gitblit v1.9.3