From 6832942f666ce50675911634754d693a49e85368 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 16 三月 2026 11:30:09 +0800
Subject: [PATCH] 来料检字段调整
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 92 ++++++++++++++++++++++++++++++++++++++-------
src/views/qualityManagement/rawMaterialInspection/index.vue | 25 +++++++++---
2 files changed, 95 insertions(+), 22 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index e96317d..145d3af 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -11,17 +11,8 @@
ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="渚涘簲鍟嗭細"
- prop="supplier">
- <el-select v-model="form.supplier"
- placeholder="璇烽�夋嫨"
- clearable
- :disabled="supplierQuantityDisabled">
- <el-option v-for="item in supplierList"
- :key="item.id"
- :label="item.supplierName"
- :value="item.supplierName" />
- </el-select>
+ <el-form-item label="渚涘簲鍟嗭細" prop="supplier">
+ <el-input v-model="form.supplier" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -40,6 +31,52 @@
</div>
<div v-else
class="text-gray-400">璇烽�夋嫨浜у搧</div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璇曟牱缂栧彿锛�"
+ prop="sampleCode">
+ <el-input v-model="form.sampleCode"
+ placeholder="璇疯緭鍏�"
+ clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杞︾墝鍙凤細"
+ prop="licensePlateNumber">
+ <el-input v-model="form.licensePlateNumber"
+ placeholder="璇疯緭鍏�"
+ clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�娴嬫�ц川锛�"
+ prop="inspectNature">
+ <el-select v-model="form.inspectNature">
+ <el-option label="鏃ュ父妫�娴�"
+ value="鏃ュ父妫�娴�" />
+ <el-option label="鍏ュ満楠屾敹"
+ value="鍏ュ満楠屾敹" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璇曟牱鐘舵�侊細"
+ prop="sampleState">
+ <el-select v-model="form.sampleState">
+ <el-option label="鍥轰綋"
+ value="鍥轰綋" />
+ <el-option label="棰楃矑"
+ value="棰楃矑" />
+ <el-option label="鑶忎綋"
+ value="鑶忎綋" />
+ <el-option label="绮夋湯"
+ value="绮夋湯" />
+ <el-option label="娑蹭綋"
+ value="娑蹭綋" />
+ <el-option label="姘斾綋"
+ value="姘斾綋" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -107,6 +144,18 @@
<el-form-item label="妫�娴嬫棩鏈燂細"
prop="checkTime">
<el-date-picker v-model="form.checkTime"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍙栨牱鏃ユ湡锛�"
+ prop="sampleTime">
+ <el-date-picker v-model="form.sampleTime"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
value-format="YYYY-MM-DD"
@@ -190,9 +239,14 @@
quantity: "",
checkCompany: "",
checkResult: "",
+ inspectNature: "",
+ sampleCode: "",
+ sampleState: "",
+ licensePlateNumber: "",
+ sampleTime: "",
},
rules: {
- checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
supplier: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -206,8 +260,17 @@
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [
- { required: true, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change" },
+ { required: false, message: "璇烽�夋嫨妫�娴嬬粨鏋�", trigger: "change" },
],
+ inspectNature: [
+ { required: false, message: "璇烽�夋嫨妫�娴嬫�ц川", trigger: "change" },
+ ],
+ sampleState: [
+ { required: false, message: "璇烽�夋嫨璇曟牱鐘舵��", trigger: "change" },
+ ],
+ sampleCode: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ licensePlateNumber: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ sampleTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
},
});
const tableColumn = ref([
@@ -270,7 +333,6 @@
form.value = {
checkTime: "",
supplier: "",
- checkName: "",
productName: "",
productId: "",
productModelId: "",
@@ -533,4 +595,4 @@
</script>
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 26504b0..b45f050 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -98,14 +98,9 @@
width: 120
},
{
- label: "閲囪喘璁㈠崟鍙�",
- prop: "purchaseContractNo",
- width: 120
- },
- {
label: "渚涘簲鍟�",
prop: "supplier",
- width: 230
+ width: 130
},
{
label: "妫�楠屽憳",
@@ -122,6 +117,7 @@
{
label: "鍗曚綅",
prop: "unit",
+ width: 80
},
{
label: "鏁伴噺",
@@ -129,9 +125,24 @@
width: 120
},
{
+ label: "璇曟牱缂栧彿",
+ prop: "sampleCode",
+ },
+ {
+ label: "璇曟牱鐘舵��",
+ prop: "sampleState",
+ },
+ {
+ label: "妫�娴嬫�ц川",
+ prop: "inspectNature",
+ },
+ {
+ label: "鍙栨牱鏃ユ湡",
+ prop: "sampleTime",
+ },
+ {
label: "妫�娴嬪崟浣�",
prop: "checkCompany",
- width: 120
},
{
label: "妫�娴嬬粨鏋�",
--
Gitblit v1.9.3