forked from verdnatura/salix-front
Merge branch 'dev' into 6943_fix_customer_module
This commit is contained in:
commit
5fc306e11e
|
@ -14,11 +14,11 @@ const props = defineProps({
|
||||||
});
|
});
|
||||||
const modelValue = ref(
|
const modelValue = ref(
|
||||||
props.location
|
props.location
|
||||||
? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
|
? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
|
||||||
: null
|
: null
|
||||||
);
|
);
|
||||||
function showLabel(data) {
|
function showLabel(data) {
|
||||||
return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
|
return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
|
||||||
}
|
}
|
||||||
const handleModelValue = (data) => {
|
const handleModelValue = (data) => {
|
||||||
emit('update:model-value', data);
|
emit('update:model-value', data);
|
||||||
|
|
Loading…
Reference in New Issue