diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 63b0fafbb..ad8973014 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -258,11 +258,11 @@ const menuList = readonly([ path: "placement", role: "placement", }, - { - label: "การทดลองปฏิบัติหน้าที่ราชการ", - path: "probation", - role: "probation", - }, + // { + // label: "การทดลองปฏิบัติหน้าที่ราชการ", + // path: "probation", + // role: "probation", + // }, { label: "รายการขอโอน", path: "transfer", @@ -293,6 +293,11 @@ const menuList = readonly([ path: "appoint-employee", role: "placement", }, + { + label: "ออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง", + path: "changePositions", + role: "placement", + }, { label: "รายการอื่นๆ", path: "other", @@ -300,6 +305,14 @@ const menuList = readonly([ }, ], }, + { + key: 81, + icon: "badge", + activeIcon: "badge", + label: "ทดลองปฏิบัติหน้าที่ราชการ", + path: "probation", + role: "probation", + }, { key: 9, icon: "mdi-account-cancel-outline", diff --git a/src/modules/05_placement/components/ChangePosition/DialogHeader.vue b/src/modules/05_placement/components/ChangePosition/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + diff --git a/src/modules/05_placement/components/ChangePosition/Main.vue b/src/modules/05_placement/components/ChangePosition/Main.vue new file mode 100644 index 000000000..b12c08ce6 --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/Main.vue @@ -0,0 +1,378 @@ + + + + + diff --git a/src/modules/05_placement/components/ChangePosition/Modal.vue b/src/modules/05_placement/components/ChangePosition/Modal.vue new file mode 100644 index 000000000..560525358 --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/Modal.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/modules/05_placement/components/ChangePosition/PersonalDetail.vue b/src/modules/05_placement/components/ChangePosition/PersonalDetail.vue new file mode 100644 index 000000000..6f89b4b7a --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/PersonalDetail.vue @@ -0,0 +1,402 @@ + + + diff --git a/src/modules/05_placement/components/ChangePosition/PersonalList.vue b/src/modules/05_placement/components/ChangePosition/PersonalList.vue new file mode 100644 index 000000000..52014fd22 --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/PersonalList.vue @@ -0,0 +1,598 @@ + + + + + diff --git a/src/modules/05_placement/components/ChangePosition/SendToCommand.vue b/src/modules/05_placement/components/ChangePosition/SendToCommand.vue new file mode 100644 index 000000000..e71e0ff17 --- /dev/null +++ b/src/modules/05_placement/components/ChangePosition/SendToCommand.vue @@ -0,0 +1,298 @@ + + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index c9b71e6de..427dc7df5 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -39,14 +39,25 @@ const FormEvaluateScoreAdd = () => import( "@/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue" ); -const FormSaveResultAddCommander = () => import("./components/probation/FormEvaluation/FormSaveResultAddCommander.vue") +const FormSaveResultAddCommander = () => + import( + "./components/probation/FormEvaluation/FormSaveResultAddCommander.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 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"); @@ -59,15 +70,27 @@ const ReceiveAdd = () => import("@/modules/05_placement/components/Receive/FormAdd.vue"); //แต่งตั้ง-เลื่อน -const AppointmentMain = () => import("@/modules/05_placement/components/AppointMent/Main.vue"); -const AppointmentDetail = () => import("@/modules/05_placement/components/AppointMent/Detail.vue"); +const AppointmentMain = () => + import("@/modules/05_placement/components/AppointMent/Main.vue"); +const AppointmentDetail = () => + import("@/modules/05_placement/components/AppointMent/Detail.vue"); //แต่งตั้งลูกจ้างประจำ -const AppointEmployeeMain = () => import("@/modules/05_placement/components/AppointEmployee/Main.vue"); -const AppointEmployeeDetail = () => import("@/modules/05_placement/components/AppointEmployee/Detail.vue"); +const AppointEmployeeMain = () => + import("@/modules/05_placement/components/AppointEmployee/Main.vue"); +const AppointEmployeeDetail = () => + import("@/modules/05_placement/components/AppointEmployee/Detail.vue"); //อื่นๆ -const OtherMain = () => import("@/modules/05_placement/components/Other/Main.vue") -const OthertDetail = () => import("@/modules/05_placement/components/Other/Detail.vue"); +const OtherMain = () => + import("@/modules/05_placement/components/Other/Main.vue"); +const OthertDetail = () => + import("@/modules/05_placement/components/Other/Detail.vue"); +const ChangePositionMain = () => + import("@/modules/05_placement/components/ChangePosition/Main.vue"); +const ChangePersonalList = () => + import("@/modules/05_placement/components/ChangePosition/PersonalList.vue"); +const ChangePersonalDetail = () => + import("@/modules/05_placement/components/ChangePosition/PersonalDetail.vue"); export default [ { @@ -336,16 +359,17 @@ export default [ component: OtherMain, meta: { Auth: true, - Key: [6.10], + Key: [6.1], Role: "placement", }, - }, { + }, + { path: "/relocation", name: "relocation", component: relocation, meta: { Auth: true, - Key: [6.10], + Key: [6.1], Role: "placement", }, }, @@ -358,7 +382,8 @@ export default [ Key: [6.9], Role: "placement", }, - }, { + }, + { path: "/relocation/detail/:id", name: "relocationId", component: relocationbyId, @@ -368,4 +393,34 @@ export default [ Role: "placement", }, }, + { + path: "/change-positions", + name: "changePositions", + component: ChangePositionMain, + meta: { + Auth: true, + Key: [6.4], + Role: "placement", + }, + }, + { + path: "/change-positions/:id", + name: "changePersonalList", + component: ChangePersonalList, + meta: { + Auth: true, + Key: [6.4], + Role: "placement", + }, + }, + { + path: "/change-positions/personal/:id", + name: "changePersonalId", + component: ChangePersonalDetail, + meta: { + Auth: true, + Key: [6.4], + Role: "placement", + }, + }, ];