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

src/views/ecw/order/exception/index.vue

@@ -274,6 +274,8 @@
           <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
+          <!-- 2.0.2 -->
+          <el-button v-else-if="scope.row.orderExceptionType=='line_weight_exception'" v-hasPermi="['ecw:exception:lineWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -146,7 +146,9 @@
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
-
+            <!-- v2.0.2 -->
+            <el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='line_Weight_exception'" v-hasPermi="['ecw:exception:lineWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
+            
             <el-tag style="margin-left:10px" v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
             <el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='order_lack_box_exception'" v-hasPermi="['ecw:exception:lackBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
@@ -176,6 +178,8 @@
             <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
+          <!-- v2.0.2 -->
+          <el-button v-else-if="scope.row.orderExceptionType=='line_weight_exception'" v-hasPermi="['ecw:exception:lineWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/ecw/order/prepayDeal.vue

@@ -14,7 +14,7 @@
 
           </el-form-item>
        </el-row>
-       <div v-if="shopData&&['goods_add_exception','line_loop_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception','channel_exception','not_shipping_channel_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <div v-if="shopData&&['goods_add_exception','line_loop_exception','overweight_exception','line_weight_exception','stock_up_exception','in_warehousing_diff_exception','channel_exception','not_shipping_channel_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
          <el-row>
             <el-form-item :label="$t('产品名称')+':'" >
               {{shopData.prodTitleZh || ''}}
@@ -34,11 +34,11 @@
            </el-form-item>
        </el-row>
        <el-row>
-         <el-form-item :label="$t('异常类型')+':'" v-if="orderExceptionData.orderExceptionType=='overweight_exception'||orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'">
+         <el-form-item :label="$t('异常类型')+':'" v-if="['overweight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
             <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
          </el-form-item>
        </el-row>
-        <el-row :span="12" v-if="orderExceptionData.orderExceptionType=='overweight_exception'||orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'">
+        <el-row :span="12" v-if="['overweight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
           <el-form-item :label="$t('异常描述')+':'">
             <!-- <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> -->
             <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
@@ -54,7 +54,7 @@
         </el-row>
 
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
-       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception','line_weight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
         <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
           <el-row>
@@ -248,7 +248,7 @@
         <el-table-column :label="$t('货值')" prop="worth" />
       </el-table>
       <!-- 重量超限异常 -->
-      <el-table v-if="['overweight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" border :data="loopOrderItem">
+      <el-table v-if="['line_weight_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" border :data="loopOrderItem">
         <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
             <template slot-scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -296,7 +296,7 @@
           </el-table-column>
         <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'">
+      <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>
         <div style="width:200px;margin-left:20px"><el-input type="number" v-model="handlerParams.weightLimit"></el-input></div>
       </div>
@@ -482,10 +482,15 @@
                      <div  class="channel">
                         <div style="width:80px">{{$t('全包价')}}:</div>
                         <div style="width:88%"  class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
-                          <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
-                          <span>{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
+                          <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                            /
+                          </div>
+                          <div v-else>
+                            <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
+                            <span>{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
 <!--                          <selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
                           / <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
+                          </div>
                         </div>
                         <div v-else class="channel">
                               <span v-if="!scope.row.oneSeaFreight">{{$t('未报价')}}</span>
@@ -497,7 +502,10 @@
                      <!-- <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> -->
                      <div class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
                         <div style="width:80px">{{$t('运费')}}:</div>
-                        <div style="width:88%"  class="channel" >
+                        <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                          /
+                        </div>
+                        <div style="width:88%"  class="channel"  v-else>
                           <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
                           <span>{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
 <!--                          <selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
@@ -516,10 +524,15 @@
                    <div class="channel">
                       <!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> -->
                       <div class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
-                        <inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
-                        <span>{{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
+                        <div v-if="!scope.row.clearanceFreightCurrency||!scope.row.clearanceFreightVolume">
+                          /
+                        </div>
+                        <div v-else>
+                          <inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
+                          <span>{{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
 <!--                        <selector v-model="scope.row.clearanceFreightCurrency"  :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
                         / <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
+                        </div>
                       </div>
                       <div v-else>
                         <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
@@ -531,16 +544,21 @@
           </el-table>
         </div>
         <!-- 线路单证异常,重量超限 -->
-        <div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'||(orderExceptionData.orderExceptionType=='overweight_exception'&&handlerParams.orderExceptionHandlerResult=='allow_over')">
+        <div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'||((orderExceptionData.orderExceptionType=='overweight_exception'||orderExceptionData.orderExceptionType=='line_weight_exception')&&handlerParams.orderExceptionHandlerResult=='allow_over')">
            <div v-for="row in loopOrderItem" :key="row.orderItemId">
             <div v-if="row.charging ==1">
 
                  <div v-if="orderExceptionData.orderExceptionStatus==0"  class="price_list">
                     <div class="price_label">{{$t('全包价')}}:</div>
-                   <inputor default2="0" style="width:100px" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" />
-                   <span>{{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
+                      <div v-if="!row.seaFreightCurrency||!row.seaFreightVolume">
+                        /
+                      </div>
+                    <div v-else>
+                      <inputor default2="0" style="width:100px" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" />
+                      <span>{{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
 <!--                   <selector v-model="row.seaFreightCurrency" style="width:100px" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  />
                    / <selector v-model="row.seaFreightVolume" style="width:100px" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  /> -->
+                    </div>
                  </div>
                  <div v-else  class="price_list">
                    <div v-if="!row.oneSeaFreight">
@@ -559,19 +577,29 @@
                    <div  class="price_list">
                      <div class="price_label">{{$t('运费')}}:</div>
                      <div class="price_list">
-                       <inputor style="width:100px" default2="0" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" />
-                       <span>{{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
+                        <div v-if="!row.seaFreightCurrency||!row.seaFreightVolume">
+                          /
+                        </div>
+                        <div v-else>
+                          <inputor style="width:100px" default2="0" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" />
+                          <span>{{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
        <!--                <selector style="width:100px" v-model="row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 />
                        / <selector style="width:100px" v-model="row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 /> -->
+                        </div>
                      </div>
                    </div>
                    <div  class="price_list">
                      <div class="price_label">{{$t('清关费')}}:</div>
                      <div class="price_list">
-                       <inputor style="width:100px" default2="0" v-model.number="row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" />
-                        <span>{{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
+                       <div v-if="!row.clearanceFreightCurrency||!row.clearanceFreightVolume">
+                          /
+                        </div>
+                        <div v-else>
+                          <inputor style="width:100px" default2="0" v-model.number="row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" />
+                          <span>{{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
                       <!-- <selector style="width:100px" v-model="row.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  />
                        / <selector style="width:100px" v-model="row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  /> -->
+                      </div>
                      </div>
                    </div>
                  </div>
@@ -839,10 +867,15 @@
                          <div  class="channel">
                             <div style="width:80px">{{$t('全包价')}}:</div>
                             <div style="width:88%"  class="channel" v-if="orderExceptionData.orderExceptionStatus==0">
-                              <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
-                              <span>{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
+                              <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                                /
+                              </div>
+                              <div v-else>
+                                <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
+                                <span>{{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
       <!--                        <selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
                               / <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
+                              </div>
                             </div>
                             <div v-else class="channel">
                               <span v-if="!scope.row.oneSeaFreight">{{$t('未报价')}}</span>
@@ -855,10 +888,15 @@
                          <div class="channel" v-if="orderExceptionData.orderExceptionStatus==0">
                             <div style="width:80px">{{$t('运费')}}:</div>
                             <div style="width:88%"  class="channel" >
-                              <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
-                               <span>{{$t('运费')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
+                              <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                                /
+                              </div>
+                              <div v-else>
+                                <inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
+                                <span>{{$t('运费')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
 <!--                              <selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
                               / <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
+                              </div>
                             </div>
                           </div>
                           <div v-else class="channel">
@@ -873,10 +911,15 @@
                        <div class="channel">
                           <!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> -->
                           <div class="channel" v-if="orderExceptionData.orderExceptionStatus==0">
-                            <inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
-                            <span>{{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
+                             <div v-if="!scope.row.clearanceFreightCurrency||!scope.row.clearanceFreightVolume">
+                               /
+                             </div>
+                             <div v-else>
+                              <inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
+                              <span>{{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
               <!--              <selector v-model="scope.row.clearanceFreightCurrency"  :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
                             / <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
+                            </div>
                           </div>
                           <div v-else>
                             <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
@@ -947,9 +990,9 @@
       待审核可能没有bpmStatus字段
       -->
       <template v-if="orderExceptionData.bpmStatus == 1 || (orderExceptionData.bpmId && !orderExceptionData.bpmStatus)">
-        <el-button v-if="['channel_packaging_overweight_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType)>-1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('重量超限改价审核中')}}</el-button>
+        <el-button v-if="['channel_packaging_overweight_exception','line_weight_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType)>-1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('重量超限改价审核中')}}</el-button>
         <el-button v-else type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('审核中')}}</el-button>
-        <el-button v-if="['channel_packaging_overweight_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType)>-1" plain type="primary" @click="cancelAudit">{{$t('取消重量超限改价审核')}}</el-button>
+        <el-button v-if="['channel_packaging_overweight_exception','line_weight_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType)>-1" plain type="primary" @click="cancelAudit">{{$t('取消重量超限改价审核')}}</el-button>
         <el-button v-else plain type="primary" @click="cancelAudit">{{$t('取消审核')}}</el-button>
         <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
       </template>
@@ -1212,6 +1255,7 @@
           // if(response.data.hasOwnProperty('orderItemId')){
           //   that.getShopData(response.data.orderItemId)
           // }
+
           if(that.orderExceptionData.orderExceptionType == 'order_pay_exception'){
             that.getOrderFeeByIdData()
             that.getPreExceptionData()
@@ -1266,21 +1310,21 @@
           if(response.data.customerId){
             this.getCustomerData(response.data.customerId)
           }
-          if(['overweight_exception','not_shipping_channel_exception','channel_packaging_overweight_exception','channel_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
+          if(['overweight_exception','line_weight_exception','not_shipping_channel_exception','channel_packaging_overweight_exception','channel_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
             // this.handlerParams.channelPriceList = []
             this.getOpenedRouterList()
-            if(this.orderExceptionData.orderExceptionStatus==0){
-              this.orderData.orderItemVOList.map(v=>{
-                if(!v.oneSeaFreight){
-                  v.seaFreightCurrency = this.currencyList[0]['id']
-                  v.seaFreightVolume = this.unitList[1]['id']
-                }
-                if(!v.oneClearanceFreight){
-                  v.clearanceFreightCurrency = this.currencyList[0]['id']
-                  v.clearanceFreightVolume = this.unitList[1]['id']
-                }
-              })
-            }
+            // if(this.orderExceptionData.orderExceptionStatus==0){
+            //   this.orderData.orderItemVOList.map(v=>{
+            //     if(!v.oneSeaFreight){
+            //       v.seaFreightCurrency = this.currencyList[0]['id']
+            //       v.seaFreightVolume = this.unitList[1]['id']
+            //     }
+            //     if(!v.oneClearanceFreight){
+            //       v.clearanceFreightCurrency = this.currencyList[0]['id']
+            //       v.clearanceFreightVolume = this.unitList[1]['id']
+            //     }
+            //   })
+            // }
           }
           if(this.orderExceptionData.orderExceptionType=='line_loop_exception'){
             this.getExceptionPriceList('line_loop_exception',1)
@@ -1288,7 +1332,7 @@
           if(this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
             this.getExceptionPriceList('continue_channel',1)
           }
-          if(['overweight_exception','channel_packaging_overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
+          if(['overweight_exception','line_weight_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)
             }else{
@@ -1320,7 +1364,7 @@
             this.productId2 = this.productId1 = this.handlerParams.productId
           }
           if(this.orderExceptionData.orderExceptionStatus==0){
-            if(this.orderExceptionData.orderExceptionType=='overweight_exception'&&this.orderExceptionData.additionalJson&&this.orderExceptionData.additionalJson.weightSum){
+            if((this.orderExceptionData.orderExceptionType=='overweight_exception'||this.orderExceptionData.orderException=='line_weight_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){
@@ -1414,20 +1458,31 @@
               return
             }
           }
-          if(['channel_packaging_overweight_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'){
             if(!this.handlerParams.weightLimit){
               this.$modal.msgError(this.$t('请输入空运订单上限'));
               return
             }
           }
-          if(['line_loop_exception','channel_packaging_overweight_exception','overweight_exception','not_shipping_channel_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
+          if(['line_loop_exception','channel_packaging_overweight_exception','line_weight_exception','overweight_exception','not_shipping_channel_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
             if(this.orderExceptionData.orderExceptionType=='line_loop_exception'||((this.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'||this.orderExceptionData.orderExceptionType=='overweight_exception')&&this.handlerParams.orderExceptionHandlerResult=='allow_over')){
               this.handlerParams.orderItemVOList = this.loopOrderItem
             }else{
               this.handlerParams.orderItemVOList = this.orderData.orderItemVOList
             }
             this.handlerParams.channelPriceList = []
+            let priceUnit = false
+
             this.handlerParams.orderItemVOList.map(v=>{
+           if(v.charging==1){
+              if(!v.seaFreightCurrency||!v.seaFreightVolume){
+                priceUnit = true
+              }
+            }else{
+              if(!v.seaFreightCurrency||!v.seaFreightVolume||!v.clearanceFreightCurrency||!v.clearanceFreightVolume){
+                priceUnit = true
+              }
+            }
             var listItem = {
               orderId:v.orderId,
               orderItemId:v.orderItemId,
@@ -1442,6 +1497,10 @@
             }
             this.handlerParams.channelPriceList.push(listItem)
             })
+            if(priceUnit){
+              this.$modal.msgError(this.$t('请先去设置运费或清关费本身的货币单位、计价单位'));
+              return
+            }
           }
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));