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 | 198 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 164 insertions(+), 34 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 6c91846..51d0474 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -85,24 +85,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
-
- </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" :disabled="quantityDisabled"/>
- </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
@@ -133,10 +116,67 @@
</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">
@@ -145,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>
@@ -155,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
@@ -239,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";
@@ -271,12 +312,19 @@
batchNo: "",
inspectedQuantity: "",
quantity: "",
- inspectedQuantity: "",
- inspectMaterialCondition: "",
productionDate: "",
validityDate: "",
checkCompany: "",
checkResult: "",
+ // 妫�楠岀敤绮夊墏/娑叉儏鍐电浉鍏虫柊瀛楁
+ inspectMaterialConditionId: "",
+ inspectMaterialCondition: "",
+ inspectProductModelId : "",
+ inspectBatchNo: "",
+ inspectProductModel: "",
+ inspectProductionDate: "",
+ inspectValidityDate: "",
+ inspectValidityPeriod: "",
},
rules: {
checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -286,8 +334,6 @@
productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
testStandardId: [{required: false, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- inspectedQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
inspectedQuantity: [
{ required: true, message: "璇疯緭鍏ユ鍝佹暟閲�", trigger: "blur" },
{
@@ -307,6 +353,7 @@
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" }],
@@ -320,6 +367,7 @@
});
const supplierList = ref([]);
const productOptions = ref([]);
+const inspectProductModel = ref([]);
const tableColumn = ref([
{
label: "妫�娴嬮」鐩�",
@@ -372,6 +420,7 @@
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const deviceList = ref([]);
+const inspectBatchOptions = ref([]);
// 鎵撳紑寮规
const openDialog = async (type, row) => {
@@ -382,7 +431,7 @@
proxy.$refs.formRef?.clearValidate();
// 鍔犺浇璁惧鍙拌处鍒楄〃
loadDeviceList();
-
+
// 骞惰鍔犺浇鍩虹鏁版嵁
const [userListsRes] = await Promise.all([
userListNoPage(),
@@ -392,11 +441,11 @@
})
]);
userList.value = userListsRes.data;
-
+
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
-
+
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
@@ -407,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)
@@ -434,15 +483,15 @@
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) {
@@ -518,7 +567,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -607,6 +656,86 @@
}
};
+// 閫夋嫨妫�楠岀敤绮夊墏/娑叉儏鍐靛悗锛屾牴鎹骇鍝両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 => {
@@ -650,6 +779,7 @@
proxy.resetForm("formRef");
tableData.value = [];
testStandardOptions.value = [];
+ inspectBatchOptions.value = [];
form.value.testStandardId = '';
dialogFormVisible.value = false;
emit('close')
--
Gitblit v1.9.3