From e9ef50c9e0768921f3c1b250f47efdc750bc5dca Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 25 Dec 2023 16:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC=E4=B8=AD=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=89=E4=BD=8D=E7=94=A8=E9=80=97=E5=8F=B7?=
 =?UTF-8?q?=E5=88=86=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractDetail.vue             | 25 ++++++++-----
 .../ExpenditureContractList.vue               | 11 +++++-
 .../revenueContract/RevenueContractList.vue   | 13 ++++++-
 .../modules/AssociatedProject.vue             | 21 +++++++++--
 .../modules/RevenueContractDetail.vue         | 25 ++++++++-----
 .../ArriveAndInvoivingList.vue                | 18 +++++++--
 .../incomePayments/meetManage/Attendance.vue  | 12 ++++++
 .../CertificateMaintenanceList.vue            | 21 +++++++++--
 .../memberManage/MemberProjectList.vue        | 17 +++++++--
 .../SafeguardStardsMemberList.vue             | 21 +++++++++--
 src/views/mailManagement/BillMail.vue         | 37 +++++++++++++------
 src/views/mailManagement/ContractMail.vue     | 35 +++++++++++-------
 12 files changed, 192 insertions(+), 64 deletions(-)

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 @@
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ item.title }}：</a-col>
                 <a-col :sm="14" :xs="24" v-if="item.fieldName === 'rate'">{{ detailData[item.fieldName] }}%</a-col>
-                <a-col :sm="14" :xs="24" v-else>{{ detailData[item.fieldName] }}</a-col>
+                <a-col :sm="14" :xs="24" v-else>{{ item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName] }}</a-col>
               </a-row>
             </div>
           </div>
@@ -51,7 +51,7 @@
                  :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ item.title }}：</a-col>
-                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+                <a-col :sm="14" :xs="24">{{ item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName] }}</a-col>
               </a-row>
             </div>
           </div>
