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

src/views/ecw/box/cancelClear.vue

@@ -47,6 +47,7 @@ export default {
   created() {
     let orders = this.shipmentObj.clearanceInfo?.clearanceOrderBackList
     let order = orders.find(item=>item.orderId == this.cancelClearInfo.orderId)
+    console.log(order,11,this.cancelClearInfo.orderId,orders);
     if(order){
       this.apply = order
     }

src/views/ecw/box/queryAir.vue

@@ -108,7 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
-                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus==132|| (shipmentObj.clearanceInfo == null) || (shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus==132|| (shipmentObj.clearanceInfo == null) || (shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderBackList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/ecw/box/regError.vue

@@ -92,7 +92,6 @@ export default {
     },
     regprocess(){
       var data = ''
-      this.$set(this.errorObj, 'billAbnId', null)
       switch(this.errorObj.opStep){
         case '10':
           data = 'FLYING_TICKET_EXCEPTION'

src/views/ecw/box/shippingAir/nodePage/checkout.vue

@@ -56,7 +56,7 @@
 
       </div>
 
-      <el-form-item :label="$t('出仓日期')">
+      <el-form-item :label="$t('出仓日期')" prop="checkoutTime">
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airCheckoutObj.checkoutTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
@@ -104,6 +104,7 @@ export default {
       // 校验
       rules: {
         //deliverType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        checkoutTime: [{ required: true, message: this.$t("必填"), trigger: "change" }]
       },
     };
   },

src/views/ecw/order/prepayDeal.vue

@@ -1261,7 +1261,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
@@ -1403,11 +1407,16 @@
               return
             }
           }
+
           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
             }
+            if(!this.handlerParams.lineId||this.handlerParams.lineId==0){
+              this.$modal.msgError(this.$t('请选择线路'));
+              return
+            }
           }
           if(['channel_packaging_overweight_exception','overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.handlerParams.orderExceptionHandlerResult=='update_weight_limit'){
             if(!this.handlerParams.weightLimit){