From 4a811fb2cd4ee4e1cbfe284bfd1fe3a7d16204ce Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:48 +0800
Subject: [PATCH] fix: 终检表单优化检验用粉剂/液情况字段
---
src/views/qualityManagement/finalInspection/components/formDia.vue | 363 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 317 insertions(+), 46 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 93abe9a..51d0474 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -49,25 +49,134 @@
</el-select>
</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>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="璇疯緭鍏�" clearable :precision="2" :disabled="quantityDisabled"/>
+ <el-form-item label="鎵瑰彿锛�" prop="batchNo">
+ <el-input
+ v-model="form.batchNo"
+ placeholder="璇疯緭鍏�"
+ clearable
+ :disabled="operationType === 'edit'"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="UID鐮侊細" prop="uidNo">
+ <el-input v-model="form.uidNo" placeholder="璇疯緭鍏�" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="妫�鍝佹暟閲忥細" prop="inspectedQuantity">
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inspectedQuantity" placeholder="璇疯緭鍏�" clearable :precision="2"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎬绘暟閲忥細" prop="quantity">
+ <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="productionDate">
+ <el-date-picker
+ v-model="form.productionDate"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ @change="calculateValidityDate"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈夋晥鏈燂細" prop="validityDate">
+ <el-date-picker
+ v-model="form.validityDate"
+ type="date"
+ placeholder="鑷姩璁＄畻鎴栨墜鍔ㄩ�夋嫨"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="妫�楠岀敤绮夊墏/娑叉儏鍐碉細" prop="inspectMaterialConditionId">
+ <el-tree-select
+ v-model="form.inspectMaterialConditionId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ check-strictly
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ @change="handleInspectMaterialChange"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵瑰彿锛堟柊锛夛細" prop="inspectBatchNo">
+ <el-select
+ v-model="form.inspectBatchNo"
+ placeholder="璇烽�夋嫨鎵瑰彿"
+ clearable
+ filterable
+ style="width: 100%"
+ @change="handleInspectBatchChange"
+ >
+ <el-option
+ v-for="item in inspectBatchOptions"
+ :key="item.batchNo"
+ :label="item.batchNo"
+ :value="item.batchNo"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="inspectProductModelId">
+ <el-select v-model="form.inspectProductModelId" placeholder="璇烽�夋嫨" clearable
+ filterable readonly @change="handleChangeModels">
+ <el-option v-for="item in inspectProductModel" :key="item.id" :label="item.model" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢熶骇鏃ユ湡锛堟柊锛夛細" prop="inspectProductionDate">
+ <el-input v-model="form.inspectProductionDate" placeholder="鑷姩甯﹀嚭" disabled/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="鏈夋晥鏈燂紙鏂帮級锛�" prop="inspectValidityDate">
+ <el-input v-model="form.inspectValidityDate" placeholder="鑷姩璁＄畻" 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>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
<el-select v-model="form.checkResult">
@@ -76,8 +185,6 @@
</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>
@@ -86,6 +193,8 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
<el-date-picker
@@ -129,10 +238,19 @@
</el-select>
</template>
<template #deviceStatus="{ row }">
- <el-tag v-if="row.deviceStatus" :type="getDeviceStatusType(row.deviceStatus)">
- {{ row.deviceStatus }}
- </el-tag>
- <span v-else style="color: #999">-</span>
+ <el-select
+ v-model="row.deviceStatus"
+ placeholder="璇烽�夋嫨"
+ default-first-option
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="姝ｅ父" value="姝ｅ父" />
+ <el-option label="鍋滄満" value="鍋滄満" />
+ <el-option label="杩愯" value="杩愯" />
+ <el-option label="缁翠慨" value="缁翠慨" />
+ <el-option label="/" value="/" />
+ </el-select>
</template>
<template #result="{ row }">
<el-input v-model="row.result" placeholder="璇疯緭鍏�" clearable />
@@ -161,6 +279,7 @@
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {userListNoPage} from "@/api/system/user.js";
+import { getStockInventoryListPage } from "@/api/inventoryManagement/stockInventory.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {deviceList as qualityInspectParamDeviceList} from "@/api/energyManagement/index.js";
@@ -169,6 +288,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: "",
@@ -180,9 +308,23 @@
model: "",
testStandardId: "",
unit: "",
+ uidNo: "",
+ batchNo: "",
+ inspectedQuantity: "",
quantity: "",
+ productionDate: "",
+ validityDate: "",
checkCompany: "",
checkResult: "",
+ // 妫�楠岀敤绮夊墏/娑叉儏鍐电浉鍏虫柊瀛楁
+ inspectMaterialConditionId: "",
+ inspectMaterialCondition: "",
+ inspectProductModelId : "",
+ inspectBatchNo: "",
+ inspectProductModel: "",
+ inspectProductionDate: "",
+ inspectValidityDate: "",
+ inspectValidityPeriod: "",
},
rules: {
checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -192,8 +334,28 @@
productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
testStandardId: [{required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ inspectedQuantity: [
+ { required: true, message: "璇疯緭鍏ユ鍝佹暟閲�", trigger: "blur" },
+ {
+ validator: (rule, value, callback) => {
+ if (value !== '' && value !== null && value !== undefined) {
+ const qty = Number(form.value.quantity);
+ const inspectedQty = Number(value);
+ if (!isNaN(qty) && !isNaN(inspectedQty) && inspectedQty > qty) {
+ callback(new Error("妫�鍝佹暟閲忎笉鑳藉ぇ浜庢�绘暟閲�"));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ },
+ trigger: "blur"
+ }
+ ],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkCompany: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ batchNo: [{ required: true, validator: validateBatchNo, trigger: "blur" }],
checkResult: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
},
});
@@ -205,6 +367,7 @@
});
const supplierList = ref([]);
const productOptions = ref([]);
+const inspectProductModel = ref([]);
const tableColumn = ref([
{
label: "妫�娴嬮」鐩�",
@@ -216,32 +379,32 @@
prop: "standardValue",
width: 180
},
- {
- label: "鍗曚綅",
- prop: "unit",
- width: 80
- },
- {
- label: "妫�娴嬪櫒鍏�",
- prop: "instrument",
- dataType: 'slot',
- slot: 'instrument',
- width: 220
- },
- {
- label: "璁惧鐘舵��",
- prop: "deviceStatus",
- dataType: 'slot',
- slot: 'deviceStatus',
- width: 120
- },
- {
- label: "妫�娴嬬粨鏋�",
- prop: "result",
- dataType: 'slot',
- slot: 'result',
- minWidth: 150
- },
+ {
+ label: "鍗曚綅",
+ prop: "unit",
+ width: 70
+ },
+ {
+ label: "妫�娴嬪櫒鍏�",
+ prop: "instrument",
+ dataType: 'slot',
+ slot: 'instrument',
+ width: 220
+ },
+ {
+ label: "璁惧鐘舵��",
+ prop: "deviceStatus",
+ dataType: 'slot',
+ slot: 'deviceStatus',
+ width: 120
+ },
+ {
+ label: "妫�娴嬬粨鏋�",
+ prop: "result",
+ dataType: 'slot',
+ slot: 'result',
+ width: 150
+ },
{
label: "缁撴灉鍒ゆ柇",
prop: "resultJudgment",
@@ -257,6 +420,7 @@
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const deviceList = ref([]);
+const inspectBatchOptions = ref([]);
// 鎵撳紑寮规
const openDialog = async (type, row) => {
@@ -267,7 +431,7 @@
proxy.$refs.formRef?.clearValidate();
// 鍔犺浇璁惧鍙拌处鍒楄〃
loadDeviceList();
-
+
// 骞惰鍔犺浇鍩虹鏁版嵁
const [userListsRes] = await Promise.all([
userListNoPage(),
@@ -277,11 +441,11 @@
})
]);
userList.value = userListsRes.data;
-
+
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
-
+
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
@@ -292,18 +456,18 @@
nextTick(() => {
proxy.$refs.formRef?.clearValidate();
});
-
+
// 缂栬緫妯″紡涓嬶紝骞惰鍔犺浇瑙勬牸鍨嬪彿鍜屾寚鏍囬�夐」
if (currentProductId.value) {
// 璁剧疆浜у搧鍚嶇О
form.value.productName = findNodeById(productOptions.value, currentProductId.value);
-
+
// 骞惰鍔犺浇瑙勬牸鍨嬪彿鍜屾寚鏍囬�夐」
const params = {
productId: currentProductId.value,
inspectType: 2
};
-
+
Promise.all([
modelList({ id: currentProductId.value }),
qualityInspectDetailByProductId(params)
@@ -316,17 +480,18 @@
if (selectedModel) {
form.value.model = selectedModel.model || '';
form.value.unit = selectedModel.unit || '';
+ form.value.uidNo = selectedModel.uidNo || '';
}
}
-
+
// 璁剧疆鎸囨爣閫夐」
testStandardOptions.value = testStandardRes.data || [];
-
+
// 璁剧疆 testStandardId 骞跺姞杞藉弬鏁板垪琛�
nextTick(() => {
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
+ const matchedOption = testStandardOptions.value.find(item =>
item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
);
if (matchedOption) {
@@ -355,6 +520,8 @@
const getModels = (value) => {
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);
@@ -369,6 +536,11 @@
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.uidNo = modelOptions.value.find(item => item.id == value)?.uidNo || '';
+ // 閫夋嫨瑙勬牸鍨嬪彿鍚庯紝濡傛灉宸叉湁鐢熶骇鏃ユ湡鍒欓噸鏂拌绠楁湁鏁堟湡
+ if (form.value.productionDate) {
+ calculateValidityDate();
+ }
}
const findNodeById = (nodes, productId) => {
@@ -395,7 +567,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -466,6 +638,104 @@
})
}
+// 璁＄畻鏈夋晥鏈燂紙鐢熶骇鏃ユ湡 + 瑙勬牸鍨嬪彿涓殑鏈夋晥鏈燂級
+const calculateValidityDate = async () => {
+ if (!form.value.productionDate) {
+ form.value.validityDate = '';
+ return;
+ }
+ // 鑾峰彇瑙勬牸鍨嬪彿鐨勬湁鏁堟湡
+ const selectedModel = modelOptions.value.find(item => item.id == form.value.productModelId);
+ if (selectedModel && selectedModel.validityPeriod) {
+ const productionDate = new Date(form.value.productionDate);
+ const validityPeriod = parseFloat(selectedModel.validityPeriod);
+ const validityDate = new Date(productionDate);
+ validityDate.setFullYear(validityDate.getFullYear() + Math.floor(validityPeriod));
+ validityDate.setMonth(validityDate.getMonth() + Math.round((validityPeriod % 1) * 12));
+ form.value.validityDate = validityDate.toISOString().split('T')[0];
+ }
+};
+
+// 閫夋嫨妫�楠岀敤绮夊墏/娑叉儏鍐靛悗锛屾牴鎹骇鍝両D鏌ヨ搴撳瓨鎵瑰彿鍒楄〃
+const handleInspectMaterialChange = (productId) => {
+ inspectBatchOptions.value = [];
+ form.value.inspectBatchNo = "";
+ form.value.inspectProductModel = "";
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ // let productName = findNodeById(productOptions.value, productId);
+
+ modelList({ id: productId }).then((res) => {
+ inspectProductModel.value = res;
+ })
+ /*getStockInventoryListPage({
+ productName: productName,
+ pageNum: 1,
+ pageSize: -1
+ }).then(res => {
+ inspectBatchOptions.value = res.data || []
+ // 娓呯┖宸查�夋嫨鐨勬壒鍙峰拰鏂板瓧娈�
+ form.value.inspectBatchNo = "";
+ form.value.inspectProductModel = "";
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ });*/
+};
+
+const handleChangeModels = (value) => {
+ form.value.inspectProductModel = inspectProductModel.value.find(item => item.id == value)?.model || '';
+
+ getStockInventoryListPage({
+ model: form.value.inspectProductModel,
+ pageNum: 1,
+ pageSize: -1
+ }).then(res => {
+ inspectBatchOptions.value = res.data || []
+ // 娓呯┖宸查�夋嫨鐨勬壒鍙峰拰鏂板瓧娈�
+ form.value.inspectBatchNo = "";
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ });
+
+ if (form.value.productionDate) {
+ calculateInspectValidityDate();
+ }
+}
+
+
+const calculateInspectValidityDate = () => {
+ if (!form.value.inspectProductionDate) {
+ form.value.inspectValidityDate = '';
+ return;
+ }
+// 鑾峰彇瑙勬牸鍨嬪彿鐨勬湁鏁堟湡
+ const selectedModel = inspectProductModel.value.find(item => item.id == form.value.inspectProductModelId);
+ if (selectedModel && selectedModel.validityPeriod) {
+ const inspectProductionDate = new Date(form.value.inspectProductionDate);
+ const validityPeriod = parseFloat(selectedModel.inspectValidityDate);
+ const validityDate = new Date(inspectProductionDate);
+ validityDate.setFullYear(validityDate.getFullYear() + Math.floor(validityPeriod));
+ validityDate.setMonth(validityDate.getMonth() + Math.round((validityPeriod % 1) * 12));
+ form.value.inspectValidityDate = validityDate.toISOString().split('T')[0];
+ }
+}
+
+const handleInspectBatchChange = (batchNo) => {
+ if (!batchNo) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ return;
+ }
+ const selectedBatch = inspectBatchOptions.value.find(item => item.batchNo === batchNo);
+ if (selectedBatch) {
+ // 甯﹀嚭瑙勬牸鍨嬪彿鍜岀敓浜ф棩鏈�
+ // form.value.inspectProductModel = selectedBatch.model || "";
+ form.value.inspectProductionDate = selectedBatch.productionDate || "";
+ calculateInspectValidityDate()
+ }
+};
+
// 鑾峰彇璁惧鍙拌处鍒楄〃
const loadDeviceList = () => {
qualityInspectParamDeviceList().then(res => {
@@ -509,6 +779,7 @@
proxy.resetForm("formRef");
tableData.value = [];
testStandardOptions.value = [];
+ inspectBatchOptions.value = [];
form.value.testStandardId = '';
dialogFormVisible.value = false;
emit('close')
--
Gitblit v1.9.3