update 统计模块的变更，将来款年份修改成项目年份

src/assets/less/common.less

@@ -109,4 +109,11 @@
 /*表格滚动条*/
 .ant-table-body {
   overflow-x: auto!important;
+}
+
+/*列表自适应超出隐藏*/
+.table-text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }

src/views/statisticalReport/WholeInstituteStatisticsList.vue

@@ -67,7 +67,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
@@ -124,12 +124,17 @@
 
           <!--        项目名称-->
           <template slot="projectName" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="18" class="primary-color"
+            <a-tooltip>
-                        @click="openDetailModal(record)"></j-ellipsis>
+              <template slot="title">{{ text }}</template>
+              <div class="table-text primary-color" @click="openDetailModal(record)">{{ text }}</div>
+            </a-tooltip>
           </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>
 
           <!--              是否打包-->
@@ -152,12 +157,17 @@
 
               <!--        项目名称-->
               <template slot="projectName" slot-scope="text, record">
-                <j-ellipsis :value="text" :length="18" class="primary-color"
+                <a-tooltip>
-                            @click="openDetailModal(record)"></j-ellipsis>
+                  <template slot="title">{{ text }}</template>
+                  <div class="table-text primary-color" @click="openDetailModal(record)">{{ text }}</div>
+                </a-tooltip>
               </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>
 
             </a-table>
@@ -213,19 +223,19 @@ export default {
         }, {
           title: '来款项目',
           align: 'center',
-          width: 300,
+          width: 280,
           dataIndex: 'projectName',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '项目负责人',
           align: 'center',
-          width: 300,
+          width: 150,
           dataIndex: 'principalName',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '所属科室',
           align: 'center',
-          width: 300,
+          width: 150,
           dataIndex: 'depart',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -268,19 +278,19 @@ export default {
         }, {
           title: '来款项目',
           align: 'center',
-          width: 300,
+          width: 280,
           dataIndex: 'projectName',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '项目负责人',
           align: 'center',
-          width: 300,
+          width: 150,
           dataIndex: 'principalName',
           scopedSlots: { customRender: 'text' }
         }, {
           title: '所属科室',
           align: 'center',
-          width: 300,
+          width: 150,
           dataIndex: 'depart',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -294,7 +304,7 @@ export default {
           align: 'center',
           width: 100,
           dataIndex: 'pack',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: { customRender: 'pack' }
         }, {
           title: '应收金额',
           align: 'center',

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue

@@ -18,7 +18,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>

src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue

@@ -13,7 +13,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>

src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue

@@ -23,7 +23,7 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue

@@ -18,7 +18,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>

src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue

@@ -14,7 +14,7 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
@@ -64,7 +64,7 @@
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
-          :scroll="{x: 1100}"
+          :scroll="{x: 1000}"
           @change="handleTableChange"
           :class="dataSource.length === 0 ? 'show-scroll' : ''"
           class="j-table-force-nowrap main-table">
@@ -93,7 +93,7 @@
               :dataSource="footerDataSource"
               :showHeader="false"
               :pagination="false"
-              :scroll="{x: 1100}"
+              :scroll="{x: 1000}"
               class="j-table-force-nowrap footer-table">
 
               <!--        项目名称-->
@@ -170,6 +170,12 @@ export default {
           width: 160,
           dataIndex: 'comeAllMoney',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '来款率',
+          align: 'center',
+          width: 160,
+          dataIndex: 'finishRate',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '操作',
           dataIndex: 'action',
@@ -203,6 +209,12 @@ export default {
           width: 160,
           dataIndex: 'comeAllMoney',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '来款率',
+          align: 'center',
+          width: 160,
+          dataIndex: 'finishRate',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '操作',
           dataIndex: 'action',

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue

@@ -24,7 +24,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>

src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue

@@ -13,7 +13,7 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
-              <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="项目年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>