hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into working

Browse source 
# Conflicts:
#	src/interface/request/main/main.ts
#	src/modules/08_registryEmployee/router.ts
#	src/modules/08_registryEmployee/views/Main.vue
This commit is contained in:
Tanyalak 2023-08-16 17:06:58 +07:00
commit 06c3d36c7a
333 changed files with 64333 additions and 12866 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/08_registryEmployee/router.ts
View file

@ -5,7 +5,7 @@ import { defineAsyncComponent } from "vue";
// const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
// const Detail = () => import("@/modules/08_registryEmployee/views/Detail.vue");
const MainEmployee = defineAsyncComponent(
const Main = defineAsyncComponent(
() => import("@/modules/08_registryEmployee/views/Main.vue")
);
const Detail = defineAsyncComponent(
@ -17,9 +17,9 @@ const EditDetail = defineAsyncComponent(
export default [
{
path: "/employee",
name: "employee",
component: MainEmployee,
path: "/registry-employee",
name: "registry-employee",
component: Main,
meta: {
Auth: true,
Key: [11],
@ -37,7 +37,7 @@ export default [
// },
// },
{
path: "/employee/add",
path: "/registry-employee/add",
name: "registryEmployeeAdd",
component: Detail,
meta: {
@ -47,7 +47,7 @@ export default [
},
},
{
path: "/employee/Edit/:Id",
path: "/registry-employee/edit/:id",
name: "registryEmployeeEdit",
component: EditDetail,
meta: {