#7354 end Zone migration #539

Merged
jon merged 58 commits from 7354_ZoneMigration_End into dev 2024-09-03 04:48:18 +00:00
1 changed files with 12 additions and 2 deletions
Showing only changes of commit 0b135bbd52 - Show all commits

View File

@ -113,9 +113,19 @@ onMounted(async () => {
</template> </template>
</VnSelect> </VnSelect>
<VnSelect <VnSelect
:label="t('deliveryPanel.agency')" :label="
t(
deliveryMethodFk === 'delivery'
? 'deliveryPanel.agency'
: 'deliveryPanel.warehouse'
)
"
v-model="formData.agencyModeFk" v-model="formData.agencyModeFk"
url="AgencyModes/isActive" :url="
deliveryMethodFk === 'delivery'
? 'AgencyModes/isActive'
: 'Warehouses'
"
:fields="['id', 'name']" :fields="['id', 'name']"
:where="{ :where="{
deliveryMethodFk: { inq: deliveryMethods }, deliveryMethodFk: { inq: deliveryMethods },