Skip to content

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

渠道超限异常

parent 76c4d4e2
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 54 deletions
src/views/ecw/order/exception/components/overweightException.vue
View file @ 5e389c7e
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}} {{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<div v-for="row in orderItemData" :key="row.orderItemId"> <div v-for="(row,index) in orderItemData" :key="row.orderItemId">
<div v-if="row.charging ==1" class="price_list"> <div v-if="row.charging ==1" class="price_list">
<span>品名{{parseInt(index)+1}}：{{$l(row.prodTitle, 'desc')}}</span>
<span>旧成交价：</span> <span>旧成交价：</span>
<div> <div>
<div v-if="!row.oneSeaFreight"> <div v-if="!row.oneSeaFreight">
...@@ -57,45 +58,46 @@ ...@@ -57,45 +58,46 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div v-if="loopOrderItem[index].charging ==1" class="price_list">
<div v-for="row in loopOrderItem" :key="row.orderItemId">
<div v-if="row.charging ==1" class="price_list">
<span>新成交价：</span>
<div>
<div v-if="!row.oneSeaFreight">
<span >{{$t('全包价')}}:</span>
<span>{{$t('未报价')}}</span>
</div>
<div v-else>
<span >{{$t('全包价')}}:</span>
<span>【{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} 】</span>
</div>
</div>
</div>
<div v-else class="price_list">
<span>新成交价：</span> <span>新成交价：</span>
<div> <div>
<div v-if="!row.oneSeaFreight"> <div v-if="!loopOrderItem[index].oneSeaFreight">
<span>{{$t('运费')}}:</span> <span >{{$t('全包价')}}:</span>
<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>
</div> </div>
<div v-else>
<span >{{$t('运费')}}:</span>
<span>【{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} 】</span>
</div> </div>
</div>
<div>
<div v-if="!row.oneClearanceFreight">
<span >{{$t('清关费')}}:</span>
<span>{{$t('未报价')}}</span>
</div>
<div v-else>
<span>{{$t('清关费')}}:</span>
<span>【{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}} 】</span>
</div>
</div>
</div> </div>
<div v-else class="price_list">
<span>新成交价：</span>
<div>
<div v-if="!loopOrderItem[index].oneSeaFreight">
<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>
</div>
</div>
<div>
<div v-if="!loopOrderItem[index].oneClearanceFreight">
<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>
</div>
</div>
</div>
</div> </div>
<!-- <div v-for="row in loopOrderItem" :key="row.orderItemId"> -->
<!-- </div> -->
<el-descriptions :column="3" v-if="order" :colon="false"> <el-descriptions :column="3" v-if="order" :colon="false">
<el-descriptions-item :label="$t('备注')" :span="2"> <el-descriptions-item :label="$t('备注')" :span="2">
{{$l(orderExceptionData.orderExceptionRemark, 'desc')}} {{$l(orderExceptionData.orderExceptionRemark, 'desc')}}
......
src/views/ecw/order/prepayDeal.vue
View file @ 5e389c7e
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
</el-table> </el-table>
<!-- 单证异常，发货人异常，其他异常的表格 --> <!-- 单证异常，发货人异常，其他异常的表格 -->
<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 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-column :label="$t('序号')" align="center" prop="id" type="index"> <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
...@@ -368,9 +368,109 @@ ...@@ -368,9 +368,109 @@
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" :disabled="orderExceptionData.orderExceptionStatus==2" /> <el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" :disabled="orderExceptionData.orderExceptionStatus==2" />
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- 渠道超限异常 -->
<!-- 线路单证异常,重量超限，渠道超限异常 --> <div v-if="orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'" class="card">
<div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'||((orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'||orderExceptionData.orderExceptionType=='overweight_exception')&&handlerParams.orderExceptionHandlerResult=='allow_over')"> <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">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" min-width="50" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" min-width="50" />
<el-table-column :label="$t('品牌')" align="center" min-width="50" 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('填单箱数')" align="center" prop="num" min-width="60" />
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" align="center" prop="prodAttrIds" min-width="60">
<template slot-scope="scope">
{{getProdAtrr(scope.row.prodAttrIds)}}
</template>
</el-table-column>
<el-table-column :label="$t('入仓箱数')" align="center" min-width="60">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
</template>
</el-table-column>
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" align="center" prop="num" min-width="60">
<template slot-scope="scope">
{{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
</template>
</el-table-column>
<el-table-column :label="$t('方数')" align="center" prop="volume" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
</template>
</el-table-column>
<el-table-column :label="$t('重量')" prop="weight" align="center" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
</template>
</el-table-column>
<el-table-column :label="$t('数量')" prop="quantity" align="center" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
</template>
</el-table-column>
<el-table-column :label="$t('货值')" prop="worth" align="center" min-width="30" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" align="center" min-width="260">
<template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel">
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span> -->
<div class="channel">
<div style="width:80px">{{$t('全包价')}}:</div>
<div style="width:88%" class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
<div v-else class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
</div>
</div>
</div>
<div v-else>
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> -->
<div class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
<div style="width:80px">{{$t('运费')}}:</div>
<div style="width:88%" class="channel" >
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
</div>
<div v-else class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" align="center" min-width="180">
<template slot-scope="scope">
<div class="channel">
<!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> -->
<div class="channel" v-if="orderExceptionData.orderExceptionStatus==0&&handlerParams.orderExceptionHandlerResult=='allow_over'">
<inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<selector v-model="scope.row.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
<div v-else>
<span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneClearanceFreight}} {{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
<!-- 线路单证异常,重量超限 -->
<div v-if="orderExceptionData.orderExceptionType=='line_loop_exception'||(orderExceptionData.orderExceptionType=='overweight_exception'&&handlerParams.orderExceptionHandlerResult=='allow_over')">
<div v-for="row in loopOrderItem" :key="row.orderItemId"> <div v-for="row in loopOrderItem" :key="row.orderItemId">
<div v-if="row.charging ==1"> <div v-if="row.charging ==1">
...@@ -679,6 +779,10 @@ ...@@ -679,6 +779,10 @@
<selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" /> <selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" /> / <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div> </div>
<div v-else class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
</div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -691,10 +795,10 @@ ...@@ -691,10 +795,10 @@
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" /> / <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div> </div>
</div> </div>
<div v-else class="channel"> <div v-else class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('全包价')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span> <span v-else>{{$t('运费')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -866,7 +970,7 @@ ...@@ -866,7 +970,7 @@
unitList: [], unitList: [],
selectLine:null, selectLine:null,
calculating: false, // 是否正在计算费用，防止频繁重新请求, calculating: false, // 是否正在计算费用，防止频繁重新请求,
loopOrderItem:[], //线路单询异常清关费 loopOrderItem:[], //线路单询异常清关费,
}; };
}, },
activated(){ activated(){
...@@ -1039,7 +1143,9 @@ ...@@ -1039,7 +1143,9 @@
} }
if(that.orderExceptionData.orderExceptionRemark){ if(that.orderExceptionData.orderExceptionRemark){
that.orderExceptionData.orderExceptionRemark=JSON.parse(that.orderExceptionData.orderExceptionRemark) that.orderExceptionData.orderExceptionRemark=JSON.parse(that.orderExceptionData.orderExceptionRemark)
}
if(that.orderExceptionData.additionalJson){
that.orderExceptionData.additionalJson=JSON.parse(that.orderExceptionData.orderExceptionRemark)
} }
// if(response.data.hasOwnProperty('orderItemId')){ // if(response.data.hasOwnProperty('orderItemId')){
// that.getShopData(response.data.orderItemId) // that.getShopData(response.data.orderItemId)
...@@ -1093,7 +1199,7 @@ ...@@ -1093,7 +1199,7 @@
if(response.data.customerId){ if(response.data.customerId){
this.getCustomerData(response.data.customerId) this.getCustomerData(response.data.customerId)
} }
if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'){ if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'||this.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'){
// this.handlerParams.channelPriceList = [] // this.handlerParams.channelPriceList = []
this.getOpenedRouterList() this.getOpenedRouterList()
if(this.orderExceptionData.orderExceptionStatus==0){ if(this.orderExceptionData.orderExceptionStatus==0){
...@@ -1107,17 +1213,19 @@ ...@@ -1107,17 +1213,19 @@
v.clearanceFreightVolume = this.unitList[1]['id'] v.clearanceFreightVolume = this.unitList[1]['id']
} }
}) })
}else if(this.handlerParams.orderExceptionHandlerResult=='line_loop_exception'){ }else if(this.orderExceptionData.orderExceptionType=='line_loop_exception'){
this.getExceptionPriceList('line_loop_exception',1) this.getExceptionPriceList('line_loop_exception',1)
} }
} }
if(this.handlerParams.orderExceptionHandlerResult=='continue_channel'){ if(this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
this.getExceptionPriceList('continue_channel',1) this.getExceptionPriceList('continue_channel',1)
} }
if(['channel_packaging_overweight_exception','overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1&&this.orderExceptionData.orderExceptionStatus=='1'){ if(['overweight_exception','channel_packaging_overweight_exception'].indexOf(this.orderExceptionData.orderExceptionType)>-1){
this.getExceptionPriceList('continue_channel',2) if(this.orderExceptionData.orderExceptionStatus=='1'){
}else{ this.getExceptionPriceList('continue_channel',2)
this.getExceptionPriceList('line_loop_exception',1) }else{
this.getExceptionPriceList('line_loop_exception',1)
}
} }
}); });
}, },
...@@ -1442,8 +1550,14 @@ ...@@ -1442,8 +1550,14 @@
that.loopOrderItem =[] that.loopOrderItem =[]
if(type=='line_loop_exception'){ if(type=='line_loop_exception'){
that.orderData.orderItemVOList.map((v,i)=>{ that.orderData.orderItemVOList.map((v,i)=>{
if(v.orderItemId==that.orderExceptionData.orderItemId){ if(that.orderExceptionData.orderExceptionType=='channel_packaging_overweight_exception'){
that.loopOrderItem.push(v) if(that.orderExceptionData.additionalJson&&that.orderExceptionData.additionalJson.orderItemIdList.indexOf(v.orderItemId)>-2){
that.loopOrderItem.push(v)
}
}else{
if(v.orderItemId==that.orderExceptionData.orderItemId){
that.loopOrderItem.push(v)
}
} }
}) })
}else{ }else{
...@@ -1494,7 +1608,7 @@ ...@@ -1494,7 +1608,7 @@
justify-content: space-between; justify-content: space-between;
} }
.card{ .card{
margin-top: 20px; margin: 20px 0;
} }
.price_list{ .price_list{
display: flex; display: flex;
...@@ -1550,4 +1664,7 @@ ...@@ -1550,4 +1664,7 @@
::v-deep .el-table td.el-table__cell div{ ::v-deep .el-table td.el-table__cell div{
padding:0 2px !important; padding:0 2px !important;
} }
.w100{
width:100px;
}
</style> </style>
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