首页、统计--所有的【合同金额】 修改成 【年度待确收金额】

src/views/dashboard/AllMoneyTenEcharts.vue

@@ -1,7 +1,7 @@
 <!--企业合同金额前十-->
 <template>
   <div class="container">
-    <div class="title">企业客户统计（合同额前二十）</div>
+    <div class="title">企业客户统计（年度待确收金额前二十）</div>
     <div class="echarts-box" id="allMoney"></div>
 
     <!--   表格区域beign -->
@@ -115,7 +115,7 @@ export default {
           this.initEcharts(res.result)
           // 将接口数据 转化成表格数据形式
           let tableData = [
-            {indexName: '合同金额'},
+            {indexName: '年度待确收金额'},
             {indexName: '确认收入金额'}
           ]
           dataSource.map((item, index) => {
@@ -255,7 +255,7 @@ export default {
         },
         series: [
           {
-            name:'合同金额',
+            name:'年度待确收金额',
             data: this.echartsData.allMoney,
             type: 'bar',
             barMaxWidth:20,
@@ -283,7 +283,7 @@ export default {
     /**
      * 计算百分比
      * @param num1 确收金额
-     * @param num2 合同金额
+     * @param num2 年度待确收金额
      * */
     calcPercent(num1,num2){
       let pointNo = Number(num1) / Number(num2) * 100

src/views/dashboard/Analysis.vue

@@ -34,14 +34,14 @@
 
       </section>
 
-      <!--应收合同额统计 -->
+      <!--年度待确收金额统计 -->
       <three-year-echarts class="all-money m-t-10"></three-year-echarts>
-      <!-- 应收合同额统计 -->
+      <!-- 年度待确收金额统计 -->
 
 
-      <!-- 企业客户统计（合同额前十）-->
+      <!-- 企业客户统计（年度待确收金额前二十）-->
       <all-money-ten-echarts class="all-money m-t-10"></all-money-ten-echarts>
-      <!-- 企业客户统计（合同额前十）-->
+      <!-- 企业客户统计（年度待确收金额前二十）-->
     </template>
     <!--    所领导 部门领导展示统计图 -->
 

src/views/dashboard/DepartmentTotalEcharts.vue

@@ -111,7 +111,7 @@ export default {
           this.initEcharts(res.result)
           // 将接口数据 转化成表格数据形式
           let tableData = [
-            {indexName: '合同金额'},
+            {indexName: '年度待确收金额'},
             {indexName: '确认收入金额'},
             {indexName: '完成比例'}
           ]
@@ -274,7 +274,7 @@ export default {
         },
         series: [
           {
-            name: '合同金额',
+            name: '年度待确收金额',
             data: this.echartsData.allMoney,
             type: 'bar',
             barMaxWidth: 30,
@@ -302,7 +302,7 @@ export default {
     /**
      * 计算百分比
      * @param num1 确收金额
-     * @param num2 合同金额
+     * @param num2 年度待确收金额
      * */
     calcPercent(num1,num2){
       let pointNo = Number(num1) / Number(num2) * 100

src/views/dashboard/IncomeSortEcharts.vue

@@ -165,7 +165,7 @@ export default {
           this.initEcharts(res.result)
           // 将接口数据 转化成表格数据形式
           let tableData = [
-            {indexName: typeEnum[this.activeIndex] !== 2 ? '合同金额' : '确收金额'},
+            {indexName: typeEnum[this.activeIndex] !== 2 ? '年度待确收金额' : '确收金额'},
             {indexName: '百分比'}
           ]
           dataSource.map((item, index) => {
@@ -403,4 +403,11 @@ export default {
   font-weight: bold;
   background: rgb(245, 245, 246);
 }
+
+/*列表自适应超出隐藏*/
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/dashboard/SingleMonthEcharts.vue

@@ -137,7 +137,7 @@ export default {
           let dataSource = res.result
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
-            // {indexName: '合同金额'},
+            // {indexName: '年度待确收金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'},
@@ -147,7 +147,7 @@ export default {
             let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              // tableData[0][key] = item.allMoney // 合同金额
+              // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[0][key] = item.confirmAmount // 确认收入金额
               tableData[1][key] = item.billMoney // 开票金额
               tableData[2][key] = item.comeAllMoney // 到账金额
@@ -264,7 +264,7 @@ export default {
         },
         series: [
           // {
-          //   name: '合同金额',
+          //   name: '年度待确收金额',
           //   type: 'line',
           //   showSymbol: false,
           //   symbol: 'circle',

src/views/dashboard/SingleMonthTotalEcharts.vue

@@ -129,7 +129,7 @@ export default {
           let dataSource = res.result
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
-            // {indexName: '合同金额'},
+            // {indexName: '年度待确收金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'},
@@ -139,7 +139,7 @@ export default {
             let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              // tableData[0][key] = item.allMoney // 合同金额
+              // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[0][key] = item.confirmAmount // 确认收入金额
               tableData[1][key] = item.billMoney // 开票金额
               tableData[2][key] = item.comeAllMoney // 到账金额
@@ -250,7 +250,7 @@ export default {
         },
         series: [
           // {
-          //   name: '合同金额',
+          //   name: '年度待确收金额',
           //   type: 'line',
           //   showSymbol: false,
           //   symbol: 'circle',

src/views/dashboard/ThreeYearEcharts.vue

@@ -1,7 +1,7 @@
 <!--应收合同额统计-->
 <template>
   <div class="container">
-    <div class="title">应收合同额统计</div>
+    <div class="title">年度待确收金额统计</div>
     <div class="echarts-box" id="threeYear"></div>
 
     <!--   表格区域beign -->

src/views/statisticalReport/WholeInstituteStatisticsList.vue

@@ -271,7 +271,7 @@ const defaultTableColumns = [
     scopedSlots: {customRender: 'pack'}
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 150,
     dataIndex: 'allMoney',

src/views/statisticalReport/WholePaymentsStatistics.vue

@@ -161,7 +161,7 @@ export default {
           let dataSource = res.result.list
           //  讲树形结构的数据 ，修改成table可以直接展示的数据，默认只有三行数据
           let tableData = [
-            {indexName: '合同金额', total: res.result.sumOfMoney},
+            {indexName: '年度待确收金额', total: res.result.sumOfMoney},
             {indexName: '确认收入金额', total: res.result.sumOfConfirmAmount},
             {indexName: '开票金额', total: res.result.sumOfBillMoney},
             {indexName: '到账金额', total: res.result.sumOfReallyMoney},

src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue

@@ -128,7 +128,7 @@ const defaultTableColumns = [
     scopedSlots: {customRender: 'text'}
   },
   {
-    title: '合同总金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     dataIndex: 'allMoney',

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue

@@ -190,7 +190,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'status-pack' }
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     sorter: true,

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue

@@ -171,7 +171,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'projectName' }
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 140,
     dataIndex: 'allMoney',

src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue

@@ -219,7 +219,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'status-pack' }
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     dataIndex: 'allMoney',

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue

@@ -193,7 +193,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'pack' }
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     sorter: true,

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue

@@ -172,7 +172,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'text' }
   },
   {
-    title: '合同总金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     sorter: true,

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue

@@ -209,7 +209,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'text' }
   },
   {
-    title: '合同金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     sorter: true,

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue

@@ -198,7 +198,7 @@ const defaultTableColumns = [
     scopedSlots: { customRender: 'text' }
   },
   {
-    title: '合同总金额',
+    title: '年度待确收金额',
     align: 'center',
     width: 160,
     sorter: true,