From d95c8b4acaa7741fdeee630940011b3621a0582a Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期二, 07 四月 2026 14:18:39 +0800
Subject: [PATCH] fix: 修复表格列格式化逻辑和汇总计算错误
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 5cafd2c..537b24b 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -26,23 +26,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
- <el-tree-select
- v-model="form.productId"
- placeholder="璇烽�夋嫨"
- clearable
- check-strictly
- @change="getModels"
- :data="productOptions"
- :render-after-expand="false"
- style="width: 100%"
- />
+ <el-tree-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable check-strictly
+ @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<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 @change="getProductModel" style="width: 100%">
+ <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">
@@ -141,7 +133,7 @@
<script setup>
import {ref, reactive, toRefs, 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 {ElMessageBox} from "element-plus";
import {qualityInspectParamDel, qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
@@ -159,6 +151,7 @@
checkName: "",
productName: "",
productId: "",
+ productModelId: "",
model: "",
testStandardId: "",
unit: "",
@@ -171,6 +164,7 @@
supplier: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
checkName: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
productId: [{required: true, message: "璇疯緭鍏�", trigger: "blur"}],
+ productModelId: [{required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change"}],
model: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
testStandardId: [{required: true, message: "璇烽�夋嫨鎸囨爣", trigger: "change"}],
unit: [{required: false, message: "璇疯緭鍏�", trigger: "blur"}],
@@ -209,6 +203,7 @@
const {form, rules} = toRefs(data);
const supplierList = ref([]);
const productOptions = ref([]);
+const modelOptions = ref([]);
const currentProductId = ref(0);
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
@@ -222,6 +217,7 @@
form.value = {}
testStandardOptions.value = [];
tableData.value = [];
+ modelOptions.value = [];
getProductOptions();
if (operationType.value === 'edit') {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
@@ -230,6 +226,10 @@
currentProductId.value = row.productId || 0
// 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
if (currentProductId.value) {
+ // 鍔犺浇瑙勬牸鍨嬪彿閫夐」
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res;
+ });
// 鍏堝姞杞芥寚鏍囬�夐」
let params = {
productId: currentProductId.value,
@@ -240,26 +240,20 @@
// 浣跨敤 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;
- handleTestStandardChange(matchedOption.id);
} else {
- // 濡傛灉鎵句笉鍒板尮閰嶉」锛屽皾璇曠洿鎺ヤ娇鐢ㄥ師鍊�
console.warn('鏈壘鍒板尮閰嶇殑鎸囨爣閫夐」锛宼estStandardId:', savedTestStandardId, '鍙敤閫夐」:', testStandardOptions.value);
form.value.testStandardId = savedTestStandardId;
- handleTestStandardChange(savedTestStandardId);
}
- } else {
- // 鍚﹀垯浣跨敤鏃х殑閫昏緫
- getQualityInspectParamList(row.id);
}
+ // 缂栬緫鏃跺缁堝姞杞戒繚瀛樼殑妫�楠屽弬鏁�
+ getQualityInspectParamList(row.id);
}, 100);
});
});
@@ -276,10 +270,26 @@
const getModels = (value) => {
currentProductId.value = value
form.value.productName = findNodeById(productOptions.value, value);
+ modelOptions.value = [];
+ form.value.productModelId = "";
+ form.value.model = "";
if (currentProductId.value) {
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res;
+ });
getList();
}
};
+const getProductModel = (value) => {
+ const index = modelOptions.value.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ form.value.model = modelOptions.value[index].model;
+ form.value.unit = modelOptions.value[index].unit;
+ } else {
+ form.value.model = "";
+ form.value.unit = "";
+ }
+};
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
--
Gitblit v1.9.3