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

Merge branch 'feature/order_edit' into pre-release

parents 170a4fb9 09914fec
...@@ -522,9 +522,9 @@ ...@@ -522,9 +522,9 @@
<div class="form-section" v-if="form.harvestMethod == 2"> <div class="form-section" v-if="form.harvestMethod == 2">
<el-form-item :label="$t('收货地区')" prop="country"> <el-form-item :label="$t('收货地区')" prop="country">
<area-selector <area-selector
:country="form.consigneeVO ? form.consigneeVO.country : undefined" :country="form.country"
:province="form.consigneeVO ? form.consigneeVO.province : undefined" :province="form.province"
:city="form.consigneeVO ? form.consigneeVO.city : undefined" :city="form.city"
@countryChange="onAreaChange('country', $event)" @countryChange="onAreaChange('country', $event)"
@provinceChange="onAreaChange('province', $event)" @provinceChange="onAreaChange('province', $event)"
@cityChange="onAreaChange('city', $event)" @cityChange="onAreaChange('city', $event)"
......
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