1.统计报表页面体验优化(资产)

src/views/statistical/assets/customerEfficiency.vue

@@ -28,7 +28,9 @@
                         :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="departmentLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="客户名称" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.customerName }}</span>
@@ -207,7 +209,9 @@
                         :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="personalLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="客户名称" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.customerName }}</span>
@@ -554,6 +558,8 @@ export default {
             totalEfficiency: [],
             managerEfficiency: [],
             pageData: { records: [] },
+            departmentLoading: false,
+            personalLoading: false
         }
     },
     created() {
@@ -611,6 +617,7 @@ export default {
         },
         // 资产客户效率值(总)查询
         getAssetsCustomerEfficiencyVO() {
+            this.departmentLoading = true;
             if (this.selectDate1) {
                 this.listQueryByTotal.startTime = this.selectDate1[0] + ' 00:00:00';
                 this.listQueryByTotal.endTime = this.selectDate1[1] + ' 23:59:59';
@@ -624,6 +631,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.departmentLoading = false;
             })
         },
         exportAssetsCustomerTotalEfficiency() {
@@ -664,6 +672,7 @@ export default {
         },
         // 资产客户效率值(客户经理)查询
         getAssetsCustomerManagerEfficiencyVO() {
+            this.personalLoading = true;
             if (this.selectDate2) {
                 this.listQueryByManager.startTime = this.selectDate2[0] + ' 00:00:00';
                 this.listQueryByManager.endTime = this.selectDate2[1] + ' 23:59:59';
@@ -677,6 +686,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.personalLoading = false;
             })
         },
         exportAssetsCustomerManagerEfficiency() {

src/views/statistical/assets/evaluateEfficiency.vue

@@ -29,7 +29,9 @@
                         :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="departmentLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="部门名称" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.departmentName }}</span>
@@ -191,7 +193,9 @@
                         :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="personalLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="评估人员" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.userName }}</span>
@@ -520,6 +524,8 @@ export default {
             depEfficiency: [],
             perEfficiency: [],
             pageData: { records: [] },
+            departmentLoading: false,
+            personalLoading: false
         }
     },
     created() {
@@ -576,6 +582,7 @@ export default {
             this.getAssetsEvaluateDepEfficiency();
         },
         getAssetsEvaluateDepEfficiency() {
+            this.departmentLoading = true;
             if (this.selectDate1) {
                 this.listQueryByDepartment.startTime = this.selectDate1[0] + ' 00:00:00';
                 this.listQueryByDepartment.endTime = this.selectDate1[1] + ' 23:59:59';
@@ -589,6 +596,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.departmentLoading = false;
             })
         },
         exportAssetsEvaluateDepEfficiency() {
@@ -627,6 +635,7 @@ export default {
         },
         // 评估人员绩效扣分查询
         getAssetsEvaluatePerEfficiency() {
+            this.personalLoading = true;
             if (this.selectDate2) {
                 this.listQueryByEvaluator.startTime = this.selectDate2[0] + ' 00:00:00';
                 this.listQueryByEvaluator.endTime = this.selectDate2[1] + ' 23:59:59';
@@ -640,6 +649,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.personalLoading = false;
             })
         },
         exportAssetsEvaluatePerEfficiency() {

src/views/statistical/assets/ledgerList.vue

@@ -38,7 +38,7 @@
                         :disabled="exportStatus">导出
                     </el-button>
                 </template>
-                <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;"
+                <parentTable ref="table" v-loading="listLoading" element-loading-text="报表查询中..." :data="pageData.records" slot="table" style="width: 100%;"
                     class="tableFull">
                     <el-table-column label="项目编号" width="120" align="center">
                         <template slot-scope="{row}">
@@ -373,6 +373,7 @@ export default {
             this.getAssetsLedger();
         },
         getAssetsLedger() {
+            this.listLoading = true;
             if (this.selectDate) {
                 this.listQuery.startTime = this.selectDate[0] + ' 00:00:00';
                 this.listQuery.endTime = this.selectDate[1] + ' 23:59:59';
@@ -386,6 +387,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.listLoading = false;
             })
         },
         exportAssetsLedger() {

src/views/statistical/assets/marketEfficiency.vue

@@ -29,7 +29,9 @@
                         :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="departmentLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="部门名称" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.departmentName }}</span>
@@ -206,7 +208,9 @@
                         :cell-style="{ 'text-align': 'center' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="personalLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="评估人员" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.userName }}</span>
@@ -221,7 +225,7 @@
                             <el-table-column label="当期">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodOrderVolume > 0"
-                                        @click="setListQueryParms('order', row.departmentId, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
+                                        @click="setListQueryParms('order', null, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
                                         {{ row.currentPeriodOrderVolume }}
                                     </el-link>
                                     <span v-else>{{ row.currentPeriodOrderVolume }}</span>
@@ -242,7 +246,7 @@
                             <el-table-column label="当期">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodStatementVolume > 0"
-                                        @click="setListQueryParms('statement', row.departmentId, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
+                                        @click="setListQueryParms('statement', null, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
                                         {{ row.currentPeriodStatementVolume }}
                                     </el-link>
                                     <span v-else>{{ row.currentPeriodStatementVolume }}</span>