@@ -92,7 +92,7 @@
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应付：</a-col>
-                <a-col :sm="14" :xs="24">{{ item.accountsReceivableAmount }}</a-col>
+                <a-col :sm="14" :xs="24">{{ formatMoney(item.accountsReceivableAmount) }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
@@ -104,7 +104,7 @@
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实付：</a-col>
-                <a-col :sm="14" :xs="24">{{ item.paidAmount }}</a-col>
+                <a-col :sm="14" :xs="24">{{ formatMoney(item.paidAmount) }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
@@ -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 @@
               <div class="table-text">{{ text }}</div>
             </a-tooltip>
           </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
 <!--            <a @click="handleAudit(record.id)" v-has="'expenditureContract:aduit'" v-if="record.status === 2">审核</a>-->
@@ -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 @@
               <div class="table-text">{{ text }}</div>
             </a-tooltip>
           </template>
-
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
           <template slot="nameText" slot-scope="text">
             <a-tooltip>
               <template slot="title">{{ text }}</template>
@@ -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">
 
+      <!--<template slot="text" slot-scope="text">-->
+      <!--  <j-ellipsis :value="text" :length="18"></j-ellipsis>-->
+      <!--</template>-->
       <template slot="text" slot-scope="text">
-        <j-ellipsis :value="text" :length="18"></j-ellipsis>
+        <a-tooltip>
+          <template slot="title">{{ text }}</template>
+          <div class="table-text">{{ text }}</div>
+        </a-tooltip>
+      </template>
+      <!--金钱 3位一逗号分隔-->
+      <template slot="allMoney" slot-scope="text">
+        <a-tooltip>
+          <template slot="title">{{ formatMoney(text) }}</template>
+          <div class="table-text">{{ formatMoney(text) }}</div>
+        </a-tooltip>
       </template>
 
       <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
@@ -29,6 +42,7 @@
 
 <script>
 import { cancelAssociatedProject, getAssociatedProject, submitAudit } from '../../../../api/incomePaymentsApi'
+import { formatMoney } from '@/utils/formatMoney'
 
 export default {
   name: 'AssociatedProject',
@@ -81,13 +95,13 @@ export default {
           align: 'center',
           dataIndex: 'receivableAmount',
           width: 250,
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'allMoney' }
         }, {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
           width: 250,
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'allMoney' }
         }, {
           title: '负责人',
           align: 'center',
@@ -131,6 +145,7 @@ export default {
     this.loadAssociatedProject()
   },
   methods: {
+    formatMoney,
     /**
      * 取消关联
      * @param id
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
index de63248..4b543e1 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue
@@ -15,7 +15,7 @@
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ item.title }}：</a-col>
                 <a-col :sm="14" :xs="24" v-if="item.fieldName === 'rate'">{{ detailData[item.fieldName] }}%</a-col>
-                <a-col :sm="14" :xs="24" v-else>{{ detailData[item.fieldName] }}</a-col>
+                <a-col :sm="14" :xs="24" v-else>{{item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName]}}</a-col>
               </a-row>
             </div>
           </div>
@@ -51,7 +51,7 @@
                  :key="index">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ item.title }}：</a-col>
-                <a-col :sm="14" :xs="24">{{ detailData[item.fieldName] }}</a-col>
+                <a-col :sm="14" :xs="24">{{item.format ? item.format(detailData[item.fieldName]) : detailData[item.fieldName]}}</a-col>
               </a-row>
             </div>
           </div>
@@ -92,7 +92,7 @@
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段应收：</a-col>
-                <a-col :sm="14" :xs="24">{{ item.accountsReceivableAmount }}</a-col>
+                <a-col :sm="14" :xs="24">{{ formatMoney(item.accountsReceivableAmount) }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
@@ -104,7 +104,7 @@
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
               <a-row>
                 <a-col :sm="10" :xs="24" class="detail-item-title">{{ index + 1 }}阶段实收：</a-col>
-                <a-col :sm="14" :xs="24">{{ item.paidAmount }}</a-col>
+                <a-col :sm="14" :xs="24">{{ formatMoney(item.paidAmount) }}</a-col>
               </a-row>
             </a-col>
             <a-col :xxl="4" :xl="8" :sm="12" class="detail-item">
@@ -208,6 +208,7 @@ import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
 import { archiveRevenueContract, getRevenueContractById } from '../../../../api/incomePaymentsApi'
 import AssociatedProject from './AssociatedProject'
 import RevenueContractAduitModule from './RevenueContractAduitModule'
+import { formatMoney } from '@/utils/formatMoney'
 
 export default {
   name: 'RevenueContractDetail',
@@ -242,13 +243,15 @@ export default {
           title: '部门名称'
         }, {
           fieldName: 'contractAmount',
-          title: '签订合同总金额'
+          title: '签订合同总金额',
+          format: formatMoney
         }, {
           fieldName: 'rate',
           title: '税率'
         }, {
           fieldName: 'noTaxAmount',
-          title: '未税金额'
+          title: '未税金额',
+          format: formatMoney
         }
       ],
       // 日期节点
@@ -268,13 +271,16 @@ export default {
       accountInfoList: [
         {
           fieldName: 'accountsReceivableAmount',
-          title: '待确收金额'
+          title: '待确收金额',
+          format: formatMoney
         }, {
           fieldName: 'amountReceived',
-          title: '已收金额'
+          title: '已收金额',
+          format: formatMoney
         }, {
           fieldName: 'outstandingAmount',
-          title: '未收金额'
+          title: '未收金额',
+          format: formatMoney
         }, {
           fieldName: 'accountStatus_dictText',
           title: '赊账状态'
@@ -322,6 +328,7 @@ export default {
     })
   },
   methods: {
+    formatMoney,
     initDetailData() {
       this.loading = true
       let param = {
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 4a53d20..676a265 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -113,7 +113,17 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
+          </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
           </template>
 
           <template slot="contact" slot-scope="text">
@@ -244,6 +254,7 @@ import ConfirmStageModule from './modules/ConfirmStageModule'
 import {getPayConfirmList} from '../../../api/incomePaymentsApi'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import InvoiceInfoChangeModule from '../../packManagement/modules/InvoiceInfoChangeModule'
+import { formatMoney } from '@/utils/formatMoney'
 
 // 项目类型 数据字典 的定义 和数据库的保持一致
 const ProjectTypeEnums = {
@@ -331,13 +342,13 @@ export default {
           align: 'center',
           width: 100,
           dataIndex: 'receivableAmount',
-          scopedSlots: {customRender: 'text'}
+          scopedSlots: {customRender: 'allMoney'}
         }, {
           title: '实收金额',
           align: 'center',
           width: 100,
           dataIndex: 'paidAmount',
-          scopedSlots: {customRender: 'text'}
+          scopedSlots: {customRender: 'allMoney'}
         }, {
           title: '缴费凭证状态',
           align: 'center',
@@ -417,6 +428,7 @@ export default {
     }
   },
   methods: {
+    formatMoney,
     getPayConfirmList,
     /**
      * 来款
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 650ba71..b2fdd42 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -340,6 +340,14 @@
             </a-tooltip>
           </template>
 
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
+
           <!--        打包、需要发票、到账、开票、邮寄状态-->
           <template slot="status" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
@@ -414,6 +422,7 @@ import JImageUpload from '@comp/jero/JImageUpload'
 import SetGuessUploadFlagModal from './modules/SetGuessUploadFlagModal'
 import { downloadFile } from '../../../api/manage'
 import WasicTopicData from './modules/wasicStaticData'
+import { formatMoney } from '@/utils/formatMoney'
 
 
 export default {
@@ -465,12 +474,14 @@ export default {
           title: '待确收金额',
           align: 'center',
           dataIndex: 'amountReceivable',
+          scopedSlots: {customRender: 'allMoney'},
           width: 100
         },
         {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
+          scopedSlots: {customRender: 'allMoney'},
           width: 120
         },
         {
@@ -804,6 +815,7 @@ export default {
     },
   },
   methods: {
+    formatMoney,
     // 处理国际研讨会-WASIC-已经选择的数据如何展示
     handleWasicLinkTopics(currentMeetingInfo, dictKey) {
       dictKey = dictKey || 'linkTopics'
diff --git a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
index 79be8f1..436136f 100644
--- a/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/CertificateMaintenanceList.vue
@@ -93,8 +93,17 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
-            <span v-else></span>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
+          </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
           </template>
 
           <template slot="status" slot-scope="text, record">
@@ -139,6 +148,7 @@ import '@/assets/less/TableExpand.less'
 import StatusSlot from '@comp/tools/StatusSlot'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import JDate from '@comp/tools/JDate'
+import { formatMoney } from '@/utils/formatMoney'
 
 export default {
   name: 'CertificateMaintenanceList',
@@ -197,13 +207,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: '打包',
@@ -251,6 +261,9 @@ export default {
     this.filters.projectId = this.$route.query.id
     this.loadData(1)
   },
+  methods: {
+    formatMoney
+  }
 }
 </script>
 
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 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
-            <span v-else></span>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
+          </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
           </template>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
           <a @click="handleEdit(record)" v-has="'memberProject:edit'">编辑</a>
@@ -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 @@
         </template>
 
         <template slot="text" slot-scope="text">
-          <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
-          <span v-else></span>
+          <a-tooltip>
+            <template slot="title">{{ text }}</template>
+            <div class="table-text">{{ text }}</div>
+          </a-tooltip>
+        </template>
+        <!--金钱 3位一逗号分隔-->
+        <template slot="allMoney" slot-scope="text">
+          <a-tooltip>
+            <template slot="title">{{ formatMoney(text) }}</template>
+            <div class="table-text">{{ formatMoney(text) }}</div>
+          </a-tooltip>
         </template>
 
         <template slot="status" slot-scope="text, record">
@@ -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
+  }
 }
 </script>
 
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 @@
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+            <a-tooltip>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text">{{ text }}</div>
+            </a-tooltip>
+          </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
           </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
@@ -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) => (
-            <j-ellipsis value={ record.invoiceAmount + '元' } length={ 15 }></j-ellipsis>
-          )
+          scopedSlots: {customRender: 'allMoney'}
+          // customRender: (text, record) => (
+          //   <j-ellipsis value={ record.invoiceAmount + '元' } length={ 15 }></j-ellipsis>
+          // )
         },
         {
           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">
 
-          <template slot="htmlSlot" slot-scope="text, record">
+          <template slot="htmlSlot" slot-scope="text">
             <div class="primary-color" v-html="text"></div>
           </template>
 
@@ -70,6 +70,13 @@
               <div class="table-text">{{ text }}</div>
             </a-tooltip>
           </template>
+          <!--金钱 3位一逗号分隔-->
+          <template slot="allMoney" slot-scope="text">
+            <a-tooltip>
+              <template slot="title">{{ formatMoney(text) }}</template>
+              <div class="table-text">{{ formatMoney(text) }}</div>
+            </a-tooltip>
+          </template>
 
           <span slot="print" slot-scope="text, record" class="action-span-cell">
             <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true" @click="goPrint(record)">打印</a-button>
@@ -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) => (
-            <j-ellipsis value={ record.contractAmount ? record.contractAmount + '元' : '0.00元' } length={ 15 }></j-ellipsis>
-          )
+          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'