#8448 - devToTest #1254

Merged
alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00
4 changed files with 22 additions and 55 deletions
Showing only changes of commit 5bd72c830d - Show all commits

View File

@ -198,6 +198,7 @@ async function fetch() {
} catch (e) { } catch (e) {
state.set(modelValue, {}); state.set(modelValue, {});
originalData.value = {}; originalData.value = {};
throw e;
} }
} }

View File

@ -44,7 +44,10 @@ InvoiceIn:
country: Country country: Country
params: params:
search: Id or supplier name search: Id or supplier name
account: Ledger account
correctingFk: Rectificative
correctedFk: Corrected correctedFk: Corrected
isBooked: Is booked isBooked: Is booked
invoicein:
params:
account: Ledger account
correctingFk: Rectificative

View File

@ -42,6 +42,9 @@ InvoiceIn:
country: País country: País
params: params:
search: Id o nombre proveedor search: Id o nombre proveedor
correctedFk: Rectificada
invoicein:
params:
account: Cuenta contable account: Cuenta contable
correctingFk: Rectificativa correctingFk: Rectificativa
correctedFk: Rectificada

View File

@ -1,68 +1,28 @@
src/pages/Worker/Card/WorkerPBX.vue
<script setup> <script setup>
import { watch, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { useState } from 'src/composables/useState';
import FormModel from 'src/components/FormModel.vue'; import FormModel from 'src/components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n();
const state = useState();
const route = useRoute();
const workerPBXForm = ref();
const extension = ref(null);
const filter = {
include: [
{
relation: 'sip',
},
],
};
watch(
() => route.params.id,
() => state.set('extension', null)
);
const onFetch = (data) => {
state.set('extension', data?.sip?.extension);
extension.value = state.get('extension');
};
const updateModelValue = (data) => {
state.set('extension', data);
workerPBXForm.value.hasChanges = true;
};
</script> </script>
<template> <template>
<FormModel <FormModel
ref="workerPBXForm" model="WorkerPbx"
:filter="filter" :url="`Workers/${$route.params.id}/sip`"
:url="`Workers/${route.params.id}`"
url-update="Sips" url-update="Sips"
auto-load
:mapper=" :mapper="
() => ({ ({ userFk, extension }) => ({
userFk: +route.params.id, userFk,
extension, extension,
}) })
" "
model="DeviceProductionUser" auto-load
@on-fetch="onFetch"
> >
<template #form="{}"> <template #form="{ data }">
<VnRow> <VnInput
<VnInput :label="$t('worker.summary.sipExtension')"
:label="t('worker.summary.sipExtension')" v-model="data.extension"
v-model="extension" />
@update:model-value="updateModelValue"
/>
</VnRow>
</template> </template>
</FormModel> </FormModel>
</template> </template>