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

解决冲突

parents 418ee805 b7c4bdde
<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() {
......
This diff is collapsed.
This diff is collapsed.
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