渠道超限异常优化

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

@@ -25,72 +25,72 @@
                <span>品名{{parseInt(index)+1}}：{{$l(row.prodTitle, 'desc')}}</span>
                <span>旧成交价：</span>
                  <div>
-                   <div v-if="!row.oneSeaFreight">
+                   <div v-if="!row.freightFee">
                     <span>{{$t('全包价')}}:</span>
                     <span>{{$t('未报价')}}</span>
                    </div>
                    <div v-else>
                     <span>{{$t('全包价')}}:</span>
-                    <span>【{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} 】</span>
+                    <span>【{{row.freightFee}} {{currencyMap[row.freightCurrencyId]}} / {{unitMap[row.freightUnitId]}} 】</span>
                   </div>
                  </div>
             </div>
             <div v-else class="price_list">
                  <span>旧成交价：</span>
                  <div>
-                   <div v-if="!row.oneSeaFreight">
+                   <div v-if="!row.freightFee">
                      <span>{{$t('运费')}}:</span>
                      <span>{{$t('未报价')}}</span>
                     </div>
                     <div v-else>
                      <span>{{$t('运费')}}:</span>
-                     <span>【{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} 】</span>
+                     <span>【{{row.freightFee}} {{currencyMap[row.freightCurrencyId]}} / {{unitMap[row.freightUnitId]}} 】</span>
                    </div>
                  </div>
                  <div>
-                   <div v-if="!row.oneClearanceFreight">
+                   <div v-if="!row.clearanceFee">
                      <span >{{$t('清关费')}}:</span>
                      <span>{{$t('未报价')}}</span>
                     </div>
                     <div v-else>
                      <span>{{$t('清关费')}}:</span>
-                     <span>【{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}} 】</span>
+                     <span>【{{row.clearanceFee}} {{currencyMap[row.clearanceCurrencyId]}} / {{unitMap[row.clearanceUnitId]}} 】</span>
                    </div>
                  </div>
               </div>
-              <div v-if="loopOrderItem[index].charging ==1"  class="price_list">
+              <div v-if="loopOrderItem.length>index&&loopOrderItem[index].charging ==1"  class="price_list">
                  <span>新成交价：</span>
                    <div>
-                     <div v-if="!loopOrderItem[index].oneSeaFreight">
+                     <div v-if="!loopOrderItem[index].freightFee">
                       <span >{{$t('全包价')}}:</span>
                       <span>{{$t('未报价')}}</span>
                      </div>
                      <div v-else>
                       <span >{{$t('全包价')}}:</span>
-                      <span>【{{loopOrderItem[index].oneSeaFreight}} {{currencyMap[loopOrderItem[index].seaFreightCurrency]}} / {{unitMap[loopOrderItem[index].seaFreightVolume]}} 】</span>
+                      <span>【{{loopOrderItem[index].freightFee}} {{currencyMap[loopOrderItem[index].freightCurrencyId]}} / {{unitMap[loopOrderItem[index].freightUnitId]}} 】</span>
                     </div>
                    </div>
               </div>
-              <div v-else  class="price_list">
+              <div v-else-if="loopOrderItem.length>index"  class="price_list">
                    <span>新成交价：</span>
                    <div>
-                     <div v-if="!loopOrderItem[index].oneSeaFreight">
+                     <div v-if="!loopOrderItem[index].freightFee">
                        <span>{{$t('运费')}}:</span>
                        <span>{{$t('未报价')}}</span>
                       </div>
                       <div v-else>
                        <span >{{$t('运费')}}:</span>
-                       <span>【{{loopOrderItem[index].oneSeaFreight}} {{currencyMap[loopOrderItem[index].seaFreightCurrency]}} / {{unitMap[loopOrderItem[index].seaFreightVolume]}} 】</span>
+                       <span>【{{loopOrderItem[index].freightFee}} {{currencyMap[loopOrderItem[index].freightCurrencyId]}} / {{unitMap[loopOrderItem[index].freightUnitId]}} 】</span>
                      </div>
                    </div>
                    <div>
