#8448 - devToTest #1254

Merged
alexm merged 365 commits from 8448-devToTest into test 2025-01-21 10:44:46 +00:00
5 changed files with 47 additions and 39 deletions
Showing only changes of commit 93ba88f236 - Show all commits

View File

@ -1,9 +1,9 @@
<script setup> <script setup>
import VnCard from 'components/common/VnCard.vue'; import VnCardBeta from 'components/common/VnCardBeta.vue';
import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue'; import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
</script> </script>
<template> <template>
<VnCard <VnCardBeta
class="q-pa-md column items-center" class="q-pa-md column items-center"
v-bind="{ ...$attrs }" v-bind="{ ...$attrs }"
data-key="Department" data-key="Department"

View File

@ -189,7 +189,7 @@ async function autofillBic(worker) {
<VnSection <VnSection
:data-key="dataKey" :data-key="dataKey"
:columns="columns" :columns="columns"
prefix="worker" prefix="workerSearch"
:array-data-props="{ :array-data-props="{
url: 'Workers/filter', url: 'Workers/filter',
order: ['id DESC'], order: ['id DESC'],

View File

@ -1,4 +1,4 @@
worker: workerSearch:
search: Search worker search: Search worker
searchInfo: Search worker by id or name searchInfo: Search worker by id or name
passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n' passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'

View File

@ -1,4 +1,4 @@
worker: workerSearch:
search: Buscar trabajador search: Buscar trabajador
searchInfo: Buscar trabajador por id o nombre searchInfo: Buscar trabajador por id o nombre
Locker: Taquilla Locker: Taquilla

View File

@ -1,47 +1,55 @@
import { RouterView } from 'vue-router'; import { RouterView } from 'vue-router';
export default { const departmentCard = {
path: '/department',
name: 'Department',
meta: {
title: 'department',
icon: 'vn:greuge',
moduleName: 'Department',
},
component: RouterView,
redirect: { name: 'WorkerDepartment' },
menus: {
main: [],
card: ['DepartmentBasicData'],
},
children: [
{
name: 'DepartmentCard', name: 'DepartmentCard',
path: 'department/:id', path: ':id',
component: () => import('src/pages/Department/Card/DepartmentCard.vue'), component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
redirect: { name: 'DepartmentSummary' }, redirect: { name: 'DepartmentSummary' },
meta: {
menu: [
'DepartmentBasicData',
]
},
children: [ children: [
{ {
name: 'DepartmentSummary',
path: 'summary', path: 'summary',
name: 'DepartmentSummary',
meta: { meta: {
title: 'summary', title: 'summary',
icon: 'launch', icon: 'launch',
}, },
component: () => component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
import('src/pages/Department/Card/DepartmentSummary.vue'),
}, },
{ {
name: 'DepartmentBasicData',
path: 'basic-data', path: 'basic-data',
name: 'DepartmentBasicData',
meta: { meta: {
title: 'basicData', title: 'basicData',
icon: 'vn:settings', icon: 'vn:settings',
}, },
component: () => component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
import('src/pages/Department/Card/DepartmentBasicData.vue'), },
}, ],
], };
export default {
name: 'Department',
path: '/worker/department',
meta: {
title: 'department',
icon: 'vn:greuge',
moduleName: 'Department',
menu: [],
},
component: RouterView,
redirect: { name: 'DepartmentMain' },
children: [
{
name: 'DepartmentMain',
path: '',
component: () => import('src/components/common/VnModule.vue'),
redirect: { name: 'DepartmentIndexMain' },
children: [departmentCard],
}, },
], ],
}; };