From c8abd6f5f6b05df918c6cd4acc2fa4d931c174b7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 09 四月 2026 16:10:56 +0800
Subject: [PATCH] feat(stock): 添加库存扣减功能中的客户信息字段
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 596026d..7ac310a 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">
@@ -219,7 +217,7 @@
<el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
</template>
<template #resultJudgment="{ row }">
- <el-select v-model="row.resultJudgment" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-select v-model="row.resultJudgment" placeholder="璇烽�夋嫨" clearable style="width: 100%" @change="changeResult">
<el-option label="鍚堟牸" value="鍚堟牸" />
<el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
<el-option label="/" value="/" />
@@ -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);
@@ -667,6 +678,19 @@
dialogFormVisible.value = false;
emit('close')
};
+
+// 淇敼妫�娴嬬粨鏋�
+const changeResult = () => {
+ let result = '鍚堟牸'
+ tableData.value.forEach(item => {
+ if (item.resultJudgment !== '/') {
+ if (item.resultJudgment === '涓嶅悎鏍�') {
+ result = '涓嶅悎鏍�'
+ }
+ }
+ });
+ form.value.checkResult = result
+};
defineExpose({
openDialog,
});
--
Gitblit v1.9.3