1.出库审核接惨判断null和空字符串

src/views/finance/outWarehouseCheck.vue

@@ -175,8 +175,8 @@ export default {
   },
   created() {
     this.todoBusinessId = this.$route.query.todoBusinessId;
-    this.statementNo = this.$route.query.sNo;
-    this.reportNo = this.$route.query.rNo;
+    this.statementNo = this.$route.query.sNo && this.$route.query.sNo !== 'null' ? this.$route.query.sNo : '';
+    this.reportNo = this.$route.query.rNo && this.$route.query.rNo !== 'null' ? this.$route.query.rNo : '';
     this.taskId = this.$route.query.tId;
     this.currentNodeId = this.$route.query.cId;
     this.nodeCode = this.$route.query.nCode;
@@ -280,10 +280,10 @@ export default {
         commit.state = 'REVERSE';
       }
       commit.comments = this.checkDTO.reply;
-      if (this.reportNo !== null && this.reportNo !== undefined && this.reportNo !== '') {
+      if (this.reportNo) {
         commit.businessMinId = this.reportNo;
       }
-      if (this.statementNo != null && this.statementNo != undefined && this.statementNo !== '') {
+      if (this.statementNo) {
         commit.businessSubId = this.statementNo;
       }
       this.$api.workflow.commit(commit).then(res=>{

src/views/statistical/assets/customerEfficiency.vue

@@ -44,19 +44,19 @@
                                     <span v-else>{{ row.currentPeriodOrderVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比来单增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYOrderVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比来单增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQOrderVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="预评(意见书)">
-                            <el-table-column label="当期预评出具数量">
+                            <el-table-column label="当期出具数量">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodStatementVolume > 0"
                                         @click="setListQueryParms('statement', row.clienteleContactId, listQueryByTotal.startTime, listQueryByTotal.endTime)">
@@ -65,19 +65,19 @@
                                     <span v-else>{{ row.currentPeriodStatementVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比预评出具增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYStatementVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比预评出具增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQStatementVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="报告(咨询报告、评估报告、意见函)">
-                            <el-table-column label="当期报告出具数量">
+                            <el-table-column label="当期出具数量">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodReportVolume > 0"
                                         @click="setListQueryParms('report', row.customerId, listQueryByTotal.startTime, listQueryByTotal.endTime)">
@@ -86,12 +86,12 @@
                                     <span v-else>{{ row.currentPeriodReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比报告出具增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比报告出具增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQReportVolume }}</span>
                                 </template>
@@ -107,12 +107,12 @@
                                     <span v-else>{{ row.currentPeriodShouldAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比应收款增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYShouldAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比应收款增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQShouldAmountSum }}</span>
                                 </template>
@@ -128,12 +128,12 @@
                                     <span v-else>{{ row.currentPeriodRealAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比实收款增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYRealAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比实收款增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQRealAmountSum }}</span>
                                 </template>
@@ -145,34 +145,34 @@
                             </template>
                         </el-table-column>
                         <el-table-column label="出单率">
-                            <el-table-column label="当期出单率(%)">
+                            <el-table-column label="当期率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.currentPeriodOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比出单增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比出单增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="收费折扣率">
-                            <el-table-column label="当期收费折扣率(%)">
+                            <el-table-column label="当期折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.currentDiscountVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比收费折扣率(%)">
+                            <el-table-column label="同比折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYDiscountVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比收费折扣率(%)">
+                            <el-table-column label="环比折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQDiscountVolume }}</span>
                                 </template>
@@ -227,19 +227,19 @@
                                     <span v-else>{{ row.currentPeriodOrderVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比来单增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYOrderVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比来单增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQOrderVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="预评(意见书)">
-                            <el-table-column label="当期预评出具数量">
+                            <el-table-column label="当期出具数量">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodStatementVolume > 0"
                                         @click="setListQueryParms('statement', row.customerId, listQueryByManager.startTime, listQueryByManager.endTime, row.clienteleContactId)">
@@ -248,19 +248,19 @@
                                     <span v-else>{{ row.currentPeriodStatementVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比预评出具增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYStatementVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比预评出具增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQStatementVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="报告(咨询报告、评估报告、意见函)">
-                            <el-table-column label="当期报告出具数量">
+                            <el-table-column label="当期出具数量">
                                 <template slot-scope="{row}">
                                     <el-link v-if="row.currentPeriodReportVolume > 0"
                                         @click="setListQueryParms('report', row.customerId, listQueryByManager.startTime, listQueryByManager.endTime, row.clienteleContactId)">
@@ -269,12 +269,12 @@
                                     <span v-else>{{ row.currentPeriodReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比报告出具增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比报告出具增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQReportVolume }}</span>
                                 </template>
@@ -290,12 +290,12 @@
                                     <span v-else>{{ row.currentPeriodShouldAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比应收款增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYShouldAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比应收款增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQShouldAmountSum }}</span>
                                 </template>
@@ -311,12 +311,12 @@
                                     <span v-else>{{ row.currentPeriodRealAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比实收款增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYRealAmountSum }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比实收款增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQRealAmountSum }}</span>
                                 </template>
@@ -333,29 +333,29 @@
                                     <span>{{ row.currentPeriodOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比出单增减率(%)">
+                            <el-table-column label="同比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比出单增减率(%)">
+                            <el-table-column label="环比增减率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQOrderHasReportVolume }}</span>
                                 </template>
                             </el-table-column>
                         </el-table-column>
                         <el-table-column label="收费折扣率">
-                            <el-table-column label="当期收费折扣率(%)">
+                            <el-table-column label="当期折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.currentDiscountVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="同比收费折扣率(%)">
+                            <el-table-column label="同比折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.YoYDiscountVolume }}</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="环比收费折扣率(%)">
+                            <el-table-column label="环比折扣率(%)">
                                 <template slot-scope="{row}">
                                     <span>{{ row.QoQDiscountVolume }}</span>
                                 </template>