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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source 
# Conflicts:
#	src/api/06_retirement/api.retirement.ts
#	src/modules/05_placement/router.ts
This commit is contained in:
Thanit Konmek 2023-08-14 16:55:32 +07:00
commit b4ac343685
32 changed files with 5263 additions and 1871 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,16 @@ 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 receiveMain = () =>
import("@/modules/05_placement/components/Receive/receiveMain.vue");
@ -44,6 +53,10 @@ const receiveDetail2 = () =>
import("@/modules/05_placement/components/Receive/receiveDetail2.vue");
const ReceiveAdd = () =>
import("@/modules/05_placement/components/Receive/FormAdd.vue");
const FormSaveResultAdd = () =>
import(
"@/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue"
);
export default [
{
@ -106,6 +119,16 @@ export default [
Role: "placement",
},
},
{
path: "/probation/detail/add/:id/:form",
name: "probationFormAdd",
component: FormSaveResultAdd,
meta: {
Auth: true,
Key: [6.3],
Role: "placement",
},
},
{
path: "/probation/work/add",
name: "probationWorkAdd",
@ -206,4 +229,44 @@ export default [
Role: "placement",
},
},
{
path: "/help-government",
name: "help-government",
component: helpgovernment,
meta: {
Auth: true,
Key: [6.6],
Role: "placement",
},
},
{
path: "/help-government/detail/:id",
name: "help-governmentbyId",
component: helpgovernmentbyId,
meta: {
Auth: true,
Key: [6.6],
Role: "placement",
},
},
{
path: "/repatriate",
name: "repatriate",
component: repatriate,
meta: {
Auth: true,
Key: [6.7],
Role: "placement",
},
},
{
path: "/repatriate/detail/:id",
name: "repatriatebyId",
component: repatriatebyId,
meta: {
Auth: true,
Key: [6.7],
Role: "placement",
},
},
];