Commit 587e0420 authored by dragondean@qq.com's avatar dragondean@qq.com

待出列表加预计费用

parent 692be8f6
...@@ -171,7 +171,19 @@ ...@@ -171,7 +171,19 @@
{{scope.row.statusMsg}} {{scope.row.statusMsg}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('预计运费/清关费')" align="center" prop="status">
<template slot-scope="{row}">
<div v-if="row.costVO">
<template v-for="item in row.costVO.feeDtoList">
<div v-if="[1,2].indexOf(item.feeType) > -1">
{{item.feeType == 1 ? $t('运费'):$t('清关费')}}
{{item.amount}}
{{currencyMap[item.currencyId]}}
</div>
</template>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="setCanShipment(scope.row)" v-hasPermi="['ecw:order:peddingList:can_shipment']">{{$t('可出')}}</el-button> <el-button type="text" @click="setCanShipment(scope.row)" v-hasPermi="['ecw:order:peddingList:can_shipment']">{{$t('可出')}}</el-button>
...@@ -237,9 +249,11 @@ import { getCurrencyPage } from "@/api/ecw/currency"; ...@@ -237,9 +249,11 @@ import { getCurrencyPage } from "@/api/ecw/currency";
import SplitRevoke from "@/views/ecw/order/components/SplitRevoke"; import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
import {getChannelList} from "@/api/ecw/channel"; import {getChannelList} from "@/api/ecw/channel";
import ImageAndVideoUpload from "@/components/ImageAndVideoUpload"; import ImageAndVideoUpload from "@/components/ImageAndVideoUpload";
import Template from "@/views/cms/template/index.vue";
export default { export default {
name: "EcwPeddingList", name: "EcwPeddingList",
components: { components: {
Template,
UserSelector, UserSelector,
FeeApplication, FeeApplication,
BatchSingleApplication, BatchSingleApplication,
...@@ -331,6 +345,13 @@ export default { ...@@ -331,6 +345,13 @@ export default {
} }
let queryParams = Object.assign({}, this.queryParams, timeParams) let queryParams = Object.assign({}, this.queryParams, timeParams)
return queryParams return queryParams
},
currencyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
} }
}, },
activated(){ activated(){
......
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