Commit f41e2ad9 authored by Marcus's avatar Marcus

特价列表和详情字段翻译

parent 8a19e1b8
...@@ -19,12 +19,15 @@ ...@@ -19,12 +19,15 @@
<el-table-column <el-table-column
prop="prodAttrIds" prop="prodAttrIds"
label="填单货物属性"> label="填单货物属性">
<template v-slot="{row}">
{{ getProductNamesByIds(row.prodAttrIds) }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
label="入库货物属性"> label="入库货物属性">
<template v-slot="{row}"> <template v-slot="{row}">
品牌: <br> 品牌:{{ row.brand ? '' : '' }}<br>
箱数:{{ row.num }}<br> 箱数:{{ row.num }}<br>
体积:{{ row.volume }}<br> 体积:{{ row.volume }}<br>
重量:{{ row.weight }}Kg 重量:{{ row.weight }}Kg
...@@ -33,6 +36,7 @@ ...@@ -33,6 +36,7 @@
<el-table-column <el-table-column
prop="address" prop="address"
label="最后操作时间"> label="最后操作时间">
<!-- todo -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="原价"> label="原价">
...@@ -61,7 +65,8 @@ ...@@ -61,7 +65,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="status"
:formatter="(v) => ['取消报价', '特价审批中', '需求确认(草稿)', '跟进中', '赢单', '输单', '报价完成', '审批通过', '审批拒绝'][v.status]"
label="审核状态"> label="审核状态">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -90,6 +95,7 @@ import {DICT_TYPE, getDictDataLabel} from '@/utils/dict' ...@@ -90,6 +95,7 @@ import {DICT_TYPE, getDictDataLabel} from '@/utils/dict'
import {getOffer} from '@/api/ecw/offer' import {getOffer} from '@/api/ecw/offer'
import {getUnitList} from "@/api/ecw/unit" import {getUnitList} from "@/api/ecw/unit"
import {getCurrencyList} from "@/api/ecw/currency" import {getCurrencyList} from "@/api/ecw/currency"
import {getProductAttrList} from "@/api/ecw/productAttr"
export default { export default {
name: "OfferSpecial", name: "OfferSpecial",
components: { components: {
...@@ -119,6 +125,7 @@ export default { ...@@ -119,6 +125,7 @@ export default {
}, },
unitList:[], unitList:[],
currencyList:[], currencyList:[],
productAttrList:[],
}; };
}, },
created() { created() {
...@@ -128,6 +135,7 @@ export default { ...@@ -128,6 +135,7 @@ export default {
} }
getUnitList().then(res => this.unitList = res.data) getUnitList().then(res => this.unitList = res.data)
getCurrencyList().then(res => this.currencyList = res.data) getCurrencyList().then(res => this.currencyList = res.data)
getProductAttrList().then(res => this.productAttrList = res.data)
}, },
methods: { methods: {
getOffer(){ getOffer(){
...@@ -136,6 +144,17 @@ export default { ...@@ -136,6 +144,17 @@ export default {
this.loading = false this.loading = false
this.offer = response.data this.offer = response.data
}) })
},
getProductNamesByIds(ids){
const result = []
ids.split(',').forEach(e => {
this.productAttrList.forEach(f => {
if (parseInt(e) === f.id) {
result.push(f.attrName)
}
})
})
return result.join(',')
} }
}, },
computed: { computed: {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-input v-model="form.prodTitleEn" readonly></el-input> <el-input v-model="form.prodTitleEn" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label="选择线路"> <el-form-item label="选择线路">
{{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}【xxxx】从【${form.departureName}】发往【${form.objectiveName}】`}} {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}${ getChannelNameById(form.channelId) }从【${form.departureName}】发往【${form.objectiveName}】`}}
</el-form-item> </el-form-item>
<el-form-item label="是否预付"> <el-form-item label="是否预付">
<el-radio-group v-model="form.isPayAdvance" disabled> <el-radio-group v-model="form.isPayAdvance" disabled>
...@@ -114,6 +114,7 @@ import {createOfferSpecial, getOfferSpecial, getOfferSpecialByApproveId} from "@ ...@@ -114,6 +114,7 @@ import {createOfferSpecial, getOfferSpecial, getOfferSpecialByApproveId} from "@
import {DICT_TYPE, getDictDataLabel} from "@/utils/dict" import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
import DictSelector from "@/components/DictSelector" import DictSelector from "@/components/DictSelector"
import {getUnitList} from "@/api/ecw/unit" import {getUnitList} from "@/api/ecw/unit"
import {getChannelList} from "@/api/ecw/channel"
export default { export default {
name: "specialDiscount", name: "specialDiscount",
...@@ -146,6 +147,7 @@ export default { ...@@ -146,6 +147,7 @@ export default {
this.getOfferSpecialByApproveId() this.getOfferSpecialByApproveId()
getUnitList().then(res => this.unitList = res.data) getUnitList().then(res => this.unitList = res.data)
getChannelList().then(res => this.channelList = res.data)
}, },
data() { data() {
...@@ -153,6 +155,7 @@ export default { ...@@ -153,6 +155,7 @@ export default {
getDictDataLabel, getDictDataLabel,
DICT_TYPE, DICT_TYPE,
unitList:[], unitList:[],
channelList:[],
form: { form: {
"applyResult": "", "applyResult": "",
"applyStatus": 0, "applyStatus": 0,
...@@ -220,6 +223,15 @@ export default { ...@@ -220,6 +223,15 @@ export default {
this.form = r.data this.form = r.data
}) })
} }
},
computed: {
// 根据渠道id显示渠道名
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '' + s + '' : ''
}
},
} }
} }
</script> </script>
......
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