diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index e76ef6f..4f43125 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -15,7 +15,7 @@
{{ item.title }}:
{{ detailData[item.fieldName] }}%
- {{ detailData[item.fieldName] }}
+ {{ item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName] }}
@@ -51,7 +51,7 @@
:key="index">
{{ item.title }}:
- {{ detailData[item.fieldName] }}
+ {{ item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName] }}
@@ -92,7 +92,7 @@
{{ index + 1 }}阶段应付:
- {{ item.accountsReceivableAmount }}
+ {{ formatMoney(item.accountsReceivableAmount) }}
@@ -104,7 +104,7 @@
{{ index + 1 }}阶段实付:
- {{ item.paidAmount }}
+ {{ formatMoney(item.paidAmount) }}
@@ -204,6 +204,7 @@ import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
import { archiveExpenditureContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'ExpenditureContractDetail',
@@ -247,13 +248,15 @@ export default {
title: '部门名称'
}, {
fieldName: 'contractAmount',
- title: '签订合同总金额'
+ title: '签订合同总金额',
+ format: formatMoney
}, {
fieldName: 'rate',
title: '税率'
}, {
fieldName: 'noTaxAmount',
- title: '未税金额'
+ title: '未税金额',
+ format: formatMoney
}
],
// 日期节点
@@ -273,13 +276,16 @@ export default {
accountInfoList: [
{
fieldName: 'accountsReceivableAmount',
- title: '应付金额'
+ title: '应付金额',
+ format: formatMoney
}, {
fieldName: 'amountReceived',
- title: '已付金额'
+ title: '已付金额',
+ format: formatMoney
}, {
fieldName: 'amountReceived',
- title: '未付金额'
+ title: '未付金额',
+ format: formatMoney
}, {
fieldName: 'accountStatus_dictText',
title: '赊账状态'
@@ -323,6 +329,7 @@ export default {
this.initDetailData()
},
methods: {
+ formatMoney,
initDetailData() {
if (!this.$route.query.revenueId) {
return
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index e49579e..0bfcce5 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -120,6 +120,13 @@
{{ text }}
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
@@ -157,6 +164,7 @@ import JDate from '../../../components/tools/JDate'
import { archiveExpenditureContract, cancellationExpenditureContract } from '../../../api/incomePaymentsApi'
import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
import MailDetailModal from '../modules/MailDetailModal'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'ExpenditureContractList',
@@ -221,7 +229,7 @@ export default {
align: 'center',
dataIndex: 'contractAmount',
width: 160,
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'allMoney' }
}, {
title: '状态',
align: 'center',
@@ -253,6 +261,7 @@ export default {
}
},
methods: {
+ formatMoney,
handleAdd() {
this.$router.push({
path: '/contractManagement/RevenueContractModule'
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index bda5b67..ae3ae92 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -133,7 +133,13 @@
{{ text }}
-
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
{{ text }}
@@ -179,6 +185,7 @@ import { archiveRevenueContract, cancellationContract } from '../../../api/incom
import JYearDate from '../../../components/jero/JYearDate'
import MailDetailModal from '../modules/MailDetailModal'
import RevenueContractEditNum from './modules/RevenueContractEditNum'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'RevenueContractList',
@@ -268,7 +275,8 @@ export default {
title: '合同总金额',
align: 'center',
dataIndex: 'contractAmount',
- width: 160
+ width: 160,
+ scopedSlots: { customRender: 'allMoney' }
}, {
title: '状态',
align: 'center',
@@ -293,6 +301,7 @@ export default {
}
},
methods: {
+ formatMoney,
searchReset() {
this.lastQueryParam = {}
this.queryParam = {}
diff --git a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
index c84fd36..ccb9677 100644
--- a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
+++ b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue
@@ -12,8 +12,21 @@
:loading="associatedProjectLoading"
class="j-table-force-nowrap associated-project">
+
+
+
-
+
+ {{ text }}
+ {{ text }}
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
@@ -29,6 +42,7 @@
diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue
index 3f0ead5..157ced7 100644
--- a/src/views/incomePayments/memberManage/MemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/MemberProjectList.vue
@@ -62,8 +62,17 @@
-
-
+
+ {{ text }}
+ {{ text }}
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
编辑
@@ -85,6 +94,7 @@ import MemberProjectModal from '@views/incomePayments/memberManage/modules/Membe
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconImg from '@/assets/imgs/icon/icon_data_members.png'
import '@/assets/less/TableExpand.less'
+import { formatMoney } from '@/utils/formatMoney'
export default {
mixins: [JeroListMixin, mixinDevice],
@@ -118,7 +128,7 @@ export default {
title: '收费标准',
align: 'center',
dataIndex: 'chargeStandard',
- scopedSlots: {customRender: 'text'}
+ scopedSlots: {customRender: 'allMoney'}
},
{
title: '负责人',
@@ -147,6 +157,7 @@ export default {
},
},
methods: {
+ formatMoney,
/*
* 会员项目成员维护
* */
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 8d03de7..bd09980 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -78,8 +78,17 @@
-
-
+
+ {{ text }}
+ {{ text }}
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
@@ -122,6 +131,7 @@ import ProjectDetailModal from '@comp/ProjectDetailModal'
import '@/assets/less/TableExpand.less'
import StatusSlot from '@comp/tools/StatusSlot'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'SafeguardStardsMemberList',
@@ -196,13 +206,13 @@ export default {
title: '待确收金额',
align: 'center',
dataIndex: 'amountReceivable',
- scopedSlots: { customRender: 'text' },
+ scopedSlots: { customRender: 'allMoney' }
},
{
title: '实收金额',
align: 'center',
dataIndex: 'paidAmount',
- scopedSlots: { customRender: 'text' },
+ scopedSlots: { customRender: 'allMoney' }
},
{
title: '打包',
@@ -246,6 +256,9 @@ export default {
this.filters.projectId = this.$route.query.id
this.loadData(1)
},
+ methods: {
+ formatMoney
+ }
}
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index f105029..11ec2af 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -67,7 +67,7 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x: 1600}"
+ :scroll="{x: 1300}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -83,7 +83,17 @@
-
+
+ {{ text }}
+ {{ text }}
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
@@ -112,6 +122,7 @@ import JDate from '@comp/tools/JDate'
import { downloadFile } from '@/api/manage'
import SelectPrincipal from '@/components/company/SelectPrincipal'
import ProjectDetailModal from '../../components/ProjectDetailModal'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'BillMail',
@@ -143,7 +154,7 @@ export default {
},
{
title: '来款项目',
- width: 280,
+ width: 240,
ellipsis: true,
align: 'center',
dataIndex: 'projectName',
@@ -152,23 +163,24 @@ export default {
{
title: '票号',
align: 'center',
- width: 200,
+ width: 150,
dataIndex: 'billNo',
scopedSlots: { customRender: 'text' }
},
{
title: '开票金额',
align: 'center',
- width: 200,
+ width: 120,
dataIndex: 'invoiceAmount',
- customRender: (text, record) => (
-
- )
+ scopedSlots: {customRender: 'allMoney'}
+ // customRender: (text, record) => (
+ //
+ // )
},
{
title: '项目负责人',
align: 'center',
- width: 280,
+ width: 120,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
},
@@ -189,14 +201,14 @@ export default {
{
title: '邮寄联系人',
align: 'center',
- width: 280,
+ width: 120,
dataIndex: 'contactName',
scopedSlots: { customRender: 'text' }
},
{
title: '联系人电话',
align: 'center',
- width: 200,
+ width: 150,
dataIndex: 'contactMobile',
scopedSlots: { customRender: 'text' }
},
@@ -217,7 +229,7 @@ export default {
title: '操作',
align: 'center',
fixed: 'right',
- width: 160,
+ width: 120,
scopedSlots: { customRender: 'action' }
}
],
@@ -228,6 +240,7 @@ export default {
}
},
methods: {
+ formatMoney,
// 查看物流
goLogistics(record) {
const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index d5cbe4e..324386b 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -51,7 +51,7 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:1600}"
+ :scroll="{x:1300}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -60,7 +60,7 @@
class="j-table-force-nowrap"
@change="handleTableChange">
-
+
@@ -70,6 +70,13 @@
{{ text }}
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
打印
@@ -96,6 +103,7 @@ import MailContractModal from './modules/MailContractModal'
import { downloadFile } from '@/api/manage'
import SelectPrincipal from '@/components/company/SelectPrincipal'
import { checkCompanyAduit } from '../../api/incomePaymentsApi'
+import { formatMoney } from '@/utils/formatMoney'
export default {
name: 'ContractMail',
@@ -128,7 +136,7 @@ export default {
{
title: '合同编号',
align: 'center',
- width: 300,
+ width: 240,
dataIndex: 'contractNum',
scopedSlots: { customRender: 'text' }
},
@@ -142,51 +150,49 @@ export default {
{
title: '签订单位',
align: 'center',
- width: 300,
+ width: 280,
dataIndex: 'signedCompanyTemporaryName',
scopedSlots: { customRender: 'text' }
},
{
title: '负责人',
align: 'center',
- width: 300,
+ width: 120,
dataIndex: 'principalName',
scopedSlots: { customRender: 'text' }
},
{
title: '合同总金额',
align: 'center',
- width: 200,
+ width: 120,
dataIndex: 'contractAmount',
- customRender: (text, record) => (
-
- )
+ scopedSlots: {customRender: 'allMoney'}
},
{
title: '合同类型',
align: 'center',
- width: 100,
+ width: 80,
dataIndex: 'contractType_dictText',
scopedSlots: { customRender: 'text' }
},
{
title: '邮寄联系人',
align: 'center',
- width: 300,
+ width: 120,
dataIndex: 'liaisonMan',
scopedSlots: { customRender: 'text' }
},
{
title: '联系人电话',
align: 'center',
- width: 200,
+ width: 150,
dataIndex: 'mobile',
scopedSlots: { customRender: 'text' }
},
{
title: '状态',
align: 'center',
- width: 200,
+ width: 100,
dataIndex: 'postStatus_dictText',
scopedSlots: { customRender: 'text' }
},
@@ -201,7 +207,7 @@ export default {
title: '操作',
align: 'center',
fixed: 'right',
- width: 160,
+ width: 120,
scopedSlots: { customRender: 'action' }
}
],
@@ -212,6 +218,7 @@ export default {
}
},
methods: {
+ formatMoney,
// 查看物流
goLogistics(record) {
const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'