Commit b7c4bdde authored by dragondean@qq.com's avatar dragondean@qq.com

改bug

parent fd79416a
<template> <template>
<div> <div>
<el-select v-model="formData.country" :disabled="readonly"> <el-select v-model="formData.country" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in treeList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in treeList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
<el-select v-model="formData.province" class="ml-10" :disabled="readonly"> <el-select v-model="formData.province" class="ml-10" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in provinceList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in provinceList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
<el-select v-model="formData.city" class="ml-10" :disabled="readonly"> <el-select v-model="formData.city" class="ml-10" :disabled="readonly" :style="{width: inputWidth}">
<el-option v-for="(item) in cityList" :key="item.id" :value="item.id" :label="$l(item, 'title')" /> <el-option v-for="(item) in cityList" :key="item.id" :value="item.id" :label="$l(item, 'title')" />
</el-select> </el-select>
</div> </div>
...@@ -19,7 +19,8 @@ export default { ...@@ -19,7 +19,8 @@ export default {
country: Number, country: Number,
city: Number, city: Number,
province: Number, province: Number,
readonly: Boolean readonly: Boolean,
inputWidth: String
}, },
data() { data() {
return { return {
...@@ -60,9 +61,12 @@ export default { ...@@ -60,9 +61,12 @@ export default {
}, },
'formData.country'(country) { 'formData.country'(country) {
this.$emit('countryChange', country) this.$emit('countryChange', country)
this.formData.province = null
this.formData.city = null
}, },
'formData.province'(province) { 'formData.province'(province) {
this.$emit('provinceChange', province) this.$emit('provinceChange', province)
this.formData.city = null
} }
}, },
created() { created() {
......
...@@ -807,6 +807,7 @@ export default { ...@@ -807,6 +807,7 @@ export default {
channel: 'channel', channel: 'channel',
channelNotice: 'Please select the shipping channel', channelNotice: 'Please select the shipping channel',
departure: '*departure', departure: '*departure',
destCountryRules: 'destination country must be chosen',
departureRules: 'The place of origin is mandatory', departureRules: 'The place of origin is mandatory',
departureNotice: 'Please select the place of departure', departureNotice: 'Please select the place of departure',
objective: '*objective', objective: '*objective',
...@@ -952,5 +953,7 @@ export default { ...@@ -952,5 +953,7 @@ export default {
'入仓箱数': 'Number of inbound boxes', '入仓箱数': 'Number of inbound boxes',
'已放箱数': 'Number of boxes placed', '已放箱数': 'Number of boxes placed',
'收货人': 'Consignee', '收货人': 'Consignee',
'收货人电话': 'Consignee telephone number' '收货人电话': 'Consignee telephone number',
'如需海外仓服务,请联系客服,服务热线:{tel}': '如需海外仓服务,请联系客服,服务热线:{tel}',
'搜索': 'Search'
} }
...@@ -824,6 +824,7 @@ export default { ...@@ -824,6 +824,7 @@ export default {
channel: '出货渠道', channel: '出货渠道',
channelNotice: '请选择出货渠道', channelNotice: '请选择出货渠道',
departure: '始发城市', departure: '始发城市',
destCountryRules: '目的国必选',
departureRules: '始发城市必选', departureRules: '始发城市必选',
departureNotice: '请选择始发地', departureNotice: '请选择始发地',
objective: '目的城市', objective: '目的城市',
...@@ -923,5 +924,6 @@ export default { ...@@ -923,5 +924,6 @@ export default {
products: '商品列表', products: '商品列表',
productCount: '总件数', productCount: '总件数',
copy: '复制订单信息' copy: '复制订单信息'
} },
'如需海外仓服务,请联系客服,服务热线:{tel}': '如需海外仓服务,请联系客服,服务热线:{tel}'
} }
This diff is collapsed.
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