diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index d26ee26a3..be8a13267 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -94,6 +94,7 @@ export default { }, created: 'Created', worker: 'Worker', + name: 'Name', }, errors: { statusUnauthorized: 'Access denied', @@ -1034,11 +1035,6 @@ export default { }, }, }, - agency: { - pageTitles: { - agency: 'Agency', - }, - }, supplier: { pageTitles: { suppliers: 'Suppliers', @@ -1291,4 +1287,12 @@ export default { }, iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789', }, + agency: { + pageTitles: { + agency: 'Agency', + modes: 'Modes', + }, + isOwn: 'Is own', + isAnyVolumeAllowed: 'Any volume allowed', + }, }; diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 0d31c375f..88e000635 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -94,6 +94,7 @@ export default { }, created: 'Fecha creación', worker: 'Trabajador', + name: 'Nombre', }, errors: { statusUnauthorized: 'Acceso denegado', @@ -1284,4 +1285,12 @@ export default { }, iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789', }, + agency: { + pageTitles: { + agency: 'Agencia', + modes: 'Modos', + }, + isOwn: 'Propia', + isAnyVolumeAllowed: 'Volumen libre', + }, }; diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue index 6f8185864..930cae563 100644 --- a/src/pages/Agency/AgencyList.vue +++ b/src/pages/Agency/AgencyList.vue @@ -5,10 +5,8 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import { useStateStore } from 'stores/useStateStore'; import { useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; -import { useSummaryDialog } from 'src/composables/useSummaryDialog'; const { t } = useI18n(); -const { viewSummary } = useSummaryDialog(); const router = useRouter(); const stateStore = useStateStore(); function navigate(id) { @@ -68,12 +66,6 @@ function exprBuilder(param, value) { @click.stop="navigate(row.id)" outline /> - diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue index f54f7037d..00595ce1f 100644 --- a/src/pages/Agency/Card/AgencyBasicData.vue +++ b/src/pages/Agency/Card/AgencyBasicData.vue @@ -2,23 +2,18 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; -import VnRow from 'components/ui/VnRow.vue'; + +import FormModel from 'components/FormModel.vue'; import FetchData from 'src/components/FetchData.vue'; +import VnRow from 'components/ui/VnRow.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnInput from 'src/components/common/VnInput.vue'; -import FormModel from 'components/FormModel.vue'; import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; const { t } = useI18n(); const route = useRoute(); -const id = route.params?.id || null; +const routeId = route.params?.id || null; const warehouses = ref([]); -const sectorFilter = { fields: ['id', 'description'] }; - -const filter = { - fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'], - include: [{ relation: 'sector', scope: sectorFilter }], -}; - + @@ -38,7 +33,7 @@ const filter = { v-model="data.sectorFk" option-value="id" option-label="name" - :label="t('parking.sector')" + :label="t('globals.warehouse')" :options="warehouses" use-input input-debounce="0" @@ -46,11 +41,11 @@ const filter = { /> - + diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue index 628acf2f2..db2e6381c 100644 --- a/src/pages/Agency/Card/AgencyCard.vue +++ b/src/pages/Agency/Card/AgencyCard.vue @@ -12,11 +12,6 @@ const { t } = useI18n(); const route = useRoute(); const stateStore = useStateStore(); -const filter = { - fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'], - include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }], -}; - const arrayData = useArrayData('Agency', { url: `Agencies/${route.params.id}`, }); diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue index 573205f8b..311f5d3a5 100644 --- a/src/pages/Agency/Card/AgencyDescriptor.vue +++ b/src/pages/Agency/Card/AgencyDescriptor.vue @@ -19,10 +19,7 @@ const { params } = useRoute(); const entityId = computed(() => props.id || params.id); const { store } = useArrayData('Parking'); const card = computed(() => store.data); -const filter = { - fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'], - include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }], -}; +console.log('card: ', card); diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue new file mode 100644 index 000000000..2c0c9d47b --- /dev/null +++ b/src/pages/Agency/Card/AgencyModes.vue @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('New mode') }} + + + + + + es: + isOwn: Tiene propietario + isAnyVolumeAllowed: Permite cualquier volumen + Search agency: Buscar agencia + You can search by name: Puedes buscar por nombre + en: + isOwn: Has owner + isAnyVolumeAllowed: Allows any volume + diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue index 96652fe29..4c9e7052f 100644 --- a/src/pages/Agency/Card/AgencySummary.vue +++ b/src/pages/Agency/Card/AgencySummary.vue @@ -2,8 +2,12 @@ import { computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; + +import FetchData from 'src/components/FetchData.vue'; import CardSummary from 'components/ui/CardSummary.vue'; import VnLv from 'components/ui/VnLv.vue'; +import VnTitle from 'src/components/common/VnTitle.vue'; +import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; const $props = defineProps({ id: { @@ -28,15 +32,17 @@ const filter = { - - {{ t('globals.pageTitles.basicData') }} - - + + + diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue new file mode 100644 index 000000000..cacd4b8f2 --- /dev/null +++ b/src/pages/Agency/Card/AgencyWorkcenter.vue @@ -0,0 +1,113 @@ + + + + (warehouses = data)" + auto-load + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('globals.new') }} + + + + + + es: + isOwn: Tiene propietario + isAnyVolumeAllowed: Permite cualquier volumen + Search agency: Buscar agencia + You can search by name: Puedes buscar por nombre + en: + isOwn: Has owner + isAnyVolumeAllowed: Allows any volume + diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js index 42b139b95..6f281e21d 100644 --- a/src/router/modules/agency.js +++ b/src/router/modules/agency.js @@ -12,7 +12,7 @@ export default { redirect: { name: 'AgencyCard' }, menus: { main: [], - card: ['AgencyBasicData', 'AgencyLog'], + card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'], }, children: [ { @@ -39,6 +39,40 @@ export default { }, component: () => import('pages/Agency/Card/AgencyBasicData.vue'), }, + { + path: 'workCenter', + name: 'AgencyWorkCenterCard', + redirect: { name: 'AgencyWorkCenters' }, + children: [ + { + path: '', + name: 'AgencyWorkCenters', + meta: { + icon: 'apartment', + title: 'workCenters', + }, + component: () => + import('src/pages/Agency/Card/AgencyWorkcenter.vue'), + }, + ], + }, + { + path: 'modes', + name: 'AgencyModesCard', + redirect: { name: 'AgencyModes' }, + children: [ + { + path: '', + name: 'AgencyModes', + meta: { + icon: 'format_list_bulleted', + title: 'modes', + }, + component: () => + import('src/pages/Agency/Card/AgencyModes.vue'), + }, + ], + }, { name: 'AgencyLog', path: 'log', diff --git a/src/router/modules/route.js b/src/router/modules/route.js index cfa8c9c35..e29e3a86b 100644 --- a/src/router/modules/route.js +++ b/src/router/modules/route.js @@ -76,7 +76,7 @@ export default { }, { path: '/agency', - redirect: { name: 'agencyList' }, + redirect: { name: 'AgencyList' }, children: [ { path: 'list',