From f404243d63be8fdc5d34efa4c27f0ce827bf5fd2 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 3 Apr 2024 08:38:26 +0200 Subject: [PATCH 001/129] feat(route): refs # agency add agencyList --- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + src/pages/Route/Agency/AgencyList.vue | 39 +++++++++++++++++++++++++++ src/router/modules/route.js | 11 +++++++- 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 src/pages/Route/Agency/AgencyList.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 9e0ad7c9b..a91f9586b 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -937,6 +937,7 @@ export default { pageTitles: { routes: 'Routes', cmrsList: 'External CMRs list', + agencyList: 'Agency', RouteList: 'List', create: 'Create', basicData: 'Basic Data', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 6083dfad7..3b664a8e4 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -937,6 +937,7 @@ export default { pageTitles: { routes: 'Rutas', cmrsList: 'Listado de CMRs externos', + agency: 'Agency', RouteList: 'Listado', create: 'Crear', basicData: 'Datos básicos', diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue new file mode 100644 index 000000000..ca5197986 --- /dev/null +++ b/src/pages/Route/Agency/AgencyList.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/router/modules/route.js b/src/router/modules/route.js index 614345913..4031e74bf 100644 --- a/src/router/modules/route.js +++ b/src/router/modules/route.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'RouteMain' }, menus: { - main: ['RouteList', 'CmrList'], + main: ['RouteList', 'CmrList', 'agencyList'], card: ['RouteBasicData'], }, children: [ @@ -29,6 +29,15 @@ export default { }, component: () => import('src/pages/Route/Cmr/CmrList.vue'), }, + { + path: 'agency', + name: 'agencyList', + meta: { + title: 'agencyList', + icon: 'package', + }, + component: () => import('src/pages/Route/Agency/AgencyList.vue'), + }, { path: 'list', name: 'RouteList', From cd49ebe7a66790e039baaa4b9280d0aa3f9b6d3f Mon Sep 17 00:00:00 2001 From: jcasado Date: Wed, 3 Apr 2024 12:54:14 +0200 Subject: [PATCH 002/129] refs #6697 fix claimQuantity --- src/pages/Claim/Card/ClaimLines.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue index 70c257c69..4a1d9c9d0 100644 --- a/src/pages/Claim/Card/ClaimLines.vue +++ b/src/pages/Claim/Card/ClaimLines.vue @@ -20,7 +20,7 @@ const { t } = useI18n(); const stateStore = useStateStore(); const arrayData = useArrayData('ClaimLines'); const store = arrayData.store; - +let claimedDefault = 0; const claimFilter = { fields: ['ticketFk'], }; @@ -79,6 +79,7 @@ const columns = computed(() => [ label: t('Claimed'), field: (row) => row.quantity, sortable: true, + default: 0, }, { name: 'description', From fb6a2c809789eb74f23bdb2f62d0d90be6bc1753 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 3 Apr 2024 14:59:51 +0200 Subject: [PATCH 003/129] feat: refs #4988 add agencyList and searchBar --- src/i18n/en/index.js | 1 + src/i18n/es/index.js | 3 +- src/pages/Agency/AgencyList.vue | 92 +++++++++++++++++++++++++++ src/pages/Agency/Card/AgencyCard.vue | 39 ++++++++++++ src/pages/Route/Agency/AgencyList.vue | 39 ------------ src/router/modules/agency.js | 54 ++++++++++++++++ src/router/modules/route.js | 26 +++++--- 7 files changed, 204 insertions(+), 50 deletions(-) create mode 100644 src/pages/Agency/AgencyList.vue create mode 100644 src/pages/Agency/Card/AgencyCard.vue delete mode 100644 src/pages/Route/Agency/AgencyList.vue create mode 100644 src/router/modules/agency.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 054668042..9d0488cab 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -91,6 +91,7 @@ export default { basicData: 'Basic data', log: 'Logs', parkingList: 'Parkings list', + agencyList: 'Agencies list', }, }, errors: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 099f97938..478c93467 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -91,6 +91,7 @@ export default { basicData: 'Datos básicos', log: 'Historial', parkingList: 'Listado de parkings', + agencyList: 'Listado de agencias', }, }, errors: { @@ -992,7 +993,7 @@ export default { routes: 'Rutas', cmrsList: 'Listado de CMRs externos', agency: 'Agency', - RouteList: 'Listado', + RouteList: 'Listado de rutas', create: 'Crear', basicData: 'Datos básicos', summary: 'Resumen', diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue new file mode 100644 index 000000000..2746f8529 --- /dev/null +++ b/src/pages/Agency/AgencyList.vue @@ -0,0 +1,92 @@ + + + + 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/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue new file mode 100644 index 000000000..1c7e3cc10 --- /dev/null +++ b/src/pages/Agency/Card/AgencyCard.vue @@ -0,0 +1,39 @@ + + diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue deleted file mode 100644 index ca5197986..000000000 --- a/src/pages/Route/Agency/AgencyList.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js new file mode 100644 index 000000000..42b139b95 --- /dev/null +++ b/src/router/modules/agency.js @@ -0,0 +1,54 @@ +import { RouterView } from 'vue-router'; + +export default { + path: '/agency', + name: 'Agency', + meta: { + title: 'agency', + icon: 'garage_home', + moduleName: 'Agency', + }, + component: RouterView, + redirect: { name: 'AgencyCard' }, + menus: { + main: [], + card: ['AgencyBasicData', 'AgencyLog'], + }, + children: [ + { + path: '/agency/:id', + name: 'AgencyCard', + component: () => import('src/pages/Agency/Card/AgencyCard.vue'), + redirect: { name: 'AgencySummary' }, + children: [ + { + name: 'AgencySummary', + path: 'summary', + meta: { + title: 'summary', + icon: 'view_list', + }, + component: () => import('src/pages/Agency/Card/AgencySummary.vue'), + }, + { + name: 'AgencyBasicData', + path: 'basic-data', + meta: { + title: 'basicData', + icon: 'vn:settings', + }, + component: () => import('pages/Agency/Card/AgencyBasicData.vue'), + }, + { + name: 'AgencyLog', + path: 'log', + meta: { + title: 'log', + icon: 'history', + }, + component: () => import('src/pages/Agency/Card/AgencyLog.vue'), + }, + ], + }, + ], +}; diff --git a/src/router/modules/route.js b/src/router/modules/route.js index 1e392fa0f..cfa8c9c35 100644 --- a/src/router/modules/route.js +++ b/src/router/modules/route.js @@ -11,7 +11,7 @@ export default { component: RouterView, redirect: { name: 'RouteMain' }, menus: { - main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'agencyList'], + main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'], card: ['RouteBasicData', 'RouteTickets', 'RouteLog'], }, children: [ @@ -21,15 +21,6 @@ export default { component: () => import('src/pages/Route/RouteMain.vue'), redirect: { name: 'RouteList' }, children: [ - { - path: 'agency', - name: 'agencyList', - meta: { - title: 'agencyList', - icon: 'package', - }, - component: () => import('src/pages/Route/Agency/AgencyList.vue'), - }, { path: 'list', name: 'RouteList', @@ -83,6 +74,21 @@ export default { }, component: () => import('src/pages/Route/Cmr/CmrList.vue'), }, + { + path: '/agency', + redirect: { name: 'agencyList' }, + children: [ + { + path: 'list', + name: 'AgencyList', + meta: { + title: 'agencyList', + icon: 'view_list', + }, + component: () => import('src/pages/Agency/AgencyList.vue'), + }, + ], + }, ], }, { From f60670cb87958d2c9012ad156a8ae40e45eb526a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 8 Apr 2024 10:49:53 +0200 Subject: [PATCH 004/129] refs #7172 change vnselectfilter --- src/pages/Claim/Card/ClaimBasicData.vue | 36 ++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index c7c5ab8a2..aad003031 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -2,7 +2,7 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; - +import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; import VnRow from 'components/ui/VnRow.vue'; @@ -40,11 +40,7 @@ const workers = ref([]); const workersCopy = ref([]); const claimStates = ref([]); const claimStatesCopy = ref([]); - -function setWorkers(data) { - workers.value = data; - workersCopy.value = data; -} +const workersOptions = ref([]); function setClaimStates(data) { claimStates.value = data; @@ -89,8 +85,9 @@ const statesFilter = {
- - + --> + + +
Date: Wed, 10 Apr 2024 14:16:20 +0200 Subject: [PATCH 005/129] refs #7172 fix vnSelectFilter --- src/pages/Claim/Card/ClaimBasicData.vue | 47 +------------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index aad003031..26175dab9 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -36,8 +36,6 @@ const claimFilter = { ], }; -const workers = ref([]); -const workersCopy = ref([]); const claimStates = ref([]); const claimStatesCopy = ref([]); const workersOptions = ref([]); @@ -47,25 +45,6 @@ function setClaimStates(data) { claimStatesCopy.value = data; } -const workerFilter = { - options: workers, - filterFn: (options, value) => { - const search = value.toLowerCase(); - - if (value === '') return workersCopy.value; - - return options.value.filter((row) => { - const id = row.id; - const name = row.name.toLowerCase(); - - const idMatches = id == search; - const nameMatches = name.indexOf(search) > -1; - - return idMatches || nameMatches; - }); - }, -}; - const statesFilter = { options: claimStates, filterFn: (options, value) => { @@ -87,7 +66,6 @@ const statesFilter = { :filter="{ where: { role: 'salesPerson' } }" @on-fetch="(data) => (workersOptions = data)" auto-load - limit="30" />
- + + + + diff --git a/src/router/modules/item.js b/src/router/modules/item.js index d16022f79..daade4508 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -10,7 +10,7 @@ export default { component: RouterView, redirect: { name: 'ItemMain' }, menus: { - main: ['ItemList'], + main: ['ItemList', 'ItemRequest'], card: [], }, children: [ @@ -37,6 +37,15 @@ export default { }, component: () => import('src/pages/Item/ItemCreate.vue'), }, + { + path: 'request', + name: 'ItemRequest', + meta: { + title: 'buyRequest', + icon: 'vn:buyrequest', + }, + component: () => import('src/pages/Item/ItemRequest.vue'), + }, ], }, { From b5aae63e15ac0b59b4e333e86ac30095b2de227f Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 12 Apr 2024 08:47:25 +0200 Subject: [PATCH 009/129] refs #6976 supplier onUnmounted --- src/pages/Supplier/Card/SupplierConsumption.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue index 33d235a5f..18d163d52 100644 --- a/src/pages/Supplier/Card/SupplierConsumption.vue +++ b/src/pages/Supplier/Card/SupplierConsumption.vue @@ -15,8 +15,11 @@ import { usePrintService } from 'composables/usePrintService'; import useNotify from 'src/composables/useNotify.js'; import axios from 'axios'; import { useStateStore } from 'stores/useStateStore'; +import { useState } from 'src/composables/useState'; import { useArrayData } from 'composables/useArrayData'; +import { onUnmounted } from 'vue'; +const state = useState(); const stateStore = useStateStore(); const { t } = useI18n(); const route = useRoute(); @@ -32,6 +35,7 @@ const arrayData = useArrayData('SupplierConsumption', { const store = arrayData.store; +onUnmounted(() => state.unset('SupplierConsumption')); const dateRanges = computed(() => { const ranges = { from: null, @@ -112,6 +116,8 @@ onMounted(async () => { stateStore.rightDrawer = true; await getSupplierConsumptionData(); }); + +console.log('dateRange From', dateRanges.value.from); + + + + + + - +es: + Discard: Descartar diff --git a/src/pages/Item/ItemRequestDenyForm.vue b/src/pages/Item/ItemRequestDenyForm.vue new file mode 100644 index 000000000..f26edb845 --- /dev/null +++ b/src/pages/Item/ItemRequestDenyForm.vue @@ -0,0 +1,57 @@ + + + + + +es: + Specify the reasons to deny this request: Especifica las razones para descartar la petición + From ee80b1d617e1835a1a04760f0fd4fa9435a81457 Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 12 Apr 2024 14:34:11 +0200 Subject: [PATCH 011/129] refs #6976 changes table --- .../Supplier/Card/SupplierConsumption.vue | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue index 18d163d52..e7cbca8b1 100644 --- a/src/pages/Supplier/Card/SupplierConsumption.vue +++ b/src/pages/Supplier/Card/SupplierConsumption.vue @@ -162,16 +162,20 @@ console.log('dateRange From', dateRanges.value.from); >