Merge pull request 'fix: fix sctions' (!1400) from fix-workerSections into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1400 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>
This commit is contained in:
commit
ce8126f5f2
|
@ -787,7 +787,7 @@ worker:
|
||||||
notes: Notas
|
notes: Notas
|
||||||
operator:
|
operator:
|
||||||
numberOfWagons: Número de vagones
|
numberOfWagons: Número de vagones
|
||||||
train: tren
|
train: Tren
|
||||||
itemPackingType: Tipo de embalaje
|
itemPackingType: Tipo de embalaje
|
||||||
warehouse: Almacén
|
warehouse: Almacén
|
||||||
sector: Sector
|
sector: Sector
|
||||||
|
|
|
@ -46,8 +46,18 @@ async function setAdvancedSummary(data) {
|
||||||
>
|
>
|
||||||
<template #form="{ data }">
|
<template #form="{ data }">
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput :label="t('Name')" clearable v-model="data.firstName" />
|
<VnInput
|
||||||
<VnInput :label="t('Last name')" clearable v-model="data.lastName" />
|
:label="t('Name')"
|
||||||
|
clearable
|
||||||
|
v-model="data.firstName"
|
||||||
|
:required="true"
|
||||||
|
/>
|
||||||
|
<VnInput
|
||||||
|
:label="t('Last name')"
|
||||||
|
clearable
|
||||||
|
v-model="data.lastName"
|
||||||
|
:required="true"
|
||||||
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
|
<VnInput v-model="data.phone" :label="t('Business phone')" clearable />
|
||||||
|
|
|
@ -54,9 +54,8 @@ watch(
|
||||||
selected.value = [];
|
selected.value = [];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ immediate: true, deep: true }
|
{ immediate: true, deep: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -105,6 +104,7 @@ watch(
|
||||||
:options="trainsData"
|
:options="trainsData"
|
||||||
hide-selected
|
hide-selected
|
||||||
v-model="row.trainFk"
|
v-model="row.trainFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -115,12 +115,14 @@ watch(
|
||||||
option-label="code"
|
option-label="code"
|
||||||
option-value="code"
|
option-value="code"
|
||||||
v-model="row.itemPackingTypeFk"
|
v-model="row.itemPackingTypeFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('worker.operator.warehouse')"
|
:label="t('worker.operator.warehouse')"
|
||||||
:options="warehousesData"
|
:options="warehousesData"
|
||||||
hide-selected
|
hide-selected
|
||||||
v-model="row.warehouseFk"
|
v-model="row.warehouseFk"
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
@ -175,6 +177,7 @@ watch(
|
||||||
:label="t('worker.operator.isOnReservationMode')"
|
:label="t('worker.operator.isOnReservationMode')"
|
||||||
v-model="row.isOnReservationMode"
|
v-model="row.isOnReservationMode"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
|
:required="true"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow>
|
<VnRow>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
src/pages/Worker/Card/WorkerPBX.vue
|
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
import FormModel from 'src/components/FormModel.vue';
|
import FormModel from 'src/components/FormModel.vue';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
const { t } = useI18n();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -26,3 +26,8 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
</template>
|
</template>
|
||||||
</FormModel>
|
</FormModel>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
It must be a 4-digit number and must not end in 00: Debe ser un número de 4 cifras y no terminar en 00
|
||||||
|
</i18n>
|
||||||
|
|
|
@ -140,6 +140,7 @@ function reloadData() {
|
||||||
id="deviceProductionFk"
|
id="deviceProductionFk"
|
||||||
hide-selected
|
hide-selected
|
||||||
data-cy="pda-dialog-select"
|
data-cy="pda-dialog-select"
|
||||||
|
:required="true"
|
||||||
>
|
>
|
||||||
<template #option="scope">
|
<template #option="scope">
|
||||||
<QItem v-bind="scope.itemProps">
|
<QItem v-bind="scope.itemProps">
|
||||||
|
|
Loading…
Reference in New Issue