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

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

@@ -180,6 +180,7 @@ export default {
                         this.getExceptionPriceList(res.data.orderId)
                     })
                 }
+                console.log(res.data)
                 if(res.data.oldPriceJson){
                   this.orderItemData = JSON.parse(res.data.oldPriceJson)
                   console.log(this.orderItemData)

src/views/ecw/order/prepayDeal.vue

@@ -195,7 +195,7 @@
       </el-table>
 
       <!-- 单证异常，发货人异常，其他异常的表格 -->
-      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
+      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
         <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
             <template slot-scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -725,9 +725,9 @@
           <div v-if="handlerParams.orderExceptionStatus==1">
             <el-form-item :label="$t('查明原因')+':'" required>
                 <el-select v-model="handlerParams.orderExceptionHandlerResult" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
-                <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
-                          :key="dict.value" :label="dict.label" :value="dict.value"/>
-                </el-select>
+                  <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
+                            :key="dict.value" :label="dict.label" :value="dict.value"/>
+                 </el-select>
             </el-form-item>
             </div>
         </div>
@@ -1211,6 +1211,7 @@
           }
           if(that.orderExceptionData.orderExceptionStatus>0){
             that.getOrderExcptionResult()
+            that.$set(that.handlerParams,'orderExceptionStatus',that.orderExceptionData.orderExceptionStatus)
           }
         });
       },
@@ -1275,8 +1276,6 @@
           if(this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
             this.getExceptionPriceList('continue_channel',1)
           }
-          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.handlerParams.orderExceptionHandlerResult=='allow_over'){
               this.getExceptionPriceList('continue_channel',2)