#7897 - masterTest_24_36 #669

Merged
jsegarra merged 115 commits from 7897_masterTest_24_36 into master 2024-09-03 06:37:49 +00:00
4 changed files with 14 additions and 6 deletions
Showing only changes of commit 37244cdbc7 - Show all commits

View File

@ -93,6 +93,7 @@ globals:
since: Since
from: From
to: To
notes: Notes
pageTitles:
logIn: Login
summary: Summary

View File

@ -93,6 +93,7 @@ globals:
since: Desde
from: Desde
to: Hasta
notes: Notas
pageTitles:
logIn: Inicio de sesión
summary: Resumen

View File

@ -7,6 +7,7 @@ import { useState } from 'composables/useState';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'components/common/VnSelect.vue';
import VnInput from 'components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@ -117,7 +118,6 @@ const onClientChange = async (clientId) => {
:url="`Orders/${route.params.id}`"
:url-update="`Orders/${route.params.id}/updateBasicData`"
:model="ORDER_MODEL"
:mapper="orderMapper"
:filter="orderFilter"
@on-fetch="fetchOrderDetails"
auto-load
@ -178,8 +178,6 @@ const onClientChange = async (clientId) => {
() => fetchAgencyList(data.landed, data.addressFk)
"
/>
</VnRow>
<VnRow>
<VnSelect
:label="t('order.form.agencyModeFk')"
v-model="data.agencyModeFk"
@ -200,8 +198,16 @@ const onClientChange = async (clientId) => {
? data.agencyModeFk
: null
"
>
</VnSelect>
/>
</VnRow>
<VnRow>
<VnInput
:label="t('globals.notes')"
type="textarea"
v-model="data.note"
fill-input
autogrow
/>
</VnRow>
</template>
</FormModel>

View File

@ -63,7 +63,7 @@ export default {
title: 'basicData',
icon: 'vn:settings',
},
component: () => import('src/pages/Order/Card/OrderForm.vue'),
component: () => import('src/pages/Order/Card/OrderBasicData.vue'),
},
{
name: 'OrderCatalog',