@@ -263,7 +267,7 @@
                             <el-table-column label="当期">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodReportVolume > 0"
-                                        @click="setListQueryParms('report', row.departmentId, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
+                                        @click="setListQueryParms('report', null, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
                                         {{ row.currentPeriodReportVolume }}
                                     </el-link>
                                     <span v-else>{{ row.currentPeriodReportVolume }}</span>
@@ -284,7 +288,7 @@
                             <el-table-column label="当期">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodShouldAmountSum > 0"
-                                        @click="setListQueryParms('should', row.departmentId, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
+                                        @click="setListQueryParms('should', null, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
                                         {{ row.currentPeriodShouldAmountSum }}
                                     </el-link>
                                     <span v-else>{{ row.currentPeriodShouldAmountSum }}</span>
@@ -305,7 +309,7 @@
                             <el-table-column label="当期">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodRealAmountSum > 0"
-                                        @click="setListQueryParms('real', row.departmentId, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
+                                        @click="setListQueryParms('real', null, listQueryByManager.startTime, listQueryByManager.endTime, row.userId)">
                                         {{ row.currentPeriodRealAmountSum }}
                                     </el-link>
                                     <span v-else>{{ row.currentPeriodRealAmountSum }}</span>
@@ -536,6 +540,8 @@ export default {
             depEfficiency: [],
             perEfficiency: [],
             pageData: { records: [] },
+            departmentLoading: false,
+            personalLoading: false
         }
     },
     created() {
@@ -592,6 +598,7 @@ export default {
             this.getAssetsMarketDepEfficiencyVO();
         },
         getAssetsMarketDepEfficiencyVO() {
+            this.departmentLoading = true;
             if (this.selectDate1) {
                 this.listQueryByDepartment.startTime = this.selectDate1[0] + ' 00:00:00';
                 this.listQueryByDepartment.endTime = this.selectDate1[1] + ' 23:59:59';
@@ -605,6 +612,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.departmentLoading = false;
             })
         },
         exportAssetsMarketDepEfficiency() {
@@ -643,6 +651,7 @@ export default {
         },
         // 评估人员绩效扣分查询
         getAssetsMarketPerEfficiencyVO() {
+            this.personalLoading = true;
             if (this.selectDate2) {
                 this.listQueryByManager.startTime = this.selectDate2[0] + ' 00:00:00';
                 this.listQueryByManager.endTime = this.selectDate2[1] + ' 23:59:59';
@@ -656,6 +665,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.personalLoading = false;
             })
         },
         exportAssetsMarketPerEfficiency() {
@@ -670,7 +680,9 @@ export default {
             this.listQueryDetail.size = 10;
             this.listQueryDetail.current = 1;
             this.listQueryDetail.efficiencyType = efficiencyType;
-            this.listQueryDetail.marketDepartmentId = departmentId;
+            if(departmentId) {
+                this.listQueryDetail.marketDepartmentId = departmentId;
+            }
             this.listQueryDetail.startTime = startTime;
             this.listQueryDetail.endTime = endTime;
             if (userId) {

src/views/statistical/assets/performanceDeduction.vue

@@ -28,7 +28,9 @@
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="departmentLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="部门名称" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.departmentName }}</span>
@@ -162,7 +164,9 @@
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 100%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
-                      color: #333333; font-size: 14px;">
+                      color: #333333; font-size: 14px;"
+                      v-loading="evaluatorLoading"
+                      element-loading-text="报表查询中...">
                         <el-table-column label="评估人员" width="150">
                             <template slot-scope="{row}">
                                 <span>{{ row.userName }}</span>
@@ -444,6 +448,8 @@ export default {
             departmentPerformanceDeduction: [],
             evaluatorPerformanceDeduction: [],
             pageData: { records: [] },
+            departmentLoading: false,
+            evaluatorLoading: false
         }
     },
     created() {
@@ -503,6 +509,7 @@ export default {
             this.getAssetsPerformanceDeduction();
         },
         getAssetsPerformanceDeduction() {
+            this.departmentLoading = true;
             if (this.selectDate1) {
                 this.listQueryByDepartment.startTime = this.selectDate1[0] + ' 00:00:00';
                 this.listQueryByDepartment.endTime = this.selectDate1[1] + ' 23:59:59';
@@ -516,6 +523,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.departmentLoading = false;
             })
         },
         exportAssetsPerformanceDeduction() {
@@ -597,6 +605,7 @@ export default {
         },
         // 评估人员绩效扣分查询
         getAssetsPerformanceDeductionVOByEvaluator() {
+            this.evaluatorLoading = true;
             if (this.selectDate2) {
                 this.listQueryByEvaluator.startTime = this.selectDate2[0] + ' 00:00:00';
                 this.listQueryByEvaluator.endTime = this.selectDate2[1] + ' 23:59:59';
@@ -610,6 +619,7 @@ export default {
                         this.exportStatus = true;
                     }
                 }
+                this.evaluatorLoading = false;
             })
         },
         exportAssetsPerformanceDeductionByEvaluator() {