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 @@
-
+
- 费用名称
diff --git a/src/views/operation/paidApply/detail/columns.tsx b/src/views/operation/paidApply/detail/columns.tsx
index 34f8bd1e..6e0605f7 100644
--- a/src/views/operation/paidApply/detail/columns.tsx
+++ b/src/views/operation/paidApply/detail/columns.tsx
@@ -33,41 +33,41 @@ export const businessColumns: BasicColumn[] = [
title: 'RMB未付',
dataIndex: 'unpaidRMB',
width: 120,
- align: 'left'
+ align: 'right'
},
{
title: 'USD未付',
dataIndex: 'unpaidUSD',
width: 120,
- align: 'left'
- },
- {
- title: '其他未付',
- dataIndex: 'unpaidOther',
- width: 120,
- align: 'left'
+ align: 'right'
},
+ // {
+ // title: '其他未付',
+ // dataIndex: 'unpaidOther',
+ // width: 120,
+ // align: 'left'
+ // },
{
title: 'RMB未收',
- dataIndex: 'unpaidOther',
+ dataIndex: 'unreceivedRMB',
width: 120,
- align: 'left'
+ align: 'right'
},
{
title: 'USD未收',
- dataIndex: 'unpaidOther',
+ dataIndex: 'unreceivedUSD',
width: 120,
- align: 'left'
- },
- {
- title: '其他未收',
- dataIndex: 'unpaidOther',
- width: 120,
- align: 'left'
+ align: 'right'
},
+ // {
+ // title: '其他未收',
+ // dataIndex: 'unpaidOther',
+ // width: 120,
+ // align: 'left'
+ // },
{
title: '订舱编号',
- dataIndex: 'unpaidOther',
+ dataIndex: 'bookingNo',
width: 120,
align: 'left'
},
@@ -75,23 +75,23 @@ export const businessColumns: BasicColumn[] = [
title: 'RMB付未开票',
dataIndex: 'unBilledRMB',
width: 120,
- align: 'left'
+ align: 'right'
},
{
title: 'USD付未开票',
dataIndex: 'unBilledUSD',
width: 120,
- align: 'left'
+ align: 'right'
},
{
title: '合计未收',
dataIndex: 'unreceivedTotal',
width: 120,
- align: 'left'
+ align: 'right'
},
{
title: '业务类别',
- dataIndex: 'businessType',
+ dataIndex: 'businessTypeName',
width: 120,
align: 'left'
},
@@ -101,9 +101,9 @@ export const businessColumns: BasicColumn[] = [
width: 120,
align: 'left'
},
- {/////////////
+ {
title: '委托单位',
- dataIndex: 'unreceivedTotal',
+ dataIndex: 'clientName',
width: 120,
align: 'left'
},
@@ -125,12 +125,6 @@ export const businessColumns: BasicColumn[] = [
width: 120,
align: 'left'
},
- {/////////////
- title: '会计日期',
- dataIndex: 'changeOrder',
- width: 120,
- align: 'left'
- },
{
title: '操作',
dataIndex: 'operator',
@@ -143,18 +137,18 @@ export const businessColumns: BasicColumn[] = [
width: 120,
align: 'left'
},
- {////////////////
- title: 'RMB收费状态',
- dataIndex: 'cntrTotal',
- width: 120,
- align: 'left'
- },
- {//////////////////
- title: 'USD收费状态',
- dataIndex: 'cntrTotal',
- width: 120,
- align: 'left'
- },
+ // {////////////////
+ // title: 'RMB收费状态',
+ // dataIndex: 'cntrTotal',
+ // width: 120,
+ // align: 'left'
+ // },
+ // {//////////////////
+ // title: 'USD收费状态',
+ // dataIndex: 'cntrTotal',
+ // width: 120,
+ // align: 'left'
+ // },
{
title: '起运港',
dataIndex: 'loadPort',
@@ -659,7 +653,7 @@ export const searchFormSchema: FormSchema[] = [
}
},
{
- field: 'feeName',
+ field: 'feeId',
label: '费用名称',
component: 'ApiSelect',
colProps: { span: 4 },
diff --git a/src/views/operation/paidApply/detail/components/applyInfo.vue b/src/views/operation/paidApply/detail/components/applyInfo.vue
index 2b23da81..d0637977 100644
--- a/src/views/operation/paidApply/detail/components/applyInfo.vue
+++ b/src/views/operation/paidApply/detail/components/applyInfo.vue
@@ -68,6 +68,7 @@
import { DeleteDetail } from '../../api'
import { exportExcelByData } from '/@/hooks/web/common'
import { useMessage } from '/@/hooks/web/useMessage'
+ import { numberThousandFormat } from '/@/utils/commonUtil'
const { createMessage } = useMessage()
import { useRoute } from 'vue-router'
const route = useRoute()
@@ -154,8 +155,8 @@
(list) => {
if (list && list.length) {
list.forEach(item => {
- if (item.amount) item.amount = item.amount.toLocaleString()
- if (item.originalAmount) item.originalAmount = item.originalAmount.toLocaleString()
+ if (item.amount) item.amount = numberThousandFormat(item.amount, 2, true)
+ if (item.originalAmount) item.originalAmount = numberThousandFormat(item.originalAmount, 2, true)
})
}
setTableData([...list])
diff --git a/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx b/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
index 1293ed93..ca4abe45 100644
--- a/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
+++ b/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
@@ -5,6 +5,7 @@
*/
import { commentProps } from 'ant-design-vue/lib/comment'
import { BasicColumn, FormSchema } from '/@/components/Table'
+import { right } from 'inquirer/lib/utils/readline'
export const columns: BasicColumn[] = [
{
title: '委托编号',
@@ -58,6 +59,7 @@ export const columns: BasicColumn[] = [
title: '申请金额',
dataIndex: 'amount',
width: 100,
+ align: 'right'
},
{
title: '原始币别',
@@ -78,6 +80,7 @@ export const columns: BasicColumn[] = [
title: '原始金额',
dataIndex: 'originalAmount',
width: 100,
+ align: 'right'
},
// {
// title: '进项/销项税率',
diff --git a/src/views/operation/paidApply/detail/components/businessTable.vue b/src/views/operation/paidApply/detail/components/businessTable.vue
index cb6babf0..e11a094a 100644
--- a/src/views/operation/paidApply/detail/components/businessTable.vue
+++ b/src/views/operation/paidApply/detail/components/businessTable.vue
@@ -102,6 +102,7 @@
import feeTable from '/@/components/CostEntry/components/feeTable.vue'
import { BasicForm, useForm } from '/@/components/Form'
import ExchangeRate from './exchangeRate.vue'
+ import { numberThousandFormat } from '/@/utils/commonUtil'
// 引入提示信息
import { useMessage } from '/@/hooks/web/useMessage'
import { Divider } from 'ant-design-vue'
@@ -139,6 +140,11 @@
const res = await GetBizList(p)
res.data.forEach((item, index) => {
item['idIndex'] = item.id + index
+ if (item['unpaidRMB']) item['unpaidRMB'] = numberThousandFormat(item['unpaidRMB'], 2, true)
+ if (item['unpaidUSD']) item['unpaidUSD'] = numberThousandFormat(item['unpaidUSD'], 2, true)
+ if (item['unBilledRMB']) item['unBilledRMB'] = numberThousandFormat(item['unBilledRMB'], 2, true)
+ if (item['unBilledUSD']) item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, true)
+ if (item['unreceivedTotal']) item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, true)
})
if (res?.data?.length) state.historyRowKeys = [res.data[0].id + 0]
setSelectedRows([res.data[0]])
@@ -335,7 +341,7 @@
const qCondition = []
const formData = getForm().getFieldsValue()
for (var key in formData) {
- if (formData[key]) {
+ if (formData[key] && (key == 'feeType' || key == 'currency' || key == 'feeId')) {
qCondition.push({
FieldName: key,
FieldValue: formData[key],
@@ -376,7 +382,6 @@
bPostData.value = postData
if (currencyList.length == 0) {
// 原币申请
-
BizSave(postData).then(res => {
loading.value = false
if (res.succeeded) {