异常订单优化

src/views/ecw/deptTarget/myAchievement.vue

@@ -46,16 +46,16 @@
     <div class="total_num">
       <span>开发客户：</span>
       <span>总箱数 {{totalData.developNum}}箱 </span>
-      <span>总方数 {{totalData.developNum}}m³ </span>
-      <span>总重量 {{totalData.developNum}}KG </span>
+      <span>总方数 {{totalData.developVolume}}m³ </span>
+      <span>总重量 {{totalData.developWeight}}KG </span>
       <span>公司客户：</span>
       <span>总箱数 {{totalData.companyNum}}箱 </span>
-      <span>总方数 {{totalData.companyNum}}m³ </span>
-      <span>总重量 {{totalData.companyNum}}KG </span>
+      <span>总方数 {{totalData.companyVolume}}m³ </span>
+      <span>总重量 {{totalData.companyWeight}}KG </span>
       <span>汇总：</span>
       <span>总箱数 {{totalData.sumNum}}箱 </span>
-      <span>总方数 {{totalData.sumNum}}m³ </span>
-      <span>总重量 {{totalData.sumNum}}KG </span>
+      <span>总方数 {{totalData.sumVolume}}m³ </span>
+      <span>总重量 {{totalData.sumWeight}}KG </span>
     </div>
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list"  @selection-change="handleSelectionChange">
@@ -266,11 +266,11 @@
                     this.totalData.sumWeight =this.myAchievementData.totalWeight
                     this.totalData.sumVolume =this.myAchievementData.totalVolume
                     this.totalData.sumNum =this.myAchievementData.totalNum
-                    this.totalData.companyWeight =this.myAchievementData.companyTotaWeight
-                    this.totalData.companyVolume =this.myAchievementData.companyTotaVolume
-                    this.totalData.companyNum =this.myAchievementData.companyTotaNum
-                    this.totalData.developWeight =this.myAchievementData.devTotaWeight
-                    this.totalData.developVolume =this.myAchievementData.devTotaVolume
+                    this.totalData.companyWeight =this.myAchievementData.companyTotalWeight
+                    this.totalData.companyVolume =this.myAchievementData.companyTotalVolume
+                    this.totalData.companyNum =this.myAchievementData.companyTotalNum
+                    this.totalData.developWeight =this.myAchievementData.devTotalWeight
+                    this.totalData.developVolume =this.myAchievementData.devTotalVolume
                     this.totalData.developNum =this.myAchievementData.devTotalNum
                     this.loading = false;
                 });
@@ -413,11 +413,11 @@
                     this.totalData.sumWeight =this.myAchievementData.totalWeight
                     this.totalData.sumVolume =this.myAchievementData.totalVolume
                     this.totalData.sumNum =this.myAchievementData.totalNum
-                    this.totalData.companyWeight =this.myAchievementData.companyTotaWeight
-                    this.totalData.companyVolume =this.myAchievementData.companyTotaVolume
-                    this.totalData.companyNum =this.myAchievementData.companyTotaNum
-                    this.totalData.developWeight =this.myAchievementData.devTotaWeight
-                    this.totalData.developVolume =this.myAchievementData.devTotaVolume
+                    this.totalData.companyWeight =this.myAchievementData.companyTotalWeight
+                    this.totalData.companyVolume =this.myAchievementData.companyTotalVolume
+                    this.totalData.companyNum =this.myAchievementData.companyTotalNum
+                    this.totalData.developWeight =this.myAchievementData.devTotalWeight
+                    this.totalData.developVolume =this.myAchievementData.devTotalVolume
                     this.totalData.developNum =this.myAchievementData.devTotalNum
               }
             },

src/views/ecw/order/exception/index.vue

@@ -112,12 +112,19 @@
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" >
       <template slot-scope="scope">
           <span>{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
+           <dict-tag style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center">
           <template slot-scope="scope">
+                <div v-if="scope.row.orderExceptionType!='order_heavy_cargo_exception'">
                   <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
                   <span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+                </div>
+                <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
+                  <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+                  <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+                </el-tooltip>
           </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center">

src/views/ecw/order/prepayDeal.vue

@@ -510,11 +510,11 @@
             this.$modal.msgError(this.$t('请选择处理结果'));
             return
           }
-          if(this.orderExceptionData.orderExceptionType=='order_doc_exception'){
-            if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
-              this.$modal.msgError(this.$t('请上传报关资料'));
-              return
-            }
+          if(this.orderExceptionData.orderExceptionType=='order_doc_exception'&&this.handlerParams.fileList&&this.handlerParams.fileList.length>0){
+            // if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
+            //   this.$modal.msgError(this.$t('请上传报关资料'));
+            //   return
+            // }
             this.handlerParams.files = Array.isArray(this.handlerParams.fileList) ? this.handlerParams.fileList.join(',') : this.handlerParams.fileList
           }