diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 4a78811e6..de9ef1bec 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -550,6 +550,8 @@ shelving: newShelving: New Shelving summary: recyclable: Recyclable + search: Search shelving + searchInfo: You can search by shelving reference parking: pickingOrder: Picking order sector: Sector @@ -558,6 +560,8 @@ parking: searchBar: info: You can search by parking code label: Search parking... + search: Search parking + searchInfo: You can search by parking code order: field: salesPersonFk: Sales Person diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 2bfe7ec4b..5413dde5d 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -575,6 +575,8 @@ shelving: newShelving: Nuevo Carro summary: recyclable: Reciclable + search: Buscar carro + searchInfo: Puedes buscar por referencia del carro parking: pickingOrder: Orden de recogida row: Fila @@ -582,6 +584,8 @@ parking: searchBar: info: Puedes buscar por código de parking label: Buscar parking... + search: Buscar parking + searchInfo: Puedes buscar por código de parking department: chat: Chat bossDepartment: Jefe de departamento diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue index 337106986..1cd2df7b7 100644 --- a/src/pages/Parking/Card/ParkingCard.vue +++ b/src/pages/Parking/Card/ParkingCard.vue @@ -1,19 +1,12 @@ + diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue index 109613383..88db8bbf0 100644 --- a/src/pages/Parking/ParkingList.vue +++ b/src/pages/Parking/ParkingList.vue @@ -5,17 +5,17 @@ import { useI18n } from 'vue-i18n'; import { useStateStore } from 'stores/useStateStore'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import VnPaginate from 'components/ui/VnPaginate.vue'; -import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import CardList from 'components/ui/CardList.vue'; import VnLv from 'components/ui/VnLv.vue'; import ParkingFilter from './ParkingFilter.vue'; import ParkingSummary from './Card/ParkingSummary.vue'; -import RightMenu from 'src/components/common/RightMenu.vue'; +import VnSection from 'src/components/common/VnSection.vue'; const stateStore = useStateStore(); const { push } = useRouter(); const { t } = useI18n(); const { viewSummary } = useSummaryDialog(); +const dataKey = 'ParkingList'; onMounted(() => (stateStore.rightDrawer = true)); onUnmounted(() => (stateStore.rightDrawer = false)); @@ -37,58 +37,54 @@ function exprBuilder(param, value) { \ No newline at end of file diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js index 51ea200c6..0dbbf4fb9 100644 --- a/src/router/modules/parking.js +++ b/src/router/modules/parking.js @@ -1,54 +1,65 @@ import { RouterView } from 'vue-router'; +const parkingCard = { + name: 'ParkingCard', + path: ':id', + component: () => import('src/pages/Parking/Card/ParkingCard.vue'), + redirect: { name: 'ParkingSummary' }, + meta: { + menu: [ + 'ParkingBasicData', + 'ParkingLog' + ], + }, + children: [ + { + path: 'summary', + name: 'ParkingSummary', + meta: { + title: 'summary', + icon: 'launch', + }, + component: () => import('src/pages/Parking/Card/ParkingSummary.vue'), + }, + { + path: 'basic-data', + name: 'ParkingBasicData', + meta: { + title: 'basicData', + icon: 'vn:settings', + }, + component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'), + }, + { + path: 'log', + name: 'ParkingLog', + meta: { + title: 'log', + icon: 'history', + }, + component: () => import('src/pages/Parking/Card/ParkingLog.vue'), + }, + ], +}; + export default { + name: 'Parking', path: '/parking', - name: 'Parking', meta: { title: 'parking', icon: 'garage_home', moduleName: 'Parking', + menu: [], }, component: RouterView, - redirect: { name: 'ParkingCard' }, - menus: { - main: [], - card: ['ParkingBasicData', 'ParkingLog'], - }, + redirect: { name: 'ParkingMain' }, children: [ { - path: '/parking/:id', - name: 'ParkingCard', - component: () => import('src/pages/Parking/Card/ParkingCard.vue'), - redirect: { name: 'ParkingSummary' }, - children: [ - { - name: 'ParkingSummary', - path: 'summary', - meta: { - title: 'summary', - icon: 'view_list', - }, - component: () => import('src/pages/Parking/Card/ParkingSummary.vue'), - }, - { - name: 'ParkingBasicData', - path: 'basic-data', - meta: { - title: 'basicData', - icon: 'vn:settings', - }, - component: () => import('pages/Parking/Card/ParkingBasicData.vue'), - }, - { - name: 'ParkingLog', - path: 'log', - meta: { - title: 'log', - icon: 'history', - }, - component: () => import('src/pages/Parking/Card/ParkingLog.vue'), - }, - ], - }, + name: 'ParkingMain', + path: '', + component: () => import('src/components/common/VnModule.vue'), + redirect: { name: 'ParkingIndexMain' }, + children: [ parkingCard ], + }, ], };