feat: 正式结算单新增预付汇总栏与付款记录合并展示
结算合计下新增汇总栏(结算合计原金额-已付金额含预付核销-剩余未付);只读付款信息合并展示进度预付-项目预付核销-结算尾款三类记录;预结算转正式自动预填来源预结算核销行;单据状态名提取公共 settlementStatus 工具与预结算编辑器共用
This commit is contained in:
@@ -990,6 +990,7 @@ import {
|
||||
} from '@/option/settlement/preSettlementTable';
|
||||
import { formatContractOptionLabel } from '@/utils/contract';
|
||||
import { normalizeCurrencyCode } from '@/utils/currency';
|
||||
import { settlementStatusName } from '@/utils/settlementStatus';
|
||||
import { downloadFileByUrl } from '@/utils/util';
|
||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||
import * as XLSX from 'xlsx';
|
||||
@@ -2877,15 +2878,7 @@ export default {
|
||||
return value === undefined || value === null || value === '' ? '-' : value;
|
||||
},
|
||||
advanceStatusName(status) {
|
||||
return (
|
||||
{
|
||||
reviewing: '审批中',
|
||||
approved: '审批通过',
|
||||
paid: '已付款',
|
||||
returned: '已驳回',
|
||||
voided: '已作废',
|
||||
}[status] || this.displayValue(status)
|
||||
);
|
||||
return settlementStatusName(status, this.displayValue);
|
||||
},
|
||||
advanceCreateUserName(row) {
|
||||
return this.displayValue(
|
||||
|
||||
Reference in New Issue
Block a user