Merge remote-tracking branch 'origin/release' into release

src/views/ecw/order/prepayDeal.vue

@@ -1197,12 +1197,6 @@
         that.loading = true;
         getExceptionById(that.orderExceptionId).then(response => {
           that.orderExceptionData = response.data;
-          // that.orderExceptionData.orderExceptionType = 'order_other_exception'
-          // that.orderExceptionData.orderExceptionType = 'order_miss_exception'
-           // that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
-           // that.orderExceptionData.orderExceptionType = 'not_shipping_channel_exception'
-           // that.orderExceptionData.orderExceptionType = 'channel_exception'
-           // that.orderExceptionData.orderExceptionType = 'fee_exception'
           that.loading = false;
           that.orderId = response.data.orderId
           that.getOrderData()
@@ -1261,7 +1255,11 @@
         getOrder(this.orderId).then(response => {
           this.orderData = response.data
           if(this.orderData.channelId!=0){
-            this.handlerParams.channelId = this.orderData.channelId
+            this.channelList.map(v=>{
+              if(v.channelId==this.orderData.channelId){
+                this.handlerParams.channelId = this.orderData.channelId
+              }
+            })
           }
 
           this.handlerParams.lineId = this.orderData.lineId
@@ -1282,10 +1280,11 @@
                   v.clearanceFreightVolume = this.unitList[1]['id']
                 }
               })
-            }else if(this.orderExceptionData.orderExceptionType=='line_loop_exception'){
-              this.getExceptionPriceList('line_loop_exception',1)
             }
           }
+          if(this.orderExceptionData.orderExceptionType=='line_loop_exception'){
+            this.getExceptionPriceList('line_loop_exception',1)
+          }
           if(this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
             this.getExceptionPriceList('continue_channel',1)
           }
@@ -1307,6 +1306,7 @@
       getOrderExcptionResult(){
         getOrderExcptionResult({orderExceptionId:this.orderExceptionId}).then(res=>{
           this.handlerParams = Object.assign(this.handlerParams,res.data.list[0])
+
           if(!this.orderExceptionData.handlerTime){
             this.orderExceptionData.handlerTime =  this.handlerParams.handlerTime
           }
@@ -1404,7 +1404,7 @@
             }
           }
           if((this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='change_channel')||(this.orderExceptionData.orderExceptionType=='channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='set_shipment_channel')){
-            if(this.handlerParams.channelId==0){
+            if(!this.handlerParams.channelId||this.handlerParams.channelId==0){
               this.$modal.msgError(this.$t('请选择出货渠道'));
               return
             }
@@ -1645,6 +1645,7 @@
                 }
               }
             })
+            console.log(that.loopOrderItem)
           }else{
             getOrderExceptionChannelPriceList({orderId:that.orderId,exceptionId:parseInt(that.orderExceptionId),exceptionResultId:that.handlerParams.id}).then(res=>{
               if(res.code==0){