From 61449dbf92441b41e37c1d519e8662cca998ff6a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 02 四月 2026 11:45:08 +0800
Subject: [PATCH] fix: 添加批号
---
src/views/qualityManagement/finalInspection/components/formDia.vue | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index b850af3..e15f2aa 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -32,6 +32,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="鐢熶骇鎵瑰彿锛�">
+ <el-input
+ :model-value="productionBatchDisplay"
+ disabled
+ placeholder="鈥�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="鎸囨爣閫夋嫨锛�" prop="testStandardId">
<el-select
v-model="form.testStandardId"
@@ -54,11 +63,9 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" disabled/>
+ <el-form-item label="鏂欏彿锛�" prop="materialCode">
+ <el-input v-model="form.materialCode" placeholder="璇疯緭鍏�" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -66,13 +73,9 @@
<el-input v-model="form.defectiveQuantity" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="涓嶈壇鍘熷洜锛�" prop="defectiveReason">
- <el-select v-model="form.defectiveReason" placeholder="璇烽�夋嫨" clearable style="width: 100%">
- <el-option :label="item.label" :value="item.value" v-for="(item,index) in defective_reason" :key="index" />
- </el-select>
+ <el-form-item label="鍗曚綅锛�" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏�" disabled/>
</el-form-item>
</el-col>
@@ -81,8 +84,14 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2" disabled/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="涓嶈壇鍘熷洜锛�" prop="defectiveReason">
+ <el-select v-model="form.defectiveReason" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option :label="item.label" :value="item.value" v-for="(item,index) in defective_reason" :key="index" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+
<el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
<el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
@@ -96,14 +105,13 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
+
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
+ <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
+ <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+ :value="item.nickName"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -167,6 +175,9 @@
testStandardId: "",
defectiveReason: undefined,
unit: "",
+ materialCode: "",
+ /** 鏉ヨ嚜鐢熶骇宸ュ崟/鍙拌处锛屼粎灞曠ず */
+ batchNo: "",
qualifiedQuantity: "",
quantity: "",
checkCompany: "",
@@ -190,6 +201,16 @@
const quantityDisabled = computed(() => {
const v = form.value || {};
return !!(v.productMainId != null || v.purchaseLedgerId != null);
+});
+
+/** 鐢熶骇鎵瑰彿灞曠ず锛堟帴鍙ｅ彲鑳戒负 batchNo 鎴� productionBatchNo锛� */
+const productionBatchDisplay = computed(() => {
+ const f = form.value || {};
+ const v = f.batchNo ?? f.productionBatchNo;
+ if (v === null || v === undefined || String(v).trim() === "") {
+ return "";
+ }
+ return String(v);
});
const supplierList = ref([]);
const productOptions = ref([]);
@@ -274,7 +295,10 @@
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
// 鍏堣缃〃鍗曟暟鎹紝浣嗘殏鏃舵竻绌� testStandardId锛岀瓑閫夐」鍔犺浇瀹屾垚鍚庡啀璁剧疆
- form.value = {...row, testStandardId: ''}
+ form.value = { ...row, testStandardId: "" };
+ // 鐢熶骇鎵瑰彿锛氫笌鐢熶骇宸ュ崟瀛楁瀵归綈锛屽吋瀹瑰绉嶅悗绔瓧娈靛悕
+ form.value.batchNo =
+ row.batchNo ?? row.productionBatchNo ?? form.value.batchNo ?? "";
currentProductId.value = row.productId || 0
// 娓呯┖楠岃瘉鐘舵�侊紝閬垮厤鏁版嵁鍔犺浇杩囩▼涓殑鏍￠獙闂儊
nextTick(() => {
@@ -304,6 +328,7 @@
if (selectedModel) {
form.value.model = selectedModel.model || '';
form.value.unit = selectedModel.unit || '';
+ form.value.materialCode = selectedModel.materialCode || '';
}
}
@@ -343,6 +368,7 @@
const getModels = (value) => {
form.value.productModelId = undefined;
form.value.unit = undefined;
+ form.value.materialCode = undefined;
modelOptions.value = [];
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
@@ -357,6 +383,7 @@
const handleChangeModel = (value) => {
form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
+ form.value.materialCode = modelOptions.value.find(item => item.id == value)?.materialCode || '';
}
const findNodeById = (nodes, productId) => {
--
Gitblit v1.9.3