Commit 7bb311f1 authored by dragondean@qq.com's avatar dragondean@qq.com

修复优惠路线回显异常

parent 1fa8a603
...@@ -91,6 +91,7 @@ export default { ...@@ -91,6 +91,7 @@ export default {
hideMap: {}, // 折叠状态 hideMap: {}, // 折叠状态
checkAll: null, checkAll: null,
groupChecker: {}, // 分组全选状态 groupChecker: {}, // 分组全选状态
inited: false
} }
}, },
...@@ -189,31 +190,25 @@ export default { ...@@ -189,31 +190,25 @@ export default {
if(option){ if(option){
this.changeOption() this.changeOption()
} }
}, },
// 显示的路线发生变化之后,清空已勾选的路线 // 显示的路线发生变化之后,清空已勾选的路线
filteredRouterList(){ filteredRouterList(){
this.selectedRoutes = [] if(this.inited)this.selectedRoutes = []
} }
}, },
created(){ async created(){
getChannelList().then(res => { this.channelList = (await getChannelList()).data
this.channelList = res.data this.tradeCityList = (await getTradeCityList()).data
})
getTradeCityList().then(res => {
this.tradeCityList = res.data
// 路线需要过滤失效的进出口城市,所以在程序加载后再加载路线 // 路线需要过滤失效的进出口城市,所以在程序加载后再加载路线
this.getOpenedRouterList() await this.getOpenedRouterList()
})
if(this.value && this.value.length){
this.selectedRoutes = this.value
}
if(this.option){ if(this.option){
this.changeOption() this.changeOption()
} }
await this.$nextTick()
if(this.value && this.value.length){
this.selectedRoutes = this.value
}
}, },
methods:{ methods:{
changeOption(){ changeOption(){
...@@ -231,7 +226,7 @@ export default { ...@@ -231,7 +226,7 @@ export default {
this.toggleChecker(router, selected) this.toggleChecker(router, selected)
}) })
}, },
getOpenedRouterList(){ async getOpenedRouterList(){
let params = {} let params = {}
if(this.exportCity){ if(this.exportCity){
params.startCityId = this.exportCity params.startCityId = this.exportCity
...@@ -239,9 +234,10 @@ export default { ...@@ -239,9 +234,10 @@ export default {
if(this.importCity){ if(this.importCity){
params.destCityId = this.importCity params.destCityId = this.importCity
} }
openedRouterList(params).then(res => this.openedRouterList = res.data.filter(item => { const res = await openedRouterList(params)
this.openedRouterList = res.data.filter(item => {
return this.exportCityIds.indexOf(item.startCityId) > -1 && this.importCityIds.indexOf(item.destCityId) > -1 return this.exportCityIds.indexOf(item.startCityId) > -1 && this.importCityIds.indexOf(item.destCityId) > -1
})) })
}, },
// 切换路线选择 // 切换路线选择
toggleChecker(router, selected){ toggleChecker(router, selected){
......
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
> >
<!---第一个不是全部,所以不能使用defaultable--> <!---第一个不是全部,所以不能使用defaultable-->
<dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" defaultable /> <dict-selector :type="DICT_TYPE.ECW_SUITABLE_LINE_TYPE" v-model="form.suitableLineType" formatter="number" defaultable />
<routers-selector v-if="showRouterSelector" v-model="form.lineIds" style="margin-top:5px" /> <routers-selector v-if="showRouterSelector" v-model="form.lineIds" :lineIds="form.lineIds" style="margin-top:5px" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('适用商品')" :label="$t('适用商品')"
...@@ -445,6 +445,7 @@ export default { ...@@ -445,6 +445,7 @@ export default {
if (this.$route.query.id) { if (this.$route.query.id) {
this.initing = true this.initing = true
getCoupon(this.$route.query.id).then((res) => { getCoupon(this.$route.query.id).then((res) => {
this.form = res.data; this.form = res.data;
['orderAttr', 'isCargoControl', 'brand', 'documentDeclaration'].forEach(field => { ['orderAttr', 'isCargoControl', 'brand', 'documentDeclaration'].forEach(field => {
this.$set(this.form, field + 'Arr', str2arr(res.data[field])) this.$set(this.form, field + 'Arr', str2arr(res.data[field]))
...@@ -461,7 +462,7 @@ export default { ...@@ -461,7 +462,7 @@ export default {
this.couponIds = couponIds.map(item => parseInt(item)) this.couponIds = couponIds.map(item => parseInt(item))
}) })
} }
console.log('lineIds', this.form.lineIds)
if(this.form.discountDetailedVOs){ if(this.form.discountDetailedVOs){
/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */ /* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */
// this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type == this.form.costType) // this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type == this.form.costType)
...@@ -477,7 +478,6 @@ export default { ...@@ -477,7 +478,6 @@ export default {
this.fee[item.type].push({...item}) this.fee[item.type].push({...item})
}) })
console.log(JSON.stringify(this.fee, null, 4))
/* if(this.costType != this.form.costType){ /* if(this.costType != this.form.costType){
console.error(`费用类型冲突,计算出来的类型为${this.costType},接口费用类型为${res.data.costType},类型为${res.data.type}`) console.error(`费用类型冲突,计算出来的类型为${this.costType},接口费用类型为${res.data.costType},类型为${res.data.type}`)
this.$alert(this.$t('费用类型冲突')) this.$alert(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