diff --git a/src/views/finance/paymentSettlement/columns.tsx b/src/views/finance/paymentSettlement/columns.tsx index f5000d9d..6e539a4f 100644 --- a/src/views/finance/paymentSettlement/columns.tsx +++ b/src/views/finance/paymentSettlement/columns.tsx @@ -113,12 +113,6 @@ export const columns: BasicColumn[] = [ dataIndex: 'ledgerVoucherNO', sorter: true, width: 100 - }, - { - title: '结算日期', - dataIndex: 'settlementDate', - sorter: true, - width: 100 } ] diff --git a/src/views/finance/paymentSettlement/detail/columns.tsx b/src/views/finance/paymentSettlement/detail/columns.tsx index fbd19ac6..59f3a06e 100644 --- a/src/views/finance/paymentSettlement/detail/columns.tsx +++ b/src/views/finance/paymentSettlement/detail/columns.tsx @@ -12,8 +12,9 @@ const route = useRoute() import { GetClientListByCode, getOrgList, GetClientBank, GetFeeCurrencySelectList } from '/@/api/common' import { GetOrgList, ClientCommonGetStlMode, GetClientBankList,GetOrgBankList } from '../../feeSettlement/api' + // 业务表格列 -export const businessColumns: BasicColumn[] = [ +export const mainBusinessColumns: BasicColumn[] = [ { title: '申请单号', dataIndex: 'applicationNO', @@ -130,6 +131,124 @@ export const businessColumns: BasicColumn[] = [ } ] +// 业务表格列 +export const businessColumns: BasicColumn[] = [ + { + title: '申请单号', + dataIndex: 'applicationNO', + width: 120, + align: 'left' + }, + { + title: '状态', + dataIndex: 'statusText', + width: 100, + align: 'left' + }, + { + title: '结算单位', + dataIndex: 'customerName', + width: 120, + align: 'left' + }, + { + title: 'RMB申请金额', + dataIndex: 'amountRMB', + width: 100, + align: 'left' + }, + { + title: 'RMB未结金额', + dataIndex: 'unSettledRMB', + width: 100, + align: 'left' + }, + { + title: 'RMB本次结算', + dataIndex: 'settlementRMB', + width: 100, + align: 'left' + }, + { + title: 'USD申请金额', + dataIndex: 'amountUSD', + width: 100, + align: 'left' + }, + { + title: 'USD未结金额', + dataIndex: 'unSettledUSD', + width: 100, + align: 'left' + }, + { + title: 'USD本次结算', + dataIndex: 'settlementUSD', + width: 100, + align: 'left' + }, + { + title: '申请日期', + dataIndex: 'createTime', + width: 100, + align: 'left' + }, + { + title: '申请人', + dataIndex: 'createByName', + width: 100, + align: 'left' + }, + { + title: '申请支付日期', + dataIndex: 'paymentDate', + width: 100, + align: 'left' + }, + { + title: '结算方式', + dataIndex: 'settlementTypeName', + width: 100, + align: 'left' + }, + { + title: '审核实付金额', + dataIndex: 'payAmount', + width: 100, + align: 'left' + }, + { + title: '审核时间', + dataIndex: 'auditTime', + width: 100, + align: 'left' + }, + { + title: '审核人', + dataIndex: 'auditerName', + width: 100, + align: 'left' + }, + { + title: '客户银行', + dataIndex: 'customerBankName', + width: 120, + align: 'left' + }, + { + title: '银行账号', + dataIndex: 'customerAccount', + width: 120, + align: 'left' + }, + { + title: '所属分部', + dataIndex: 'saleDeptName', + width: 120, + align: 'left' + } +] + // 费用表格 export const feeColumns: BasicColumn[] = [ { @@ -509,7 +628,7 @@ export const formSchema: FormSchema[] = [ field: 'relativeNO', label: '相关号码', component: 'InputNumber', - dynamicDisabled: true, + dynamicDisabled: false, colProps: { span: 4 } }, { diff --git a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue index 7da6dd9f..c557946d 100644 --- a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue +++ b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue @@ -53,7 +53,7 @@