Commit c10e759c authored by honghy's avatar honghy Committed by wux

bug178 优惠活动,线路没有显示

parent e129a085
...@@ -422,6 +422,7 @@ export default { ...@@ -422,6 +422,7 @@ export default {
}, },
}, },
async created() { async created() {
this.tradeCityList = (await getTradeCityList()).data this.tradeCityList = (await getTradeCityList()).data
// 路线需要过滤失效的进出口城市,所以在程序加载后再加载路线 // 路线需要过滤失效的进出口城市,所以在程序加载后再加载路线
await this.getOpenedRouterList() await this.getOpenedRouterList()
...@@ -434,6 +435,7 @@ export default { ...@@ -434,6 +435,7 @@ export default {
// this.getAddressCity() // this.getAddressCity()
// this.getAddressTown() // this.getAddressTown()
this.getChannelList() this.getChannelList()
if (this.value && this.value.length) { if (this.value && this.value.length) {
this.selectedRoutes = this.value this.selectedRoutes = this.value
} }
...@@ -442,9 +444,11 @@ export default { ...@@ -442,9 +444,11 @@ export default {
if (this.showAttr) { if (this.showAttr) {
this.getAttrList() this.getAttrList()
} }
await this.$nextTick() await this.$nextTick()
setTimeout(() => {
this.inited = true this.inited = true
}, 1000);
}, },
methods: { methods: {
getChannelList() { getChannelList() {
...@@ -486,6 +490,7 @@ export default { ...@@ -486,6 +490,7 @@ export default {
this.exportCity = +this.option.exportCity || null this.exportCity = +this.option.exportCity || null
this.transportType = this.option.transportId || null this.transportType = this.option.transportId || null
this.channelId = +this.option.channelId || null this.channelId = +this.option.channelId || null
this.channelIds = this.option.channelIds || []
}, },
// 全选、全不选 某个运输方式所有线路 // 全选、全不选 某个运输方式所有线路
toggleGroupChecker(index, selected) { toggleGroupChecker(index, 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" :lineIds="form.lineIds" style="margin-top:5px" /> <routers-selector v-if="showRouterSelector" v-model="form.lineIds" :lineIds="form.lineIds" style="margin-top:5px" :option="option" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="$t('适用商品')" :label="$t('适用商品')"
...@@ -277,6 +277,7 @@ import Selector from '@/components/Selector/index' ...@@ -277,6 +277,7 @@ import Selector from '@/components/Selector/index'
import {parseTime} from '@/utils/ruoyi' import {parseTime} from '@/utils/ruoyi'
import {str2arr} from '@/utils/index' import {str2arr} from '@/utils/index'
import item from '@/layout/components/Sidebar/Item.vue' import item from '@/layout/components/Sidebar/Item.vue'
import { getChannelList } from "@/api/ecw/channel"
export default { export default {
...@@ -322,6 +323,7 @@ export default { ...@@ -322,6 +323,7 @@ export default {
errTips: {}, // 跟fee对应的错误提示 errTips: {}, // 跟fee对应的错误提示
isAllProduct: false, // 是否全部商品 isAllProduct: false, // 是否全部商品
initing: false, // 初始化中,编辑或者查看的时候,初始化中修改type不改默认值 initing: false, // 初始化中,编辑或者查看的时候,初始化中修改type不改默认值
option: {channelIds: null, transportId: 1}
}; };
}, },
computed:{ computed:{
...@@ -470,6 +472,14 @@ export default { ...@@ -470,6 +472,14 @@ export default {
}) })
} }
console.log('lineIds', this.form.lineIds) console.log('lineIds', this.form.lineIds)
if (this.form.lineIds!=null) {
if(this.form.lineIds[0].channelId==0) {
this.option.transportId = 1
} else {
this.option.transportId = 3
}
}
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)
...@@ -520,6 +530,13 @@ export default { ...@@ -520,6 +530,13 @@ export default {
} }
} }
this.reset() this.reset()
getChannelList().then(res => {
var list = []
for(var i in res.data) {
list.push(res.data[i].channelId)
}
this.option.channelIds = list
})
}, },
methods: { methods: {
// 满减清关费修改满的货币后需要同步减的货币 // 满减清关费修改满的货币后需要同步减的货币
......
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