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

Merge branch 'develop' into dev-tee

Browse source
This commit is contained in:
setthawutttty 2023-10-18 09:51:32 +07:00
commit 074fc05412
5 changed files with 34 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/interface/request/main/main.ts
View file

@ -290,12 +290,6 @@ const menuList = readonly<any[]>([
path: "resign",
role: "retirement",
},
// {
// key: 7.3,
// label: "คำสั่งลาออก",
// path: "resign-order",
// role: "retirement",
// },
{
key: 7.3,
label: "Exit interview",
@ -374,34 +368,34 @@ const menuList = readonly<any[]>([
},
],
},
// {
// key: 9,
// icon: "mdi-calendar",
// activeIcon: "mdi-calendar",
// label: "การลา",
// path: "leave",
// role: "coin",
// children: [
// {
// key: 9.1,
// label: "รายการลงเวลาปฏิบัติงาน",
// path: "/work-list",
// role: "coin",
// },
// {
// key: 9.2,
// label: "รายการลา",
// path: "/leave-list",
// role: "coin",
// },
// {
// key: 9.3,
// label: "รายงานสถิติ",
// path: "/statistics-report",
// role: "coin",
// },
// ],
// },
{
key: 9,
icon: "mdi-calendar",
activeIcon: "mdi-calendar",
label: "การลา",
path: "leave",
role: "coin",
children: [
{
key: 9.1,
label: "รายการลงเวลาปฏิบัติงาน",
path: "/work-list",
role: "coin",
},
{
key: 9.2,
label: "รายการลา",
path: "/leave-list",
role: "coin",
},
{
key: 9.3,
label: "รายงานสถิติ",
path: "/statistics-report",
role: "coin",
},
],
},
{
key: 11,
icon: "mdi-scale-balance",

0
src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue → src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
View file

0
src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue → src/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue
View file

0
src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue → src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
View file

12
src/modules/11_discipline/router.ts
View file

@ -16,12 +16,16 @@ const report = () =>
import("@/modules/11_discipline/components/5_Report/MainPage.vue");
const directorMain = () =>
import(
"@/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue"
"@/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue"
);
const channelMain = () =>
import(
"@/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue"
"@/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue"
);
const channelAdd = () =>
import(
"@/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue"
);
const complaintAdd = () =>
import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue");
const reportType = () =>
@ -31,10 +35,6 @@ const InvestigateDisciplinaryAdd = () =>
import(
"@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue"
);
const channelAdd = () =>
import(
"@/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue"
);
const orderPage = () => import("@/modules/11_discipline/components/4_Order/OrderPage.vue")
export default [
{