添加渠道包装重量超限异常

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

@@ -254,6 +254,7 @@
           <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <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>        
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -173,6 +173,7 @@
             <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <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>   
           </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'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <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">
          <el-row>
             <el-form-item :label="$t('产品名称')+':'" >
               {{shopData.prodTitleZh || ''}}
@@ -33,7 +33,7 @@
                 {{orderData?getRouterNameById():''}}
            </el-form-item>
        </el-row>
-        <el-row :span="12" v-if="orderExceptionData.orderExceptionType=='overweight_exception'">
+        <el-row :span="12" v-if="orderExceptionData.orderExceptionType=='overweight_exception'||orderExceptionData.orderException=='channel_packaging_overweight_exception'">
           <el-form-item :label="$t('异常描述')+':'">
             <!-- <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> -->
             <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
@@ -41,7 +41,7 @@
           </el-form-item>
         </el-row>
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
-       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_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>
@@ -174,7 +174,7 @@
       </el-table>
 
       <!-- 单证异常，发货人异常，其他异常的表格 -->
-      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception','overweight_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','overweight_exception','channel_packaging_overweight_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>

src/views/ecw/order/weightDeal.vue

@@ -4,6 +4,9 @@
     <el-card>
         <div slot="header" class="card-title">{{$t('查看')}}</div>
         <el-descriptions :column="4">
+            <el-descriptions-item :label="$t('订单号')">
+                {{orderData.orderNo||''}}
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('唛头')">
                 {{orderData.marks?orderData.marks:$t('无')}}
             </el-descriptions-item>
@@ -16,8 +19,9 @@
             <el-descriptions-item :label="$t('送货日期')">
               <span>{{orderData.deliveryDate||$t('无')}}</span>
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('运输方式')">
+            <el-descriptions-item :label="$t('运输方式')" :span="2">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
+                <span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'" style="margin-left:10px">{{$t('出货渠道')}}:{{orderData.channelName}}</span>
               </el-descriptions-item>
              <el-descriptions-item :label="$t('始发地')" :span="2">
                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
@@ -150,6 +154,7 @@ import {getExceptionById,handlerExceptionByExceptionId,getOrderExcptionResult} f
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
 import {getProductBrankPage} from '@/api/ecw/productBrank'
+import {getDictData, getDictDatas} from  '@/utils/dict'
 
 export default {
   name: "WeightDeal",
@@ -182,6 +187,11 @@ export default {
       this.branklist=data.data.list
     })
   },
+  computed:{
+      getDictData(){
+          return (type, value) => getDictData(type, value) || {}
+      },
+  },
   methods: {
     /** 查询列表 */
     getList() {