超限异常优化

src/views/ecw/order/exception/components/overweightException.vue

@@ -16,7 +16,7 @@
             <el-descriptions-item :label="$t('目的仓')" :span="2">
                 {{order.logisticsInfoDto.destAddressZh}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('异常描述')" :span="2">
+            <el-descriptions-item :label="$t('异常描述')+':'" :span="2">
                 {{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
             </el-descriptions-item>
         </el-descriptions>
@@ -99,8 +99,8 @@
 
           <!-- </div> -->
           <el-descriptions :column="3" v-if="order" :colon="false">
-              <el-descriptions-item :label="$t('备注')" :span="2">
-                  {{$l(orderExceptionData.orderExceptionRemark, 'desc')}}
+              <el-descriptions-item :label="$t('备注')+':'" :span="2">
+                  {{orderExceptionData.orderExceptionNotes||'/'}}
               </el-descriptions-item>
           </el-descriptions>
     </div>

src/views/ecw/order/prepayDeal.vue

@@ -1278,10 +1278,10 @@
           console.log(this.orderExceptionData.orderExceptionStatus)
           console.log(this.orderExceptionData.orderExceptionStatus=='0')
           if(['overweight_exception','channel_packaging_overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
-            if(this.orderExceptionData.orderExceptionStatus=='0'){
-              this.getExceptionPriceList('line_loop_exception',1)
-            }else{
+            if(this.orderExceptionData.orderExceptionStatus!='0'&&this.handlerParams.orderExceptionHandlerResult=='allow_over'){
               this.getExceptionPriceList('continue_channel',2)
+            }else{
+              this.getExceptionPriceList('line_loop_exception',1)
             }
           }
         });
@@ -1307,8 +1307,11 @@
           if(this.handlerParams.productId){
             this.productId2 = this.productId1 = this.handlerParams.productId
           }
-          if(this.orderExceptionData.orderExceptionType=='overweight_exception'&&this.orderExceptionData.additionalJson&&this.orderExceptionData.additionalJson.productAirWeightLimit){
-            this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.productAirWeightLimit)
+          if(this.orderExceptionData.orderExceptionType=='overweight_exception'&&this.orderExceptionData.additionalJson&&this.orderExceptionData.additionalJson.weightSum){
+            this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.weightSum)
+          }
+          if(this.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'&&this.orderExceptionData.additionalJson&&this.orderExceptionData.additionalJson.packagingWeightSum){
+            this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.packagingWeightSum)
           }
         })