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

Merge branch 'develop' into nice_dev

Browse source 
# Conflicts:
#	src/modules/05_placement/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-08-15 18:02:40 +07:00
commit ce4712a199
12 changed files with 2130 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/modules/05_placement/router.ts
View file

@ -33,16 +33,12 @@ const RepatriationOrder = () =>
import("@/modules/05_placement/components/RepatriationOrder/List.vue");
const RepatriationOrderAdd = () =>
import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue");
const helpgovernment = () =>
import("@/modules/05_placement/components/helpgovernment/mainHelp.vue");
const helpgovernmentbyId = () =>
import(
"@/modules/05_placement/components/helpgovernment/governmentDetail.vue"
);
const repatriate = () =>
import("@/modules/05_placement/components/Repatriate/RepatriateMain.vue");
const repatriatebyId = () =>
import("@/modules/05_placement/components/Repatriate/RepatriatebyId.vue");
const helpgovernment = () => import("@/modules/05_placement/components/helpgovernment/mainHelp.vue")
const helpgovernmentbyId = () => import("@/modules/05_placement/components/helpgovernment/governmentDetail.vue")
const repatriate = () => import("@/modules/05_placement/components/Repatriate/RepatriateMain.vue")
const repatriatebyId = () => import("@/modules/05_placement/components/Repatriate/RepatriatebyId.vue")
const relocation = () => import("@/modules/05_placement/components/Relocation/RelocationMain.vue")
const relocationbyId = () => import("@/modules/05_placement/components/Relocation/RelocationbyId.vue")
//รับโอน
const receiveMain = () =>
import("@/modules/05_placement/components/Receive/receiveMain.vue");
@ -304,6 +300,15 @@ export default [
Key: [6.9],
Role: "placement",
},
}, {
path: "/relocation",
name: "relocation",
component: relocation,
meta: {
Auth: true,
Key: [6.9],
Role: "placement",
},
},
{
path: "other/detail/:id",
@ -314,5 +319,14 @@ export default [
Key: [6.9],
Role: "placement",
},
}, {
path: "/relocation/detail/:id",
name: "relocationId",
component: relocationbyId,
meta: {
Auth: true,
Key: [6.9],
Role: "placement",
},
},
];