-                     <div v-if="!loopOrderItem[index].oneClearanceFreight">
+                     <div v-if="!loopOrderItem[index].clearanceFee">
                        <span >{{$t('清关费')}}:</span>
                        <span>{{$t('未报价')}}</span>
                       </div>
                       <div v-else>
                        <span>{{$t('清关费')}}:</span>
-                       <span>【{{loopOrderItem[index].oneClearanceFreight}} {{currencyMap[loopOrderItem[index].clearanceFreightCurrency]}} / {{unitMap[loopOrderItem[index].clearanceFreightVolume]}} 】</span>
+                       <span>【{{loopOrderItem[index].clearanceFee}} {{currencyMap[loopOrderItem[index].clearanceCurrencyId]}} / {{unitMap[loopOrderItem[index].clearanceUnitId]}} 】</span>
                      </div>
                    </div>
                 </div>
@@ -180,6 +180,10 @@ export default {
                         this.getExceptionPriceList(res.data.orderId)
                     })
                 }
+                if(res.data.oldPriceJson){
+                  this.orderItemData = JSON.parse(res.data.oldPriceJson)
+                  console.log(this.orderItemData)
+                }
             })
         },
         getProdAtrr(ids){
@@ -204,18 +208,20 @@ export default {
           that.loopOrderItem = []
           getOrderExceptionChannelPriceList({orderId:orderId,exceptionId:this.orderExceptionData.id,exceptionResultId:parseInt(that.id)}).then(res=>{
             if(res.code==0&&res.data.length>0){
-              that.order.orderItemVOList.map(v=>{
+              that.orderItemData.map(v=>{
                let item = res.data.find(vs=>vs.orderItemId==v.orderItemId)
                let orderItem = {}
                if(item){
-                 orderItem.oneSeaFreight = item.freightFee
-                 orderItem.seaFreightCurrency = item.freightCurrencyId
-                 orderItem.seaFreightVolume = item.freightUnitId
-                 orderItem.oneClearanceFreight = item.clearanceFee
-                 orderItem.clearanceFreightCurrency = item.clearanceCurrencyId
-                 orderItem.clearanceFreightVolume = item.clearanceUnitId
-                 that.loopOrderItem.push(orderItem)
-                 that.orderItemData.push(v)
+                 // orderItem.oneSeaFreight = item.freightFee
+                 // orderItem.seaFreightCurrency = item.freightCurrencyId
+                 // orderItem.seaFreightVolume = item.freightUnitId
+                 // orderItem.oneClearanceFreight = item.clearanceFee
+                 // orderItem.clearanceFreightCurrency = item.clearanceCurrencyId
+                 // orderItem.clearanceFreightVolume = item.clearanceUnitId
+                 item.charging = v.charging
+                 that.loopOrderItem.push(item)
+                 console.log(that.loopOrderItem)
+                 // that.orderItemData.push(v)
                }
               })
             }

src/views/ecw/order/pending.vue

@@ -145,6 +145,7 @@
             <el-button v-else-if="scope.row.orderExceptionStatus==2&&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.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>
 
             <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>

src/views/ecw/order/prepayDeal.vue

@@ -1307,11 +1307,15 @@
           if(this.handlerParams.productId){
             this.productId2 = this.productId1 = this.handlerParams.productId
           }
-          if(this.orderExceptionData.orderExceptionType=='overweight_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){
-            this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.packagingWeightSum)
+          if(this.orderExceptionData.orderExceptionStatus==0){
+            if(this.orderExceptionData.orderExceptionType=='overweight_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){
+              this.$set(this.handlerParams,'weightLimit', this.orderExceptionData.additionalJson.packagingWeightSum)
+            }
+          }else{
+            this.$set(this.handlerParams,'weightLimit', this.handlerParams.weightLimit)
           }
         })