Skip to content

J
jiedao-app-operator-master
Commit 1c75f2ea authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents b73ae8e8 84ebae58
Show whitespace changes
Inline Side-by-side
Showing with 243 additions and 18 deletions
src/views/bpm/processInstance/detail.vue
View file @ 1c75f2ea
...@@ -396,7 +396,13 @@ export default { ...@@ -396,7 +396,13 @@ export default {
split_revoke:{ split_revoke:{
component: () => import("@/views/ecw/order/components/SplitRevokeDetail"), component: () => import("@/views/ecw/order/components/SplitRevokeDetail"),
id: this.processInstance.businessKey id: this.processInstance.businessKey
} },
// 不可出渠道异常审核
not_shiping_channel:{
component: () => import('@/views/ecw/order/components/NotShipingChannel'),
id: this.processInstance.businessKey,
path: this.processInstance.processDefinition?.formCustomViewPath
},
} }
console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim()) console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())
return map[this.processInstance.processDefinition.formCustomViewPath.trim()] return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
......
src/views/ecw/order/components/NotShipingChannel.vue 0 → 100644
View file @ 1c75f2ea
<!--拆单审核中的申请信息部分-->
<template>
<div v-if="order">
<el-descriptions :column="4" v-if="order" :colon="false">
<el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
<el-descriptions-item :label="$t('出货方式')">
{{channel ? channel.nameZh : '/'}}
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
{{order.statusMsg}}
</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">
{{order.logisticsInfoDto.startTitleZh}}
</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')" :span="2">
{{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="order" :colon="false">
<el-descriptions-item :label="$t('申请理由')" :span="2">
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-descriptions-item>
</el-descriptions>
<el-table border :data="order.orderItemVOList">
<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" min-width="60" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" min-width="60" />
<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('填单箱数')" prop="num" min-width="60" />
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" prop="prodAttrIds" min-width="100">
<template slot-scope="scope">
{{getProdAtrr(scope.row.prodAttrIds)}}
</template>
</el-table-column>
<el-table-column :label="$t('入仓箱数')" 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('入仓特性')" prop="num" min-width="100">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
</template>
</el-table-column>
<el-table-column :label="$t('方数')" prop="volume" min-width="50">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
</template>
</el-table-column>
<el-table-column :label="$t('重量')" prop="weight" min-width="50">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
</template>
</el-table-column>
<el-table-column :label="$t('数量')" prop="quantity" min-width="50">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
</template>
</el-table-column>
<el-table-column :label="$t('货值')" prop="worth" min-width="50" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="160">
<template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel">
<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>
</div>
<div v-else class="channel">
<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>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" min-width="160">
<template slot-scope="scope">
<div class="channel">
<span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneClearanceFreight}} {{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
</div>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import {getOrder} from '@/api/ecw/order'
import {getChannel} from '@/api/ecw/channel'
import {getUnitList} from "@/api/ecw/unit"
import { getCurrencyList } from '@/api/ecw/currency'
import {getProductAttrList} from '@/api/ecw/productAttr'
import Decimal from 'decimal.js'
import {getExceptionById} from '@/api/ecw/orderException'
export default {
name: 'NotShipingChannel',
props:{
id: [String, Number],
path: String
},
data(){
return {
orderExceptionData: null,
order: null,
channel: null,
unitList:[],
currencyList:[],
detail:null
}
},
watch:{
id(){
this.getData()
},
order(){
if(this.order.channelId){
this.getChannel()
}
},
},
computed:{
currencyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
},
unitMap(){
let map = {}
this.unitList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
}
},
async created(){
await getCurrencyList().then(res => this.currencyList = res.data)
this.productAttrList = (await getProductAttrList()).data
if(this.id){
this.getData()
}
},
methods:{
Decimal,
getData(){
getExceptionById(this.id).then(res => {
this.orderExceptionData = res.data
if(res.data.orderId){
getOrder(res.data.orderId).then(res => {
this.order = res.data
})
}
})
},
getProdAtrr(ids){
if(!ids) return ''
let attr = []
let attrIds = ids.split(',')
this.productAttrList.forEach(item=>{
if(attrIds.indexOf(item.id) > -1||attrIds.indexOf(item.id+'')>-1){
attr.push(this.$l(item, 'attrName'))
}
})
return attr.join(',')
},
getChannel(){
getChannel(this.order.channelId).then(res => {
this.channel = res.data
})
},
}
}
</script>
<style scoped lang="scss">
.title{
padding: 10px 0;
span{
font-size: 14px;
font-weight: bold;
}
}
.bold{
font-weight: bold;
}
::v-deep .prepay_exception_detail .el-form-item{
margin-bottom: 0;
}
</style>
src/views/ecw/order/prepayDeal.vue
View file @ 1c75f2ea
...@@ -523,48 +523,48 @@ ...@@ -523,48 +523,48 @@
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" /> <el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" min-width="60" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" /> <el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" min-width="60" />
<el-table-column :label="$t('品牌')" align="center" prop="brandType"> <el-table-column :label="$t('品牌')" align="center" min-width="50" prop="brandType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('填单箱数')" prop="num" /> <el-table-column :label="$t('填单箱数')" prop="num" min-width="60" />
<!-- v2.0 入仓特性异常 --> <!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" prop="prodAttrIds" width="200"> <el-table-column :label="$t('填单特性')" prop="prodAttrIds" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{getProdAtrr(scope.row.prodAttrIds)}} {{getProdAtrr(scope.row.prodAttrIds)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入仓箱数')"> <el-table-column :label="$t('入仓箱数')" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}} {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
</template> </template>
</el-table-column> </el-table-column>
<!-- v2.0 入仓特性异常 --> <!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" prop="num"> <el-table-column :label="$t('入仓特性')" prop="num" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}} {{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('方数')" prop="volume"> <el-table-column :label="$t('方数')" prop="volume" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}} {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('重量')" prop="weight"> <el-table-column :label="$t('重量')" prop="weight" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}} {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('数量')" prop="quantity"> <el-table-column :label="$t('数量')" prop="quantity" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}} {{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('货值')" prop="worth" /> <el-table-column :label="$t('货值')" prop="worth" min-width="50" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'"> <el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel"> <div v-if="scope.row.charging ==1" class="channel">
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span> --> <!-- <span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span> -->
...@@ -590,7 +590,7 @@ ...@@ -590,7 +590,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'"> <el-table-column :label="$t('清关费')" prop="quantity" min-width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="channel"> <div class="channel">
<!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> --> <!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> -->
...@@ -602,7 +602,7 @@ ...@@ -602,7 +602,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'"> <el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel"> <div v-if="scope.row.charging ==1" class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span> <span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span>
...@@ -616,7 +616,7 @@ ...@@ -616,7 +616,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'"> <el-table-column :label="$t('清关费')" prop="quantity" min-width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="channel"> <div class="channel">
<span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
...@@ -929,8 +929,9 @@ ...@@ -929,8 +929,9 @@
} }
if(that.orderExceptionData.orderExceptionStatus==2){ if(that.orderExceptionData.orderExceptionStatus==2){
that.getOrderExcptionResult() that.getOrderExcptionResult()
}else if(that.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&that.orderExceptionData.orderExceptionStatus==1){
that.getOrderExcptionResult()
} }
}); });
}, },
// 获取路线 // 获取路线
...@@ -974,7 +975,7 @@ ...@@ -974,7 +975,7 @@
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'){
console.log(this.curreynList) // this.handlerParams.channelPriceList = []
this.orderData.orderItemVOList.map(v=>{ this.orderData.orderItemVOList.map(v=>{
if(!v.oneSeaFreight){ if(!v.oneSeaFreight){
v.seaFreightCurrency = this.currencyList[0]['id'] v.seaFreightCurrency = this.currencyList[0]['id']
...@@ -1091,6 +1092,22 @@ ...@@ -1091,6 +1092,22 @@
} }
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.handlerParams.orderItemVOList = this.orderData.orderItemVOList this.handlerParams.orderItemVOList = this.orderData.orderItemVOList
// this.handlerParams.channelPriceList = []
// this.orderData.orderItemVOList.map(v=>{
// var listItem = {
// orderId:v.orderId,
// orderItemId:v.orderItemId,
// charging:v.charging,
// freightFee:v.oneSeaFreight,
// isPayAdvance:v.isPayAdvance,
// freightCurrencyId:v.seaFreightCurrency,
// freightUnitId:v.seaFreightVolume,
// clearanceFee:v.oneClearanceFreight,
// clearanceCurrencyId:v.seaFreightCurrency,
// clearanceUnitId:v.clearanceFreightVolume
// }
// this.handlerParams.channelPriceList.push(listItem)
// })
} }
handlerExceptionByExceptionId(this.handlerParams).then(res=>{ handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess(this.$t('提交成功')); this.$modal.msgSuccess(this.$t('提交成功'));
......
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