Skip to content

J
jiedao-app-operator-master
Commit edcca0b1 authored by 我在何方's avatar 我在何方
Browse files
Options

线路单询异常

parent caa1a858
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 18 deletions
src/views/ecw/order/prepayDeal.vue
View file @ edcca0b1
......@@ -45,6 +45,7 @@
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-form-item>
</el-row>
<!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception','channel_packaging_overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
......@@ -352,6 +353,55 @@
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" :disabled="orderExceptionData.orderExceptionStatus==2" />
</el-form-item>
</el-row>
<!-- 线路单证异常 -->
<div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId">
<div v-if="row.charging ==1">
<div v-if="orderExceptionData.orderExceptionStatus==0" class="price_list">
<div style="width:80px">{{$t('全包价')}}:</div>
<inputor default2="0" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<selector v-model="row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
<div v-else class="price_list">
<span v-if="!row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('全包价')}}:{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
</div>
</div>
<div v-else>
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> -->
<div v-if="orderExceptionData.orderExceptionStatus==0">
<div class="price_list">
<div style="width:80px">{{$t('运费')}}:</div>
<div class="price_list">
<inputor style="width:100px" default2="0" v-model.number="row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" />
<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 class="price_list">
<div style="width:80px">{{$t('清关费')}}:</div>
<div class="price_list">
<inputor style="width:100px" default2="0" v-model.number="row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" />
<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 v-else>
<div class="price_list">
<span v-if="!row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('运费')}}:{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
</div>
<div class="price_list">
<span v-if="!row.oneSeaFreight">{{$t('清关费')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('清关费')}}:{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
</div>
</div>
</div>
</div>
</div>
<!--预付异常的备选需要根据接口数据过滤-->
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item :label="$t('处理结果')+':'" required>
......@@ -1003,9 +1053,12 @@
}
})
}else if(handlerParams.orderExceptionHandlerResult=='continue_channel'){
this.getExceptionPriceList()
this.getExceptionPriceList('continue_channel')
}
}
if(this.orderExceptionData.orderExceptionType=='line_loop_exception'){
this.getExceptionPriceList('line_loop_exception')
}
});
},
getCustomerData(id){
......@@ -1109,7 +1162,7 @@
return
}
}
if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
if((this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='continue_channel')||this.orderExceptionData.orderExceptionType=='line_loop_exception'){
this.handlerParams.orderItemVOList = this.orderData.orderItemVOList
this.handlerParams.channelPriceList = []
this.orderData.orderItemVOList.map(v=>{
......@@ -1268,21 +1321,46 @@
}
},
//获取提交的不可出渠道异常商品清关费
getExceptionPriceList(){
getExceptionPriceList(type){
let that = this
console.log(type)
getOrderExceptionChannelPriceList({orderId:that.orderId,exceptionId:parseInt(that.orderExceptionId),exceptionResultId:this.handlerParams.id}).then(res=>{
if(res.code==0&&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
}
})
if(res.code==0){
if(type=='line_loop_exception'){
that.orderData.orderItemVOList.map((v,i)=>{
if(v.orderItemId==this.orderExceptionData.orderItemId){
if(res.data.length>0){
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
}
}
}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
}
})
}
}
}
})
......@@ -1314,6 +1392,11 @@
.card{
margin-top: 20px;
}
.price_list{
display: flex;
align-items: center;
margin-bottom:10px;
}
.channel{
width: 100%;
display: flex;
......@@ -1339,9 +1422,6 @@
.red{
color: red;
}
.el-select{
width:300px !important;
}
.button{
margin-left:40px;
}
......
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