diff --git a/src/assets/manual/06_employeehistory/1_main/6-21.png b/src/assets/manual/06_employeehistory/1_main/6-21.png index fb6a9776..2e215af6 100644 Binary files a/src/assets/manual/06_employeehistory/1_main/6-21.png and b/src/assets/manual/06_employeehistory/1_main/6-21.png differ diff --git a/src/assets/manual/06_employeehistory/1_main/6-31.png b/src/assets/manual/06_employeehistory/1_main/6-31.png index 76512dcf..0c085f97 100644 Binary files a/src/assets/manual/06_employeehistory/1_main/6-31.png and b/src/assets/manual/06_employeehistory/1_main/6-31.png differ diff --git a/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ 2.png b/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ 2.png new file mode 100644 index 00000000..9856d0d1 Binary files /dev/null and b/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ 2.png differ diff --git a/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ.png b/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ.png new file mode 100644 index 00000000..80d41aa0 Binary files /dev/null and b/src/assets/manual/06_employeehistory/1_main/ไม่มีชื่อ.png differ diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index c168c862..7ba5d4e8 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -83,6 +83,17 @@ const menuList = readonly([ label: "ระบบการสรรหาบุคคล", path: "/recruitmain", }, + { + key: 2.6, + label: "ระบบทะเบียนประวัติลูกจ้าง", + path: "/Employeehistorymain", + }, + { + key: 2.7, + label: "ระบบออกคำสั่ง", + path: "commandsmain", + }, + ], }, ]) @@ -507,5 +518,7 @@ const tabList = readonly([ }, ]) + + export { menuList, tabList, tabListLogin, tabListDatamain, tabStructuremain, tabRegistration, tabRecruit } export type { ScrollType, tabType, menuType, notiType, optionType } diff --git a/src/modules/01_manual/components/1_login/view.vue b/src/modules/01_manual/components/1_login/view.vue index 367562a7..7a3af585 100644 --- a/src/modules/01_manual/components/1_login/view.vue +++ b/src/modules/01_manual/components/1_login/view.vue @@ -1,5 +1,5 @@ + + diff --git a/src/modules/01_manual/components/7_commands/view.vue b/src/modules/01_manual/components/7_commands/view.vue new file mode 100644 index 00000000..b21baba8 --- /dev/null +++ b/src/modules/01_manual/components/7_commands/view.vue @@ -0,0 +1,85 @@ + + + + diff --git a/src/modules/01_manual/router.ts b/src/modules/01_manual/router.ts index 40f1cc34..e0021aaa 100644 --- a/src/modules/01_manual/router.ts +++ b/src/modules/01_manual/router.ts @@ -48,11 +48,13 @@ const recruitdisabilities = () => import("@/modules/01_manual/components/5_recru const recruitselection = () => import("@/modules/01_manual/components/5_recruitment/57_selection.vue"); -const commandsmain = () => import("@/modules/01_manual/components/7_commands/71_main.vue"); - const employeehistorymain = () => import("@/modules/01_manual/components/6_employeehistory/61_main.vue"); +const commandsmain = () => import("@/modules/01_manual/components/7_commands/71_main.vue"); +const ehrtry = () => import("@/modules/01_manual/components/7_commands/72_try.vue"); + + /****** 1 ********/ @@ -482,6 +484,19 @@ export default [ Key: [10], Role: "order", }, + }, + + + + + { + path: "/ehrtry", + name: "ehrtry", + component: ehrtry, + meta: { + Auth: true, + Key: [10], + Role: "order", + }, } - ]; \ No newline at end of file diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 7d57b4b3..52fcc0f8 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -15,6 +15,7 @@ import { tabRegistration, tabRecruit, tabList, + } from "../interface/request/main/main"; const { setVerticalScrollPosition } = scroll; @@ -166,6 +167,9 @@ const setListTab = () => { } else if (route.name == "recruitmain") { listTab.value = tabRecruit; } + else if (route.name == "commandsmain") { + listTab.value = tabRecruit; + } changeTab(listTab.value[0].tag); if (route.name == "dashboard") { @@ -302,13 +306,16 @@ const onScroll = (scroll: ScrollType) => {