fix: 修复表格列格式化逻辑和汇总计算错误
- 在收款付款历史中,将硬编码的收款付款类型标签替换为从配置项动态获取
- 在付款台账中,修复汇总表计算逻辑,移除手动设置应付金额的代码,将payableAmount加入自动汇总
- 在原材料检验表单中,优化编辑时检验参数加载逻辑,确保始终加载保存的参数
| | |
| | | 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; |
| | | }; |
| | | /** 搜索按钮操作 */ |
| | |
| | | // 使用 nextTick 和 setTimeout 确保选项已经渲染到 DOM |
| | | nextTick(() => { |
| | | setTimeout(() => { |
| | | // 如果编辑数据中有 testStandardId,则设置并加载对应的参数 |
| | | if (savedTestStandardId) { |
| | | // 确保类型匹配(item.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('未找到匹配的指标选项,testStandardId:', savedTestStandardId, '可用选项:', testStandardOptions.value); |
| | | form.value.testStandardId = savedTestStandardId; |
| | | handleTestStandardChange(savedTestStandardId); |
| | | } |
| | | } else { |
| | | // 否则使用旧的逻辑 |
| | | } |
| | | // 编辑时始终加载保存的检验参数 |
| | | getQualityInspectParamList(row.id); |
| | | } |
| | | }, 100); |
| | | }); |
| | | }); |
| | |
| | | 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"; |