diff --git a/src/views/finance/paymentSettlement/columns.tsx b/src/views/finance/paymentSettlement/columns.tsx index 6e539a4f..c2e91d27 100644 --- a/src/views/finance/paymentSettlement/columns.tsx +++ b/src/views/finance/paymentSettlement/columns.tsx @@ -17,6 +17,7 @@ export const columns: BasicColumn[] = [ title: '结算单位', dataIndex: 'customerName', sorter: true, + align: 'left', width: 130 }, { @@ -24,6 +25,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'billType', sorter: true, width: 80, + align: 'left', customRender: ({ text }) => { if (text === 1) { return '收费' @@ -37,12 +39,14 @@ export const columns: BasicColumn[] = [ title: '结算方式', dataIndex: 'modeText', sorter: true, + align: 'left', width: 80 }, { title: '币别', dataIndex: 'currency', sorter: true, + align: 'left', width: 80 }, { @@ -69,31 +73,36 @@ export const columns: BasicColumn[] = [ title: '未开票', dataIndex: 'unInvoiceAmount', sorter: true, + align: 'left', width: 100 }, { title: '结算时间', dataIndex: 'settlementDate', sorter: true, - width: 100 + align: 'left', + width: 90 }, { title: '结算人', dataIndex: 'createByName', sorter: true, + align: 'left', width: 100 }, { title: '结算账户', dataIndex: 'customerBank', sorter: true, - width: 100 + align: 'left', + width: 120 }, { title: '银行账号', dataIndex: 'customerAccount', sorter: true, - width: 100 + align: 'left', + width: 120 }, { title: '原始金额', @@ -106,12 +115,14 @@ export const columns: BasicColumn[] = [ title: '申请单号', dataIndex: 'applicationNO', sorter: true, - width: 100 + align: 'left', + width: 120 }, { title: '总账凭证号', dataIndex: 'ledgerVoucherNO', sorter: true, + align: 'left', width: 100 } ] diff --git a/src/views/finance/paymentSettlement/detail/components/businessTable.vue b/src/views/finance/paymentSettlement/detail/components/businessTable.vue index 10ef8cdd..7525beaa 100644 --- a/src/views/finance/paymentSettlement/detail/components/businessTable.vue +++ b/src/views/finance/paymentSettlement/detail/components/businessTable.vue @@ -80,6 +80,13 @@ import { useMessage } from '/@/hooks/web/useMessage' import { Divider } from 'ant-design-vue' import { formatParams } from '/@/hooks/web/common' + import { useRoute, useRouter } from 'vue-router' + import { useGo } from '/@/hooks/web/usePage' + import { useMultipleTabStore } from '/@/store/modules/multipleTab' + const tabStore = useMultipleTabStore() + const go = useGo() + const route = useRoute() + const router = useRouter() const emit = defineEmits(['save', 'refresh']) const { createMessage } = useMessage() const props = defineProps({ @@ -246,10 +253,18 @@ }) loading.value = true Save(bPostData.value).then(res => { - console.log(bPostData.value) loading.value = false - if (res.succeeded) { + if (route.path == '/payment-settlement/create') { + // 新建 createMessage.success('添加成功!') + const { fullPath } = route //获取当前路径 + tabStore.closeTabByKey(fullPath, router) + setTimeout(() => { + go(`/payment-settlement/detail?id=${res.data.id}&type=1`) + }, 50) + } else { + // 保存 + createMessage.success('保存成功!') if (res?.data?.id) { emit('refresh', res.data.id) } diff --git a/src/views/finance/paymentSettlement/detail/index.vue b/src/views/finance/paymentSettlement/detail/index.vue index 4702a724..0654e468 100644 --- a/src/views/finance/paymentSettlement/detail/index.vue +++ b/src/views/finance/paymentSettlement/detail/index.vue @@ -19,6 +19,7 @@ > +