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 | 10 ++--------
src/views/salesManagement/receiptPaymentHistory/index.vue | 9 ++-------
src/views/procurementManagement/paymentLedger/index.vue | 10 +---------
3 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index db34a7f..d06a448 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -193,20 +193,12 @@
const summarizeMainTable1 = (param) => {
let summarizeTable = proxy.summarizeTable(
param,
- ["invoiceAmount", "paymentAmount"],
+ ["invoiceAmount", "paymentAmount", "payableAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
- if (originalTableDataSon.value.length > 0) {
- summarizeTable[summarizeTable.length - 1] =
- originalTableDataSon.value[
- originalTableDataSon.value.length - 1
- ].payableAmount.toFixed(2);
- } else {
- summarizeTable[summarizeTable.length - 1] = 0.0;
- }
return summarizeTable;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 1982aa8..537b24b 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -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);
});
});
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index f66bed7..3acc9b5 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -103,13 +103,8 @@
prop: "receiptPaymentType",
dataType: "tag",
formatData: (params) => {
- if (params == 0) {
- return "鐢垫眹";
- } else if (params == 1) {
- return "鎵垮厬";
- } else {
- return null;
- }
+ const item = receipt_payment_type.value.find((item) => item.value === params);
+ return item ? item.label : "";
},
formatType: (params) => {
return "info";
--
Gitblit v1.9.3