商品超限异常优化

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','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'].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>
@@ -243,6 +243,59 @@
           </el-table-column>
         <el-table-column :label="$t('货值')" prop="worth" />
       </el-table>
+      <!-- 重量超限异常 -->
+      <el-table v-if="['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>
+            </template>
+          </el-table-column>
+        <el-table-column :label="$t('中文名')" align="center"  prop="prodTitleZh" />
+        <el-table-column :label="$t('英文名')" align="center"  prop="prodTitleEn" />
+        <el-table-column :label="$t('品牌')" align="center" prop="brandType">
+          <template slot-scope="scope">
+              <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag>
+            </template>
+          </el-table-column>
+        <el-table-column :label="$t('填单箱数')" prop="num" />
+        <!-- v2.0  入仓特性异常 -->
+        <el-table-column :label="$t('填单特性')" prop="prodAttrIds">
+          <template slot-scope="scope">
+                {{getProdAtrr(scope.row.prodAttrIds)}}
+            </template>
+          </el-table-column>
+        <el-table-column :label="$t('入仓箱数')">
+          <template slot-scope="scope">
+              {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
+          </template>
+        </el-table-column>
+        <!-- v2.0  入仓特性异常 -->
+        <el-table-column :label="$t('入仓特性')" prop="num">
+        <template slot-scope="scope">
+              {{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('方数')" prop="volume">
+          <template slot-scope="scope">
+              {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
+            </template>
+          </el-table-column>
+        <el-table-column :label="$t('重量')" prop="weight">
+          <template slot-scope="scope">
+              {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
+            </template>
+          </el-table-column>
+        <el-table-column :label="$t('数量')" prop="quantity">
+          <template slot-scope="scope">
+              {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
+            </template>
+          </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'">
+        <span>{{$t('空运订单重量上限')}}(kg)</span>
+        <div style="width:200px;margin-left:20px"><el-input type="number" v-model="handlerParams.weightLimit"></el-input></div>
+      </div>
 <!-- 未分配客户经理 -->
 	 <div v-if="orderExceptionData.orderExceptionType=='not_customer_service_exception'">
      <el-row :gutter="20">
@@ -370,6 +423,7 @@
         </el-row>
        <!-- 渠道超限异常 -->
         <div v-if="orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'"  class="card">
+          <div style="font-size:18px;font-weight:600">{{$t('渠道包装超限品名列表')}}</div>
           <el-table v-loading="loading" border :data="orderData.orderItemVOList">
             <el-table-column :label="$t('序号')" align="center" prop="id" type="index" min-width="30">
                 <template slot-scope="scope">
@@ -1005,6 +1059,7 @@
     },
     watch:{
       'handlerParams.orderExceptionHandlerResult'(val){
+        console.log(val)
         if(val == 'no_pay'||val=="allow_over"){
           this.showWorkFlow = true
         }else if(val=="continue_channel"){
@@ -1145,7 +1200,7 @@
             that.orderExceptionData.orderExceptionRemark=JSON.parse(that.orderExceptionData.orderExceptionRemark)
           }
           if(that.orderExceptionData.additionalJson){
-            that.orderExceptionData.additionalJson=JSON.parse(that.orderExceptionData.orderExceptionRemark)
+            that.orderExceptionData.additionalJson=JSON.parse(that.orderExceptionData.additionalJson)
           }
           // if(response.data.hasOwnProperty('orderItemId')){
           //   that.getShopData(response.data.orderItemId)
@@ -1199,7 +1254,7 @@
           if(response.data.customerId){
             this.getCustomerData(response.data.customerId)
           }
-          if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'||this.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'){
+          if(['overweight_exception','not_shipping_channel_exception','channel_packaging_overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
             // this.handlerParams.channelPriceList = []
             this.getOpenedRouterList()
             if(this.orderExceptionData.orderExceptionStatus==0){
@@ -1220,11 +1275,13 @@
           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=='1'){
-              this.getExceptionPriceList('continue_channel',2)
-            }else{
+            if(this.orderExceptionData.orderExceptionStatus=='0'){
               this.getExceptionPriceList('line_loop_exception',1)
+            }else{
+              this.getExceptionPriceList('continue_channel',2)
             }
           }
         });
@@ -1250,6 +1307,9 @@
           if(this.handlerParams.productId){
             this.productId2 = this.productId1 = this.handlerParams.productId
           }
+          if(this.orderExceptionData.orderExceptionType=='overweight_exception'&&this.orderExceptionData.additionalJson&&this.orderExceptionData.additionalJson.productAirWeightLimit){
+            this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.productAirWeightLimit)
+          }
         })
 
       },
@@ -1551,8 +1611,8 @@
           if(type=='line_loop_exception'){
             that.orderData.orderItemVOList.map((v,i)=>{
               if(that.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'){
-                if(that.orderExceptionData.additionalJson&&that.orderExceptionData.additionalJson.orderItemIdList.indexOf(v.orderItemId)>-2){
-                  that.loopOrderItem.push(v) 
+                if(that.orderExceptionData.additionalJson&&that.orderExceptionData.additionalJson.orderItemIdList.indexOf(v.orderItemId)>-1){
+                  that.loopOrderItem.push(v)
                 }
               }else{
                 if(v.orderItemId==that.orderExceptionData.orderItemId){
@@ -1667,4 +1727,13 @@
 .w100{
   width:100px;
 }
+.overweight_order{
+  display:flex;
+  align-items: center;
+  margin-top:20px;
+}
+.overweight_order span{
+  font-size:14px;
+}
+
 </style>