diff --git a/src/components/CostEntry/components/feeColumns.tsx b/src/components/CostEntry/components/feeColumns.tsx index bb4dfdc1..fb6cb4cc 100644 --- a/src/components/CostEntry/components/feeColumns.tsx +++ b/src/components/CostEntry/components/feeColumns.tsx @@ -88,7 +88,8 @@ export const feeApplyColumns = [ }, { title: '金额', width: 80, - dataIndex: 'amount' + dataIndex: 'amount', + align: 'right' }, { title: '币别', width: 60, @@ -96,7 +97,8 @@ export const feeApplyColumns = [ }, { title: '未结金额', width: 80, - dataIndex: 'restAmount' + dataIndex: 'restAmount', + align: 'right' }, { title: '本次申请金额', width: 100, @@ -108,7 +110,8 @@ export const feeApplyColumns = [ }, { title: '开票金额', width: 100, - dataIndex: 'invoiceAmount' + dataIndex: 'invoiceAmount', + align: 'right' }, { title: '备注', width: 150, diff --git a/src/components/CostEntry/components/feeTable.vue b/src/components/CostEntry/components/feeTable.vue index a13833d2..556e87fc 100644 --- a/src/components/CostEntry/components/feeTable.vue +++ b/src/components/CostEntry/components/feeTable.vue @@ -45,6 +45,7 @@ import { feeStatusList } from '../columns' // 根据记录id查询费用 import { GetList, GetFees } from '../api' + import { numberThousandFormat } from '/@/utils/commonUtil' // 模版id查询费用 import { GetFeeTemplateDetailList } from '/@/views/fee/template/api' const props = defineProps({ @@ -83,6 +84,9 @@ loading.value = false const { data } = res data.forEach((item, index) => { + if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true) + if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true) + if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true) item['feeStatusText'] = feeStatusList[item.feeStatus] if (item.createTime) item.createTime = item.createTime.split(' ')[0] if (item.auditDate) item.auditDate = item.auditDate.split(' ')[0] @@ -112,6 +116,9 @@ const { data } = res loading.value = false data.items.forEach((item, index) => { + if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true) + if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true) + if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true) item['feeStatusText'] = feeStatusList[item.feeStatus] item['id'] = item.recordId if (item.createTime) item.createTime = item.createTime.split(' ')[0] @@ -139,6 +146,9 @@ const { data } = res loading.value = false data.forEach((item, index) => { + if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true) + if (item.restAmount) item.restAmount = numberThousandFormat(item.restAmount, 2, true) + if (item.invoiceAmount) item.invoiceAmount = numberThousandFormat(item.invoiceAmount, 2, true) item['feeStatusText'] = feeStatusList[item.feeStatus] if (item.createTime) item.createTime = item.createTime.split(' ')[0] if (item.auditDate) item.auditDate = item.auditDate.split(' ')[0] diff --git a/src/views/approve/fee/components/feeTable.vue b/src/views/approve/fee/components/feeTable.vue index 3cfc6c03..1201889f 100644 --- a/src/views/approve/fee/components/feeTable.vue +++ b/src/views/approve/fee/components/feeTable.vue @@ -73,7 +73,7 @@ -
+