Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/prepayDeal.vue

@@ -297,7 +297,8 @@
         <el-table-column :label="$t('货值')" prop="worth" />
       </el-table>
       <div class="overweight_order" v-if="(['overweight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1&&handlerParams.orderExceptionHandlerResult=='update_weight_limit')||(['line_weight_exception',].indexOf(orderExceptionData.orderExceptionType) > -1&&handlerParams.orderExceptionHandlerResult=='change_line_weight')">
-        <span>{{$t('空运订单重量上限')}}(kg)</span>
+        <span v-if="orderExceptionData.orderExceptionType=='line_weight_exception'">{{$t('路线重量上限')}}(kg)</span>
+        <span v-else>{{$t('空运订单重量上限')}}(kg)</span>
         <div style="width:200px;margin-left:20px"><el-input type="number" v-model="handlerParams.weightLimit"></el-input></div>
       </div>
 <!-- 未分配客户经理 --> 
@@ -1458,9 +1459,13 @@
               return
             }
           }
-          if(['channel_packaging_overweight_exception','line_weight_exception','overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.handlerParams.orderExceptionHandlerResult=='update_weight_limit'){
+          if((['channel_packaging_overweight_exception','line_weight_exception','overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.handlerParams.orderExceptionHandlerResult=='update_weight_limit')||(['line_weight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.handlerParams.orderExceptionHandlerResult=='change_line_weight')){
             if(!this.handlerParams.weightLimit){
+              if(this.orderExceptionData.orderExceptionType=='line_weight_exception'){
+                this.$modal.msgError(this.$t('请输入路线重量上限'));
+              }else{
                 this.$modal.msgError(this.$t('请输入空运订单上限'));
+              }
               return
             }
           }