Merge pull request '7550-refactPagesParking' (!1350) from 7550-refactPagesParking into dev
gitea/salix-front/pipeline/head There was a failure building this commit
Details
gitea/salix-front/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1350 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
7b34433898
|
@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
|
|||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||
import VnInput from 'src/components/common/VnInput.vue';
|
||||
import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import VnTable from 'src/components/VnTable/VnTable.vue';
|
||||
import { useArrayData } from 'src/composables/useArrayData';
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import axios from 'axios';
|
|||
import VnImg from 'src/components/ui/VnImg.vue';
|
||||
import EditPictureForm from 'components/EditPictureForm.vue';
|
||||
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
|
||||
const $props = defineProps({
|
||||
id: {
|
||||
|
|
|
@ -9,7 +9,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
|
|||
import VnUserLink from 'src/components/ui/VnUserLink.vue';
|
||||
import VnTitle from 'src/components/common/VnTitle.vue';
|
||||
import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
|
||||
import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<script setup>
|
||||
import VnCardBeta from 'components/common/VnCardBeta.vue';
|
||||
import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
|
||||
import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
|
||||
</script>
|
||||
<template>
|
||||
<VnCardBeta
|
|
@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useState } from 'src/composables/useState';
|
||||
import { useQuasar } from 'quasar';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
|
||||
import CreateDepartmentChild from './CreateDepartmentChild.vue';
|
||||
import axios from 'axios';
|
||||
import { useRouter } from 'vue-router';
|
||||
|
|
|
@ -3,7 +3,7 @@ import { RouterView } from 'vue-router';
|
|||
const parkingCard = {
|
||||
name: 'ParkingCard',
|
||||
path: ':id',
|
||||
component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
|
||||
component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
|
||||
redirect: { name: 'ParkingSummary' },
|
||||
meta: {
|
||||
menu: ['ParkingBasicData', 'ParkingLog'],
|
||||
|
@ -16,7 +16,7 @@ const parkingCard = {
|
|||
title: 'summary',
|
||||
icon: 'launch',
|
||||
},
|
||||
component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
|
||||
component: () => import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
|
||||
},
|
||||
{
|
||||
path: 'basic-data',
|
||||
|
@ -25,7 +25,8 @@ const parkingCard = {
|
|||
title: 'basicData',
|
||||
icon: 'vn:settings',
|
||||
},
|
||||
component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
|
||||
component: () =>
|
||||
import('src/pages/Shelving/Parking/Card/ParkingBasicData.vue'),
|
||||
},
|
||||
{
|
||||
path: 'log',
|
||||
|
@ -34,7 +35,7 @@ const parkingCard = {
|
|||
title: 'log',
|
||||
icon: 'history',
|
||||
},
|
||||
component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
|
||||
component: () => import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
|
||||
},
|
||||
],
|
||||
};
|
||||
|
@ -127,7 +128,7 @@ export default {
|
|||
title: 'parkingList',
|
||||
icon: 'view_list',
|
||||
},
|
||||
component: () => import('src/pages/Parking/ParkingList.vue'),
|
||||
component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
|
||||
children: [
|
||||
{
|
||||
path: 'list',
|
||||
|
|
|
@ -201,7 +201,7 @@ const workerCard = {
|
|||
const departmentCard = {
|
||||
name: 'DepartmentCard',
|
||||
path: ':id',
|
||||
component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
|
||||
component: () => import('src/pages/Worker/Department/Card/DepartmentCard.vue'),
|
||||
redirect: { name: 'DepartmentSummary' },
|
||||
meta: {
|
||||
moduleName: 'Department',
|
||||
|
@ -215,7 +215,8 @@ const departmentCard = {
|
|||
title: 'summary',
|
||||
icon: 'launch',
|
||||
},
|
||||
component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
|
||||
component: () =>
|
||||
import('src/pages/Worker/Department/Card/DepartmentSummary.vue'),
|
||||
},
|
||||
{
|
||||
path: 'basic-data',
|
||||
|
@ -224,7 +225,8 @@ const departmentCard = {
|
|||
title: 'basicData',
|
||||
icon: 'vn:settings',
|
||||
},
|
||||
component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
|
||||
component: () =>
|
||||
import('src/pages/Worker/Department/Card/DepartmentBasicData.vue'),
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue