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/finalInspection/components/formDia.vue | 928 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 845 insertions(+), 83 deletions(-)
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index ec0cb42..407cd6f 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -18,13 +18,17 @@
@change="getModels"
:data="productOptions"
:render-after-expand="false"
+ :disabled="operationType === 'edit'"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
- <el-input v-model="form.model" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select v-model="form.productModelId" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
+ filterable readonly @change="handleChangeModel">
+ <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -45,16 +49,68 @@
</el-select>
</el-form-item>
</el-col>
+ <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="unit">
- <el-input v-model="form.unit" 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-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"/>
+ <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>
@@ -96,6 +152,89 @@
</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="inspectProductOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ @change="getInspectModels"
+ />
+ </el-form-item>
+ </el-col>
+ <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="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="璇烽�夋嫨"
+ clearable
+ filterable
+ style="width: 100%"
+ @change="handleInspectBatchNoChange"
+ >
+ <el-option
+ v-for="item in inspectBatchNoOptions"
+ :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="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="12">
+ <el-form-item label="鏈夋晥鏈燂紙妫�楠岋級锛�" prop="inspectValidityDate">
+ <el-input v-model="form.inspectValidityDate" placeholder="鑷姩璁＄畻" disabled/>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<PIMTable
rowKey="id"
@@ -104,9 +243,51 @@
:tableLoading="tableLoading"
height="400"
>
- <template #slot="{ row }">
- <el-input v-model="row.testValue" clearable/>
- </template>
+ <template #instrument="{ row }">
+ <el-select
+ v-model="row.instrument"
+ placeholder="璇烽�夋嫨鎴栬緭鍏�"
+ filterable
+ allow-create
+ default-first-option
+ clearable
+ style="width: 100%"
+ @change="handleInstrumentChange(row)"
+ >
+ <el-option label="鐩祴" value="鐩祴" />
+ <el-option
+ v-for="item in deviceList"
+ :key="item.id"
+ :label="item.deviceName + (item.deviceModel ? ' / ' + item.deviceModel : '')"
+ :value="item.deviceName"
+ />
+ </el-select>
+ </template>
+ <template #deviceStatus="{ row }">
+ <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 />
+ </template>
+ <template #resultJudgment="{ row }">
+ <el-select v-model="row.resultJudgment" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option label="鍚堟牸" value="鍚堟牸" />
+ <el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�" />
+ <el-option label="/" value="/" />
+ </el-select>
+ </template>
</PIMTable>
<template #footer>
<div class="dialog-footer">
@@ -119,18 +300,29 @@
</template>
<script setup>
-import {ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
+import {ref, reactive, toRefs, computed, getCurrentInstance, nextTick} from "vue";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
-import {productTreeList} from "@/api/basicData/product.js";
+import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {userListNoPage} from "@/api/system/user.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";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
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: "",
@@ -138,51 +330,202 @@
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
testStandardId: "",
unit: "",
+ uidNo: "",
+ batchNo: "",
+ inspectedQuantity: "",
quantity: "",
+ productionDate: "",
+ validityDate: "",
checkCompany: "",
checkResult: "",
+ // 妫�楠岀敤绮夊墏/娑叉儏鍐电浉鍏虫柊瀛楁
+ inspectMaterialConditionId: "",
+ inspectMaterialCondition: "",
+ inspectProductModelId : "",
+ inspectBatchNo: "",
+ inspectSupplier: "",
+ inspectProductModel: "",
+ inspectUidNo: "",
+ inspectProductionDate: "",
+ inspectValidityDate: "",
+ inspectValidityPeriod: "",
},
rules: {
checkTime: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
process: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkName: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
productId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- model: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
+ 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" }],
},
});
const { form, rules } = toRefs(data);
+// 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯鏁伴噺缃伆
+const quantityDisabled = computed(() => {
+ const v = form.value || {};
+ return !!(v.productMainId != null || v.purchaseLedgerId != null);
+});
const supplierList = ref([]);
const productOptions = 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: "鎸囨爣",
+ label: "妫�娴嬮」鐩�",
prop: "parameterItem",
+ width: 150
},
{
- label: "鍗曚綅",
- prop: "unit",
- },
- {
- label: "鏍囧噯鍊�",
+ label: "鏍囧噯瑕佹眰",
prop: "standardValue",
+ width: 180
},
+ {
+ 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: "controlValue",
- },
- {
- label: "妫�楠屽��",
- prop: "testValue",
+ label: "缁撴灉鍒ゆ柇",
+ prop: "resultJudgment",
dataType: 'slot',
- slot: 'slot',
+ slot: 'resultJudgment',
+ width: 120
},
]);
const tableData = ref([]);
@@ -190,79 +533,142 @@
const userList = ref([]);
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
-
+const modelOptions = ref([]);
+const deviceList = ref([]);
// 鎵撳紑寮规
const openDialog = async (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- getOptions().then((res) => {
- supplierList.value = res.data;
- });
- let userLists = await userListNoPage();
- userList.value = userLists.data;
- form.value = {}
+ // 鍏堟竻绌鸿〃鍗曢獙璇佺姸鎬侊紝閬垮厤闂儊
+ await nextTick();
+ proxy.$refs.formRef?.clearValidate();
+ // 鍔犺浇璁惧鍙拌处鍒楄〃
+ loadDeviceList();
+
+ // 骞惰鍔犺浇鍩虹鏁版嵁
+ const [userListsRes] = await Promise.all([
+ userListNoPage(),
+ getMainProductTree(),
+ getInspectStockTree(),
+ getOptions().then((res) => {
+ supplierList.value = res.data;
+ })
+ ]);
+ userList.value = userListsRes.data;
+
+ form.value = {}
testStandardOptions.value = [];
tableData.value = [];
- getProductOptions();
+
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
// 鍏堣缃〃鍗曟暟鎹紝浣嗘殏鏃舵竻绌� testStandardId锛岀瓑閫夐」鍔犺浇瀹屾垚鍚庡啀璁剧疆
form.value = {...row, testStandardId: ''}
- currentProductId.value = row.productId || 0
- // 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
- if (currentProductId.value) {
- // 鍏堝姞杞芥寚鏍囬�夐」
- let params = {
- productId: currentProductId.value,
- inspectType: 2
- }
- qualityInspectDetailByProductId(params).then(res => {
- testStandardOptions.value = res.data || [];
- // 浣跨敤 nextTick 鍜� setTimeout 纭繚閫夐」宸茬粡娓叉煋鍒� DOM
- nextTick(() => {
- setTimeout(() => {
- // 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
- if (savedTestStandardId) {
- // 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
- item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
- );
- if (matchedOption) {
- // 纭繚浣跨敤鍖归厤椤圭殑 id锛堜繚鎸佺被鍨嬩竴鑷达級
- form.value.testStandardId = matchedOption.id;
- // 缂栬緫鍦烘櫙淇濈暀宸叉湁妫�楠屽�硷紝鐩存帴鎷夊彇鍘熷弬鏁版暟鎹�
- getQualityInspectParamList(row.id);
- } else {
- // 濡傛灉鎵句笉鍒板尮閰嶉」锛屽皾璇曠洿鎺ヤ娇鐢ㄥ師鍊�
- console.warn('鏈壘鍒板尮閰嶇殑鎸囨爣閫夐」锛宼estStandardId:', savedTestStandardId, '鍙敤閫夐」:', testStandardOptions.value);
- form.value.testStandardId = savedTestStandardId;
- getQualityInspectParamList(row.id);
- }
- } else {
- // 鍚﹀垯浣跨敤鏃х殑閫昏緫
- getQualityInspectParamList(row.id);
- }
- }, 100);
- });
- });
- } else {
- getQualityInspectParamList(row.id);
- }
+ currentProductId.value = row.productId || 0
+ // 娓呯┖楠岃瘉鐘舵�侊紝閬垮厤鏁版嵁鍔犺浇杩囩▼涓殑鏍￠獙闂儊
+ 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)
+ ]).then(([modelRes, testStandardRes]) => {
+ // 璁剧疆瑙勬牸鍨嬪彿閫夐」
+ modelOptions.value = modelRes || [];
+ // 濡傛灉琛ㄥ崟涓凡鏈� productModelId锛岃缃搴旂殑 model 鍜� unit
+ if (form.value.productModelId && modelOptions.value.length > 0) {
+ const selectedModel = modelOptions.value.find(item => item.id == form.value.productModelId);
+ if (selectedModel) {
+ form.value.model = selectedModel.model || '';
+ form.value.unit = selectedModel.unit || '';
+ form.value.uidNo = selectedModel.uidNo || '';
+ }
+ }
+
+ // 璁剧疆鎸囨爣閫夐」
+ testStandardOptions.value = testStandardRes.data || [];
+
+ // 璁剧疆 testStandardId 骞跺姞杞藉弬鏁板垪琛�
+ nextTick(async () => {
+ if (savedTestStandardId) {
+ // 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
+ const matchedOption = testStandardOptions.value.find(item =>
+ item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
+ );
+ if (matchedOption) {
+ // 纭繚浣跨敤鍖归厤椤圭殑 id锛堜繚鎸佺被鍨嬩竴鑷达級
+ form.value.testStandardId = matchedOption.id;
+ } else {
+ // 濡傛灉鎵句笉鍒板尮閰嶉」锛屽皾璇曠洿鎺ヤ娇鐢ㄥ師鍊�
+ console.warn('鏈壘鍒板尮閰嶇殑鎸囨爣閫夐」锛宼estStandardId:', savedTestStandardId, '鍙敤閫夐」:', testStandardOptions.value);
+ form.value.testStandardId = savedTestStandardId;
+ }
+ }
+ await restoreInspectMaterialFromRow(row);
+ // 缂栬緫鍦烘櫙淇濈暀宸叉湁妫�楠屽�硷紝鐩存帴鎷夊彇鍘熷弬鏁版暟鎹�
+ getQualityInspectParamList(row.id);
+ });
+ });
+ } else {
+ nextTick(async () => {
+ await restoreInspectMaterialFromRow(row);
+ getQualityInspectParamList(row.id);
+ });
+ }
}
}
-const getProductOptions = () => {
- productTreeList().then((res) => {
+const getMainProductTree = () => {
+ return productTreeList().then((res) => {
productOptions.value = convertIdToValue(res);
});
};
-const getModels = (value) => {
- currentProductId.value = value
- form.value.productName = findNodeById(productOptions.value, value);
- if (currentProductId.value) {
- getList();
- }
+
+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;
+ form.value.unit = undefined;
+ form.value.uidNo = undefined;
+ form.value.batchNo = "";
+ modelOptions.value = [];
+ currentProductId.value = value
+ form.value.productName = findNodeById(productOptions.value, value);
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ })
+ if (currentProductId.value) {
+ getList();
+ }
+};
+
+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) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
@@ -287,7 +693,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -354,15 +760,371 @@
}
const getQualityInspectParamList = (id) => {
qualityInspectParamInfo(id).then(res => {
- tableData.value = res.data;
+ tableData.value = (res.data || []).map(item => ({...item}));
})
}
+
+// 璁＄畻鏈夋晥鏈燂紙鐢熶骇鏃ユ湡 + 瑙勬牸鍨嬪彿涓殑鏈夋晥鏈燂級
+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];
+ }
+};
+
+// 搴撳瓨鏍戯紙涓庨攢鍞彴璐︿竴鑷达級锛氶�変骇鍝� 鈫� 瑙勬牸鍨嬪彿 鈫� 鎵瑰彿 鈫� 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 = "";
+
+ 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 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 = "";
+ inspectBatchNoOptions.value = [];
+ inspectSupplierOptions.value = [];
+ inspectBatchNodeByBatchNo = new Map();
+ return;
+ }
+
+ 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 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);
+ }
+};
+
+// 鑾峰彇璁惧鍙拌处鍒楄〃
+const loadDeviceList = () => {
+ qualityInspectParamDeviceList().then(res => {
+ deviceList.value = res.data || [];
+ });
+};
+
+// 璁惧鐘舵�侀鑹叉槧灏�
+const getDeviceStatusType = (status) => {
+ const map = {
+ '姝ｅ父': 'success',
+ '杩愯': 'primary',
+ '鍋滄満': 'warning',
+ '缁翠慨': 'danger'
+ };
+ return map[status] || 'info';
+};
+
+// 妫�娴嬪櫒鍏峰彉鍖栨椂锛岃嚜鍔ㄥ～鍏呰澶囩姸鎬�
+const handleInstrumentChange = (row) => {
+ if (row.instrument === '鐩祴') {
+ row.deviceId = null;
+ row.deviceName = '鐩祴';
+ row.deviceStatus = '';
+ return;
+ }
+ const device = deviceList.value.find(d => d.deviceName === row.instrument);
+ if (device) {
+ row.deviceId = device.id;
+ row.deviceName = device.deviceName;
+ row.deviceStatus = device.status || '';
+ } else {
+ row.deviceId = null;
+ row.deviceName = row.instrument || '';
+ row.deviceStatus = '';
+ }
+};
+
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
tableData.value = [];
testStandardOptions.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')
};
--
Gitblit v1.9.3