luobang 2 년 전
부모
커밋
5fcc0d77d4

+ 4 - 8
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -378,14 +378,10 @@
           show-overflow-tooltip
           v-if="!columnNoRoutList.includes('收货地址')"
         >
-          <!-- <template slot="header" slot-scope="scope">
-            <span>收货地址</span>
-            <el-input
-              v-model="search"
-              size="mini"
-              placeholder="输入关键字搜索"
-            />
-          </template> -->
+          <template slot-scope="scope">
+            <span v-if="scope.row.addressPlace.indexOf('新地址')>=0" style="color:red">{{scope.row.addressPlace}}</span>
+            <span v-show="scope.row.addressPlace.indexOf('新地址')<0">{{scope.row.addressPlace}}</span>
+          </template>
         </el-table-column>
 
         <el-table-column

+ 30 - 0
src/views/statisticalReport/components/salesLogisticsStatistics/yawnReport.vue

@@ -161,6 +161,36 @@ export default {
       }
       this.axios.post('/api/v1/tms/yawnReport',this.map).then((res)=>{
         if(res.data.code == "200"){
+          let countRow={
+            EnNum:0,
+            carrierName:'',
+            no:-1,
+            notEnNum:0,
+            notSendNum:0,
+            numCang:0,
+            numGong:0,
+            orderNum:0,
+            percent:'',
+            planNum:0,
+            quxiaoNum:0,
+            target:"合计"
+          }
+          res.data.data.forEach((item)=>{
+            countRow.EnNum+=item.EnNum;
+            countRow.notEnNum+=item.notEnNum;
+            countRow.notSendNum+=item.notSendNum;
+            countRow.numCang+=item.numCang;
+            countRow.numGong+=item.numGong;
+            countRow.orderNum+=item.orderNum;
+            countRow.planNum+=item.planNum;
+            countRow.quxiaoNum+=item.quxiaoNum;
+          });
+          if(countRow.planNum){
+            countRow.percent=(countRow.orderNum/countRow.planNum*100).toFixed(4)+"%";
+          }else{
+            countRow.percent='NAL'
+          }
+          res.data.data.push(countRow);
           this.getSpanArr(res.data.data);
           this.yawnReportData=res.data.data;
         }else {