verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 60 Releases Wiki Activity

8144-devToTest_2444 #852

Merged
carlossa merged 86 commits from 8144-devToTest_2444 into test 2024-10-22 08:55:44 +00:00
Conversation 0 Commits 86 Files Changed 52 +44 -56
4 changed files with 44 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dfceb9403c - Show all commits

12
src/i18n/locale/en.yml
View File

@ -840,6 +840,18 @@ worker:
debit: Debt
credit: Have
concept: Concept
operator:
numberOfWagons: Number of wagons
train: Train
itemPackingType: Item packing type
warehouse: Warehouse
sector: Sector
labeler: Printer
linesLimit: Lines limit
volumeLimit: Volume limit
sizeLimit: Size limit
isOnReservationMode: Reservation mode
Machine: Machine
wagon:
pageTitles:
wagons: Wagons

13
src/i18n/locale/es.yml
View File

@ -838,6 +838,19 @@ worker:
debit: Debe
credit: Haber
concept: Concepto
operator:
numberOfWagons: Número de vagones
train: tren
itemPackingType: Tipo de embalaje
warehouse: Almacén
sector: Sector
labeler: Impresora
linesLimit: Líneas límite
volumeLimit: Volumen límite
sizeLimit: Tamaño límite
isOnReservationMode: Modo de reserva
Machine: Máquina
wagon:
pageTitles:
wagons: Vagones

73
src/pages/Worker/Card/WorkerOperator.vue
View File

@ -2,26 +2,17 @@
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { ref, computed } from 'vue';
import axios from 'axios';
import useNotify from 'src/composables/useNotify.js';
import FetchData from 'components/FetchData.vue';
import FormModelPopup from 'src/components/FormModelPopup.vue';
import { useVnConfirm } from 'composables/useVnConfirm';
import VnPaginate from 'src/components/ui/VnPaginate.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnInput from 'src/components/common/VnInput.vue';
import { size } from 'cypress/types/lodash';
const { t } = useI18n();
const { notify } = useNotify();
const paginate = ref();
const dialog = ref();
const route = useRoute();
const { openConfirmationModal } = useVnConfirm();
const routeId = computed(() => route.params.id);
const initialData = computed(() => {
@ -40,52 +31,34 @@ const initialData = computed(() => {
machineFk: null,
};
});
// const deallocatePDA = async (deviceProductionFk) => {
// try {
// await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
// pda: deviceProductionFk,
// });
// notify(t('PDA deallocated'), 'positive');
// } catch (err) {
// console.error('Error deallocating PDA');
// }
// paginate.value.fetch();
// };
function reloadData() {
// initialData.value.deviceProductionFk = null;
// initialData.value.simSerialNumber = null;
paginate.value.fetch();
}
</script>
<template>
<QPage class="column items-center q-pa-md centerCard">
<FetchData
url="shelvings/trains"
url="Shelvings/Train"
@on-fetch="(data) => (trainsData = data)"
auto-load
/>
<FetchData
url="items/ItemPackingTypes"
url="Items/ItemPackingType"
@on-fetch="(data) => (ItemPackingTypesData = data)"
auto-load
/>
<FetchData
url="warehouses"
url="Warehouses"
@on-fetch="(data) => (warehousesData = data)"
auto-load
/>
<FetchData
url="shelvings/sectors"
url="Shelvings/Sector"
@on-fetch="(data) => (shelvingsData = data)"
auto-load
/>
<FetchData url="machines" @on-fetch="(data) => (machinesData = data)" auto-load />
<FetchData url="Machines" @on-fetch="(data) => (machinesData = data)" auto-load />
<VnPaginate
ref="paginate"
data-key="WorkerPda"
data-key="WorkerOperator"
url="Operators"
:filter="{ where: { workerFk: routeId } }"
order="id"
@ -102,7 +75,7 @@ function reloadData() {
<VnRow>
<VnInput
:label="t('worker.operator.numberOfWagons')"
:model-value="row?.numberOfWagons"
:model-value="data?.numberOfWagons"
disable
/>
<VnSelect
@ -143,34 +116,30 @@ function reloadData() {
/>
<VnInput
:label="t('worker.operator.labeler')"
:model-value="row?.labelerFk"
:model-value="data?.labelerFk"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.linesLimit')"
:model-value="row?.linesLimit"
:model-value="data?.linesLimit"
/>
<VnInput
:label="t('worker.operator.volumeLimit')"
:model-value="row?.volumeLimit"
:model-value="data?.volumeLimit"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.sizeLimit')"
:model-value="row?.sizeLimit"
:model-value="data?.sizeLimit"
/>
<VnInput
:label="t('worker.operator.sizeLimit')"
:model-value="row?.sizeLimit"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.isOnReservationMode')"
:model-value="row?.isOnReservationMode"
:model-value="data?.isOnReservationMode"
/>
</VnRow>
<VnRow>
<VnSelect
:label="t('worker.operator.machine')"
:options="machinesData"
@ -255,33 +224,29 @@ function reloadData() {
/>
<VnInput
:label="t('worker.operator.labeler')"
:model-value="row?.labelerFk"
:model-value="data?.labelerFk"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.linesLimit')"
:model-value="row?.linesLimit"
:model-value="data?.linesLimit"
/>
<VnInput
:label="t('worker.operator.volumeLimit')"
:model-value="row?.volumeLimit"
:model-value="data?.volumeLimit"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.sizeLimit')"
:model-value="row?.sizeLimit"
/>
<VnInput
:label="t('worker.operator.sizeLimit')"
:model-value="row?.sizeLimit"
:model-value="data?.sizeLimit"
/>
</VnRow>
<VnRow>
<VnInput
:label="t('worker.operator.isOnReservationMode')"
:model-value="row?.isOnReservationMode"
:model-value="data?.isOnReservationMode"
/>
<VnSelect
:label="t('worker.operator.machine')"

2
src/router/modules/worker.js
View File

@ -1,5 +1,3 @@
import { path } from 'chromium';
import { name } from 'quasar/dist/icon-set/material-icons.umd.prod';
import { RouterView } from 'vue-router';
export default {