|
@@ -55,7 +55,7 @@
|
|
|
<a-row :gutter="24">
|
|
<a-row :gutter="24">
|
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
|
<a-form-item label="所在地区">
|
|
<a-form-item label="所在地区">
|
|
|
- <span class="white">{{ getAddressInfo(selectedRow.provinceid, selectedRow.cityid, selectedRow.districtid) }}</span>
|
|
|
|
|
|
|
+ <span class="white">{{ getProvinceName(selectedRow.provinceid) + getCityName(selectedRow.cityid) + getDistrictName(selectedRow.districtid) }}</span>
|
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
</a-col>
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
<a-col :span="12">
|
|
@@ -86,12 +86,14 @@ export default defineComponent({
|
|
|
default: {},
|
|
default: {},
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
- setup() {
|
|
|
|
|
|
|
+ setup(props, context) {
|
|
|
const { visible, cancel } = closeModal('detail');
|
|
const { visible, cancel } = closeModal('detail');
|
|
|
const loading = ref<boolean>(false);
|
|
const loading = ref<boolean>(false);
|
|
|
const maskClosableFlag = ref<boolean>(false);
|
|
const maskClosableFlag = ref<boolean>(false);
|
|
|
|
|
+ const {getProvinceName, getCityName, getDistrictName} = getAddress();
|
|
|
function submit() {
|
|
function submit() {
|
|
|
cancel();
|
|
cancel();
|
|
|
|
|
+ context.emit('refresh')
|
|
|
}
|
|
}
|
|
|
return {
|
|
return {
|
|
|
visible,
|
|
visible,
|
|
@@ -102,7 +104,9 @@ export default defineComponent({
|
|
|
getWareHouseTypeName,
|
|
getWareHouseTypeName,
|
|
|
formatValue,
|
|
formatValue,
|
|
|
maskClosableFlag,
|
|
maskClosableFlag,
|
|
|
- getAddressInfo
|
|
|
|
|
|
|
+ getProvinceName,
|
|
|
|
|
+ getCityName,
|
|
|
|
|
+ getDistrictName,
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|