From 79a53d2f9a9a1fab7a1d889c27b8d2e2f6db0fe2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 四月 2026 10:37:01 +0800
Subject: [PATCH] fix: 出厂检修改
---
src/views/qualityManagement/processInspection/components/formDia.vue | 16 -
src/views/qualityManagement/finalInspection/components/formDia.vue | 526 +++++++++++++++++++++++++++++++++++++++++++--------
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 18 -
3 files changed, 443 insertions(+), 117 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index d9d0b66..407cd6f 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -153,54 +153,84 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="6">
+ <el-col :span="12">
<el-form-item label="妫�楠岀敤绮夊墏/娑叉儏鍐碉細" prop="inspectMaterialConditionId">
<el-tree-select
v-model="form.inspectMaterialConditionId"
placeholder="璇烽�夋嫨"
clearable
check-strictly
- :data="productOptions"
+ :data="inspectProductOptions"
:render-after-expand="false"
style="width: 100%"
- @change="handleInspectMaterialChange"
+ @change="getInspectModels"
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <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-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿锛堟楠岋級锛�" prop="inspectProductModelId">
+ <el-select
+ v-model="form.inspectProductModelId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ @change="getInspectProductModel"
+ >
+ <el-option v-for="item in inspectModelOptions" :key="item.id" :label="item.model" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎵瑰彿锛堟柊锛夛細" prop="inspectBatchNo">
+ <el-col :span="12">
+ <el-form-item label="UID鐮侊紙妫�楠岋級锛�" prop="inspectUidNo">
+ <el-input v-model="form.inspectUidNo" placeholder="鑷姩甯﹀嚭" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵瑰彿锛堟楠岋級锛�" prop="inspectBatchNo">
<el-select
v-model="form.inspectBatchNo"
- placeholder="璇烽�夋嫨鎵瑰彿"
+ placeholder="璇烽�夋嫨"
clearable
filterable
style="width: 100%"
- @change="handleInspectBatchChange"
+ @change="handleInspectBatchNoChange"
>
<el-option
- v-for="item in inspectBatchOptions"
- :key="item.batchNo"
- :label="item.batchNo"
- :value="item.batchNo"
+ v-for="item in inspectBatchNoOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鐢熶骇鏃ユ湡锛堟柊锛夛細" prop="inspectProductionDate">
+ <el-col :span="12">
+ <el-form-item label="渚涘簲鍟嗭紙妫�楠岋級锛�" prop="inspectSupplier">
+ <el-select
+ v-model="form.inspectSupplier"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ style="width: 100%"
+ :disabled="!inspectSupplierOptions.length"
+ @change="handleInspectSupplierChange"
+ >
+ <el-option
+ v-for="item in inspectSupplierOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </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-col :span="6">
- <el-form-item label="鏈夋晥鏈燂紙鏂帮級锛�" prop="inspectValidityDate">
+ <el-col :span="12">
+ <el-form-item label="鏈夋晥鏈燂紙妫�楠岋級锛�" prop="inspectValidityDate">
<el-input v-model="form.inspectValidityDate" placeholder="鑷姩璁＄畻" disabled/>
</el-form-item>
</el-col>
@@ -275,7 +305,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 { getStockInventoryAll } 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";
@@ -317,7 +347,9 @@
inspectMaterialCondition: "",
inspectProductModelId : "",
inspectBatchNo: "",
+ inspectSupplier: "",
inspectProductModel: "",
+ inspectUidNo: "",
inspectProductionDate: "",
inspectValidityDate: "",
inspectValidityPeriod: "",
@@ -363,7 +395,94 @@
});
const supplierList = ref([]);
const productOptions = ref([]);
-const inspectProductModel = ref([]);
+const inspectProductOptions = ref([]);
+const inspectModelOptions = ref([]);
+const inspectBatchNoOptions = ref([]);
+const inspectSupplierOptions = ref([]);
+let inspectStockInventoryAllTree = [];
+let inspectBatchNodeByBatchNo = new Map();
+
+const normalizeInspectStockTree = (nodes = []) => {
+ const normalizeNodeValue = (node) => {
+ if (node?.id !== null && node?.id !== undefined) return String(node.id);
+ if (node?.nodeType === "batch") return String(node.batchNo ?? node.label ?? "");
+ if (node?.nodeType === "customer") return String(node.customer ?? node.label ?? "");
+ if (node?.nodeType === "model") return String(node.productModelId ?? node.model ?? node.label ?? "");
+ return String(node.productName ?? node.label ?? "");
+ };
+
+ const normalized = (list) =>
+ (list || []).map((n) => {
+ const value = normalizeNodeValue(n);
+ const label = n.label ?? n.productName ?? n.model ?? n.batchNo ?? n.customer ?? "";
+ return {
+ ...n,
+ value,
+ label,
+ children: normalized(n.children),
+ };
+ });
+
+ return normalized(nodes);
+};
+
+// 妫�楠岀敤绮夊墏/娑叉爲褰笅鎷夛細涓嶅睍绀哄瀷鍙枫�佹壒鍙凤紙鐢卞彸渚с�岃鏍煎瀷鍙枫�嶃�屾壒鍙枫�嶅崟鐙�夋嫨锛�
+function filterInspectTreeForPowderSelect(nodes = []) {
+ return (nodes || [])
+ .filter(
+ (n) =>
+ n &&
+ n.nodeType !== "customer" &&
+ n.nodeType !== "model" &&
+ n.nodeType !== "batch"
+ )
+ .map((n) => ({
+ ...n,
+ children: filterInspectTreeForPowderSelect(n.children || []),
+ }));
+}
+
+/** 鍦ㄤ骇鍝佸瓙鏍戝唴閫掑綊鏀堕泦鍨嬪彿鑺傜偣锛堝瀷鍙峰彲鑳藉湪绗� 3 灞傚強鏇存繁锛岃�岄潪浜у搧鐨勭洿鎺ュ瓙鑺傜偣锛� */
+function collectInspectSubtreeModels(node) {
+ const out = [];
+ const walk = (n) => {
+ if (!n) return;
+ if (n.nodeType === "model") {
+ out.push(n);
+ return;
+ }
+ for (const c of n.children || []) walk(c);
+ };
+ walk(node);
+ return out;
+}
+
+const findInspectNodeObjByValue = (nodes = [], value) => {
+ for (let i = 0; i < (nodes || []).length; i++) {
+ const node = nodes[i];
+ if (String(node?.value) === String(value)) return node;
+ const children = node?.children || [];
+ if (children.length) {
+ const found = findInspectNodeObjByValue(children, value);
+ if (found) return found;
+ }
+ }
+ return null;
+};
+
+function findInspectNodeIdByLabel(nodes, label) {
+ if (!label) return null;
+ for (let i = 0; i < nodes.length; i++) {
+ const node = nodes[i];
+ if (node.label === label) return node.value;
+ if (node.children && node.children.length > 0) {
+ const found = findInspectNodeIdByLabel(node.children, label);
+ if (found !== null && found !== undefined) return found;
+ }
+ }
+ return null;
+}
+
const tableColumn = ref([
{
label: "妫�娴嬮」鐩�",
@@ -416,8 +535,6 @@
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const deviceList = ref([]);
-const inspectBatchOptions = ref([]);
-
// 鎵撳紑寮规
const openDialog = async (type, row) => {
operationType.value = type;
@@ -431,7 +548,8 @@
// 骞惰鍔犺浇鍩虹鏁版嵁
const [userListsRes] = await Promise.all([
userListNoPage(),
- getProductOptions(),
+ getMainProductTree(),
+ getInspectStockTree(),
getOptions().then((res) => {
supplierList.value = res.data;
})
@@ -484,7 +602,7 @@
testStandardOptions.value = testStandardRes.data || [];
// 璁剧疆 testStandardId 骞跺姞杞藉弬鏁板垪琛�
- nextTick(() => {
+ nextTick(async () => {
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
const matchedOption = testStandardOptions.value.find(item =>
@@ -499,19 +617,31 @@
form.value.testStandardId = savedTestStandardId;
}
}
+ await restoreInspectMaterialFromRow(row);
// 缂栬緫鍦烘櫙淇濈暀宸叉湁妫�楠屽�硷紝鐩存帴鎷夊彇鍘熷弬鏁版暟鎹�
getQualityInspectParamList(row.id);
});
});
} else {
- getQualityInspectParamList(row.id);
+ nextTick(async () => {
+ await restoreInspectMaterialFromRow(row);
+ getQualityInspectParamList(row.id);
+ });
}
}
}
-const getProductOptions = () => {
+const getMainProductTree = () => {
return productTreeList().then((res) => {
productOptions.value = convertIdToValue(res);
});
+};
+
+const getInspectStockTree = async () => {
+ const res = await getStockInventoryAll();
+ const data = res?.data || [];
+ inspectStockInventoryAllTree = normalizeInspectStockTree(data);
+ inspectProductOptions.value = filterInspectTreeForPowderSelect(inspectStockInventoryAllTree);
+ return inspectProductOptions.value;
};
const getModels = (value) => {
form.value.productModelId = undefined;
@@ -652,83 +782,293 @@
}
};
-// 閫夋嫨妫�楠岀敤绮夊墏/娑叉儏鍐靛悗锛屾牴鎹骇鍝両D鏌ヨ搴撳瓨鎵瑰彿鍒楄〃
-const handleInspectMaterialChange = (productId) => {
- inspectBatchOptions.value = [];
- form.value.inspectBatchNo = "";
+// 搴撳瓨鏍戯紙涓庨攢鍞彴璐︿竴鑷达級锛氶�変骇鍝� 鈫� 瑙勬牸鍨嬪彿 鈫� 鎵瑰彿 鈫� UID / 鏃ユ湡
+const getInspectModels = async (value) => {
+ if (value === null || value === undefined || value === "") {
+ form.value.inspectMaterialCondition = "";
+ form.value.inspectProductModelId = null;
+ form.value.inspectProductModel = "";
+ form.value.inspectUidNo = "";
+ form.value.inspectBatchNo = "";
+ form.value.inspectSupplier = "";
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ inspectModelOptions.value = [];
+ inspectBatchNoOptions.value = [];
+ inspectSupplierOptions.value = [];
+ inspectBatchNodeByBatchNo = new Map();
+ return;
+ }
+
+ const node = findInspectNodeObjByValue(inspectStockInventoryAllTree, value);
+ if (!node || node.nodeType === "model" || node.nodeType === "batch") return;
+
+ const modelNodesPreview = collectInspectSubtreeModels(node);
+ if (!modelNodesPreview.length) return;
+
+ form.value.inspectMaterialCondition = node.label;
+ form.value.inspectProductModelId = null;
form.value.inspectProductModel = "";
+ form.value.inspectUidNo = "";
+ form.value.inspectBatchNo = "";
+ form.value.inspectSupplier = "";
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 = "";
- });*/
+ inspectModelOptions.value = modelNodesPreview.map((m) => ({
+ id: m.value,
+ model: m.model ?? m.label ?? "",
+ unit: m.unit ?? "",
+ uidNo: m.uidNo ?? m.identifierCode ?? "",
+ }));
+
+ inspectBatchNoOptions.value = [];
+ inspectSupplierOptions.value = [];
+ inspectBatchNodeByBatchNo = new Map();
+
+ try {
+ const list = (await modelList({ id: value })) || [];
+ inspectModelOptions.value = inspectModelOptions.value.map((m) => {
+ const hit = list.find((x) => String(x.id) === String(m.id));
+ return hit
+ ? {
+ ...m,
+ validityPeriod: hit.validityPeriod,
+ uidNo: hit.uidNo ?? m.uidNo,
+ unit: hit.unit ?? m.unit,
+ }
+ : m;
+ });
+ } catch (e) {
+ console.error("鍔犺浇妫�楠岀敤瑙勬牸鍨嬪彿澶辫触", e);
+ }
};
-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 || []
- // 娓呯┖宸查�夋嫨鐨勬壒鍙峰拰鏂板瓧娈�
+const getInspectProductModel = (value) => {
+ if (value === null || value === undefined || value === "") {
+ form.value.inspectProductModel = "";
+ form.value.inspectUidNo = "";
form.value.inspectBatchNo = "";
+ form.value.inspectSupplier = "";
form.value.inspectProductionDate = "";
form.value.inspectValidityDate = "";
- });
-
- if (form.value.productionDate) {
- calculateInspectValidityDate();
- }
-}
-
-
-const calculateInspectValidityDate = () => {
- if (!form.value.inspectProductionDate) {
- form.value.inspectValidityDate = '';
+ inspectBatchNoOptions.value = [];
+ inspectSupplierOptions.value = [];
+ inspectBatchNodeByBatchNo = new Map();
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) {
+ const modelNode = findInspectNodeObjByValue(inspectStockInventoryAllTree, value);
+ if (!modelNode || modelNode.nodeType !== "model") return;
+
+ const prevBatchNo = form.value.inspectBatchNo;
+
+ form.value.inspectProductModelId = modelNode.value;
+ form.value.inspectProductModel = modelNode.model ?? modelNode.label ?? "";
+
+ const nextUid = modelNode.uidNo ?? modelNode.identifierCode ?? "";
+ if (String(nextUid ?? "").trim() !== "") {
+ form.value.inspectUidNo = nextUid;
+ }
+
+ const batchNodes = (modelNode.children || []).filter((b) => b.nodeType === "batch");
+ inspectBatchNodeByBatchNo = new Map(
+ batchNodes.map((b) => {
+ const key = String(b.batchNo ?? b.value ?? b.label ?? "").trim();
+ return [key, b];
+ })
+ );
+ inspectBatchNoOptions.value = batchNodes.map((b) => ({
+ label: String(b.batchNo ?? b.label ?? "").trim(),
+ value: String(b.batchNo ?? b.value ?? b.label ?? "").trim(),
+ }));
+
+ const batchValues = new Set(inspectBatchNoOptions.value.map((x) => x.value));
+ if (!prevBatchNo || !batchValues.has(prevBatchNo)) {
+ form.value.inspectBatchNo = "";
+ }
+
+ if (form.value.inspectBatchNo) {
+ handleInspectBatchNoChange(form.value.inspectBatchNo);
+ } else {
form.value.inspectProductionDate = "";
form.value.inspectValidityDate = "";
+ }
+};
+
+const handleInspectBatchNoChange = (batchNo) => {
+ const safeBatchNo = String(batchNo ?? "").trim();
+ if (!safeBatchNo || !inspectBatchNodeByBatchNo.size) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ form.value.inspectSupplier = "";
+ inspectSupplierOptions.value = [];
return;
}
- const selectedBatch = inspectBatchOptions.value.find(item => item.batchNo === batchNo);
- if (selectedBatch) {
- // 甯﹀嚭瑙勬牸鍨嬪彿鍜岀敓浜ф棩鏈�
- // form.value.inspectProductModel = selectedBatch.model || "";
- form.value.inspectProductionDate = selectedBatch.productionDate || "";
- calculateInspectValidityDate()
+
+ const batchNode = inspectBatchNodeByBatchNo.get(String(safeBatchNo));
+ if (!batchNode) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ form.value.inspectSupplier = "";
+ inspectSupplierOptions.value = [];
+ return;
+ }
+
+ const nextUid = batchNode.uidNo ?? batchNode.identifierCode ?? batchNode.uid ?? "";
+ if (String(nextUid ?? "").trim() !== "") {
+ form.value.inspectUidNo = nextUid;
+ }
+
+ // 鎵瑰彿鍙樺寲锛氬厛鐢熸垚鍙�変緵搴斿晢锛涚敓浜ф棩鏈�/鏈夋晥鏈熷湪鈥滀緵搴斿晢鈥濋�夋嫨鍚庡甫鍑�
+ const customers = (batchNode.children || [])
+ .filter((c) => c.nodeType === "customer")
+ .map((c) => c.customer ?? c.label ?? "")
+ .filter(Boolean);
+ const uniq = Array.from(new Set(customers));
+ inspectSupplierOptions.value = uniq.map((s) => ({ label: s, value: s }));
+
+ form.value.inspectSupplier = "";
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+
+ // 涓嶉渶瑕佺敤鎴峰啀閫変緵搴斿晢锛氱洿鎺ュ彇绗竴鏉� customer 璁＄畻鐢熶骇鏃ユ湡/鏈夋晥鏈�
+ if (inspectSupplierOptions.value.length) {
+ const first = inspectSupplierOptions.value[0].value;
+ form.value.inspectSupplier = first;
+ handleInspectSupplierChange(first);
+ }
+};
+
+const calculateInspectValidityDateByYears = (productionDate, years) => {
+ if (!productionDate) return "";
+ const y = Number(years);
+ if (Number.isNaN(y) || y <= 0) return "";
+ const d = new Date(productionDate);
+ d.setFullYear(d.getFullYear() + Math.floor(y));
+ d.setMonth(d.getMonth() + Math.round((y % 1) * 12));
+ return d.toISOString().split("T")[0];
+};
+
+const handleInspectSupplierChange = (supplier) => {
+ const safeSupplier = String(supplier ?? "").trim();
+ if (!safeSupplier || !inspectBatchNodeByBatchNo.size) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ return;
+ }
+
+ const safeBatchNo = String(form.value.inspectBatchNo ?? "").trim();
+ const batchNode = inspectBatchNodeByBatchNo.get(safeBatchNo);
+ if (!batchNode) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ return;
+ }
+
+ const customerNode = (batchNode.children || []).find(
+ (c) => c.nodeType === "customer" && String(c.customer ?? c.label ?? "").trim() === safeSupplier
+ );
+ if (!customerNode) {
+ form.value.inspectProductionDate = "";
+ form.value.inspectValidityDate = "";
+ form.value.inspectValidityPeriod = "";
+ return;
+ }
+
+ const rawProd =
+ customerNode.productionDate ??
+ customerNode.production_date ??
+ batchNode.productionDate ??
+ batchNode.production_date;
+ form.value.inspectProductionDate = rawProd ? String(rawProd).slice(0, 10) : "";
+
+ // 鏈夋晥鏈熷勾鏁帮細浼樺厛鍙栦緵搴斿晢鑺傜偣锛屽叾娆″洖閫�鍒拌鏍煎瀷鍙锋湁鏁堟湡
+ const validityYears =
+ customerNode.validityPeriod ??
+ customerNode.validity_period ??
+ customerNode.validityYears ??
+ null;
+
+ if (validityYears == null || validityYears === "") {
+ const selectedModel = inspectModelOptions.value.find(
+ (item) => String(item.id) === String(form.value.inspectProductModelId)
+ );
+ form.value.inspectValidityPeriod = selectedModel?.validityPeriod ?? "";
+ form.value.inspectValidityDate = calculateInspectValidityDateByYears(
+ form.value.inspectProductionDate,
+ selectedModel?.validityPeriod ?? ""
+ );
+ } else {
+ form.value.inspectValidityPeriod = validityYears;
+ form.value.inspectValidityDate = calculateInspectValidityDateByYears(
+ form.value.inspectProductionDate,
+ validityYears
+ );
+ }
+};
+
+const restoreInspectMaterialFromRow = async (row) => {
+ try {
+ if (!inspectProductOptions.value?.length) {
+ await getInspectStockTree();
+ }
+ let productKey = row.inspectMaterialConditionId;
+ if (!productKey && row.inspectMaterialCondition) {
+ productKey = findInspectNodeIdByLabel(inspectProductOptions.value, row.inspectMaterialCondition);
+ }
+ if (!productKey) return;
+
+ const categoryNode = findInspectNodeObjByValue(inspectStockInventoryAllTree, productKey);
+ if (!categoryNode || categoryNode.nodeType === "model" || categoryNode.nodeType === "batch") return;
+
+ await getInspectModels(productKey);
+ form.value.inspectMaterialConditionId = productKey;
+ form.value.inspectMaterialCondition = row.inspectMaterialCondition ?? categoryNode.label;
+ const savedSupplier = row.inspectSupplier ?? row.supplier ?? row.inspectCustomer ?? "";
+
+ const merged = inspectModelOptions.value;
+ const targetSpec = String(row.inspectProductModel ?? "").trim();
+ const currentModel =
+ merged.find((m) => String(m.model ?? "").trim() === targetSpec) ||
+ merged.find((m) => String(m.id) === String(row.inspectProductModelId));
+
+ if (currentModel) {
+ form.value.inspectProductModelId = currentModel.id;
+ getInspectProductModel(currentModel.id);
+ await nextTick();
+ form.value.inspectBatchNo = row.inspectBatchNo ?? "";
+ if (form.value.inspectBatchNo) {
+ handleInspectBatchNoChange(form.value.inspectBatchNo);
+ if (savedSupplier) {
+ form.value.inspectSupplier = savedSupplier;
+ handleInspectSupplierChange(savedSupplier);
+ }
+ }
+ } else if (row.inspectProductModelId) {
+ form.value.inspectProductModelId = row.inspectProductModelId;
+ getInspectProductModel(row.inspectProductModelId);
+ await nextTick();
+ form.value.inspectBatchNo = row.inspectBatchNo ?? "";
+ if (form.value.inspectBatchNo) {
+ handleInspectBatchNoChange(form.value.inspectBatchNo);
+ if (savedSupplier) {
+ form.value.inspectSupplier = savedSupplier;
+ handleInspectSupplierChange(savedSupplier);
+ }
+ }
+ }
+
+ form.value.inspectUidNo = row.inspectUidNo ?? form.value.inspectUidNo ?? "";
+ } catch (e) {
+ console.error("鍥炴樉妫�楠岀敤绮夊墏/娑插け璐�", e);
}
};
@@ -775,8 +1115,16 @@
proxy.resetForm("formRef");
tableData.value = [];
testStandardOptions.value = [];
- inspectBatchOptions.value = [];
+ inspectModelOptions.value = [];
+ inspectBatchNoOptions.value = [];
+ inspectSupplierOptions.value = [];
+ inspectBatchNodeByBatchNo = new Map();
form.value.testStandardId = '';
+ form.value.inspectSupplier = '';
+ form.value.inspectBatchNo = '';
+ form.value.inspectProductionDate = '';
+ form.value.inspectValidityDate = '';
+ form.value.inspectValidityPeriod = '';
dialogFormVisible.value = false;
emit('close')
};
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 216ff14..f2d7ea2 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -77,16 +77,14 @@
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inspectedQuantity" placeholder="璇疯緭鍏ワ紝涓嶅ぇ浜庢�绘暟閲�" clearable :precision="2" :disabled="processQuantityDisabled"/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <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> -->
<el-col :span="12">
<el-form-item label="鐢熶骇鏃ユ湡锛�" prop="productionDate">
<el-date-picker
@@ -101,7 +99,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"
@@ -113,9 +111,7 @@
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" placeholder="璇疯緭鍏�" disabled/>
@@ -131,8 +127,6 @@
/>
</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/>
@@ -146,8 +140,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>
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index fc527f3..067f760 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,9 +115,7 @@
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/>
@@ -158,8 +146,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 style="width: 100%">
--
Gitblit v1.9.3