7983-testToMaster_2438 #718

Merged
alexm merged 353 commits from 7983-testToMaster_2438 into master 2024-09-17 05:39:39 +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>
</VnSelect>
<VnSelect
:label="t('deliveryPanel.agency')"
:label="
t(
deliveryMethodFk === 'delivery'
? 'deliveryPanel.agency'
: 'deliveryPanel.warehouse'
)
"
v-model="formData.agencyModeFk"
url="AgencyModes/isActive"
:url="
deliveryMethodFk === 'delivery'
? 'AgencyModes/isActive'
: 'Warehouses'
"
:fields="['id', 'name']"
:where="{
deliveryMethodFk: { inq: deliveryMethods },