Commit e6a543d0 authored by 我在何方's avatar 我在何方

预付异常修复

parent ab00143c
...@@ -394,7 +394,6 @@ ...@@ -394,7 +394,6 @@
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span> <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else> <div v-else>
<div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{ itemAmount&&itemAmount.amount?itemAmount.amount:0}}</div> <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{ itemAmount&&itemAmount.amount?itemAmount.amount:0}}</div>
<div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{itemAmount?itemAmount.amount:''}}</div>
<!-- <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div> <!-- <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div> <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> --> <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
......
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
</el-row> </el-row>
<!-- 线路单证异常 --> <!-- 线路单证异常 -->
<div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'"> <div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId"> <div v-for="row in loopOrderItem" :key="row.orderItemId">
<div v-if="row.charging ==1"> <div v-if="row.charging ==1">
<div v-if="orderExceptionData.orderExceptionStatus==0" class="price_list"> <div v-if="orderExceptionData.orderExceptionStatus==0" class="price_list">
...@@ -847,7 +847,8 @@ ...@@ -847,7 +847,8 @@
tradeCityList:[], tradeCityList:[],
unitList: [], unitList: [],
selectLine:null, selectLine:null,
calculating: false, // 是否正在计算费用,防止频繁重新请求 calculating: false, // 是否正在计算费用,防止频繁重新请求,
loopOrderItem:[], //线路单询异常清关费
}; };
}, },
activated(){ activated(){
...@@ -1407,13 +1408,18 @@ ...@@ -1407,13 +1408,18 @@
//获取提交的不可出渠道异常商品清关费 //获取提交的不可出渠道异常商品清关费
getExceptionPriceList(type){ getExceptionPriceList(type){
let that = this let that = this
console.log(type)
getOrderExceptionChannelPriceList({orderId:that.orderId,exceptionId:parseInt(that.orderExceptionId),exceptionResultId:this.handlerParams.id}).then(res=>{ if(type=='line_loop_exception'){
if(res.code==0){ that.orderData.orderItemVOList.map((v,i)=>{
if(type=='line_loop_exception'){ if(v.orderItemId==this.orderExceptionData.orderItemId){
that.orderData.orderItemVOList.map((v,i)=>{ this.loopOrderItem.push(v)
if(v.orderItemId==this.orderExceptionData.orderItemId){ }
if(res.data.length>0){ })
}else{
getOrderExceptionChannelPriceList({orderId:that.orderId,exceptionId:parseInt(that.orderExceptionId),exceptionResultId:that.handlerParams.id}).then(res=>{
if(res.code==0){
if(res.data.length>0){
that.orderData.orderItemVOList.map(v=>{
var item = res.data.find(vs=>vs.orderItemId==v.orderItemId) var item = res.data.find(vs=>vs.orderItemId==v.orderItemId)
if(item){ if(item){
v.oneSeaFreight = item.freightFee v.oneSeaFreight = item.freightFee
...@@ -1423,31 +1429,11 @@ ...@@ -1423,31 +1429,11 @@
v.clearanceFreightCurrency = item.clearanceCurrencyId v.clearanceFreightCurrency = item.clearanceCurrencyId
v.clearanceFreightVolume = item.clearanceUnitId v.clearanceFreightVolume = item.clearanceUnitId
} }
} })
}else{ }
that.orderData.orderItemVOList.splice(i,1)
}
})
console.log(that.orderData.orderItemVOList)
}else{
if(res.data.length>0){
that.orderData.orderItemVOList.map(v=>{
var item = res.data.find(vs=>vs.orderItemId==v.orderItemId)
if(item){
v.oneSeaFreight = item.freightFee
v.seaFreightCurrency = item.freightCurrencyId
v.seaFreightVolume = item.freightUnitId
v.oneClearanceFreight = item.clearanceFee
v.clearanceFreightCurrency = item.clearanceCurrencyId
v.clearanceFreightVolume = item.clearanceUnitId
}
})
} }
} })
}
}
})
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment