- แก้ไขข้อความ

- แก้ไขเมนู
This commit is contained in:
Warunee Tamkoo 2024-04-19 13:58:58 +07:00
parent a2279a234a
commit c6d53b22f3
5 changed files with 201 additions and 317 deletions

View file

@ -52,7 +52,7 @@ const menuList = readonly<any[]>([
role: "dashboard", role: "dashboard",
}, },
{ {
key: 3, key: 2,
icon: "o_person", icon: "o_person",
activeIcon: "person", activeIcon: "person",
label: "ข้อมูลหลัก (ใหม่)", label: "ข้อมูลหลัก (ใหม่)",
@ -60,43 +60,41 @@ const menuList = readonly<any[]>([
role: "metadata", role: "metadata",
children: [ children: [
{ {
key: 3.1, key: 2.0,
label: "ข้อมูลเกี่ยวกับบุคคล", label: "ข้อมูลเกี่ยวกับบุคคล",
path: "masterPersonal", path: "masterPersonal",
}, },
{ {
key: 3.2, key: 2.0,
label: "ข้อมูลตำแหน่งข้าราชการฯ", label: "ข้อมูลตำแหน่งข้าราชการฯ",
path: "masterPosition", path: "masterPosition",
}, },
{ {
key: 3.3, key: 2.0,
label: "ข้อมูลตำแหน่งลูกจ้างประจำ", label: "ข้อมูลตำแหน่งลูกจ้างประจำ",
path: "masterPositionEmployee", path: "masterPositionEmployee",
}, },
{ {
key: 3.4, key: 2.0,
label: "ข้อมูลปฏิทินวันหยุด", label: "ข้อมูลปฏิทินวันหยุด",
path: "masterCalendarWork", path: "masterCalendarWork",
}, },
{ {
key: 3.5, key: 2.0,
label: "ข้อมูลเครื่องราชอิสริยาภรณ์", label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
path: "masterInsignia", path: "masterInsignia",
}, },
{ {
key: 3.6, key: 2.1,
label: "ตัวชี้วัด", label: "ตัวชี้วัด",
role: "evaluateKPI", role: "evaluateKPI",
children: [ children: [
{ {
key: 3.61,
label: "ตามแผน", label: "ตามแผน",
path: "KPIIndicatorByPlan", path: "KPIIndicatorByPlan",
role: "evaluateKPI", role: "evaluateKPI",
}, },
{ {
key: 3.62,
label: "ตามตำแหน่ง", label: "ตามตำแหน่ง",
path: "KPIIndicatorByRole", path: "KPIIndicatorByRole",
role: "evaluateKPI", role: "evaluateKPI",
@ -104,7 +102,7 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 3.7, key: 2.0,
label: "สมรรถนะ", label: "สมรรถนะ",
path: "KPICompetency", path: "KPICompetency",
role: "evaluateKPI", role: "evaluateKPI",
@ -112,52 +110,15 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 4, key: 3,
icon: "o_groups", icon: "o_groups",
activeIcon: "groups", activeIcon: "groups",
label: "โครงสร้างอัตรากำลัง (ใหม่)", label: "โครงสร้างอัตรากำลัง (ใหม่)",
path: "organizationalNew", path: "organizationalNew",
role: "organization", role: "organization",
// children: [
// {
// key: 3.1,
// label: "จัดการตำแหน่ง",
// path: "organizationalMapping",
// },
// {
// key: 3.2,
// label: "แผนภูมิโครงสร้าง",
// path: "organizationalStructChart",
// },
// {
// key: 3.3,
// label: "แผนภูมิองค์กร",
// path: "organizationalOrgChart",
// },
// {
// key: 3.4,
// label: "ผังโครงสร้าง",
// path: "organizationalTree",
// },
// {
// key: 3.5,
// label: "ผังโครงสร้างลูกจ้าง",
// path: "organizationalEmployee",
// },
// {
// key: 3.6,
// label: "จัดการบัญชี 2",
// path: "manageReport2",
// },
// {
// key: 3.7,
// label: "รายงานบัญชี",
// path: "organizationalReport",
// },
// ],
}, },
{ {
key: 4, key: 3,
icon: "o_groups", icon: "o_groups",
activeIcon: "groups", activeIcon: "groups",
label: "อัตรากำลังลูกจ้างประจำฯ", label: "อัตรากำลังลูกจ้างประจำฯ",
@ -173,7 +134,7 @@ const menuList = readonly<any[]>([
role: "organization", role: "organization",
}, },
{ {
key: 2, key: 100,
icon: "o_person", icon: "o_person",
activeIcon: "person", activeIcon: "person",
label: "ข้อมูลหลัก", label: "ข้อมูลหลัก",
@ -181,7 +142,7 @@ const menuList = readonly<any[]>([
role: "metadata", role: "metadata",
}, },
{ {
key: 3, key: 0,
icon: "o_groups", icon: "o_groups",
activeIcon: "groups", activeIcon: "groups",
label: "โครงสร้างอัตรากำลัง", label: "โครงสร้างอัตรากำลัง",
@ -242,7 +203,7 @@ const menuList = readonly<any[]>([
role: "registryverify", role: "registryverify",
}, },
{ {
key: 10, key: 5,
icon: "o_contact_page", icon: "o_contact_page",
activeIcon: "registry_employee_page", activeIcon: "registry_employee_page",
label: "ทะเบียนประวัติลูกจ้าง", label: "ทะเบียนประวัติลูกจ้าง",
@ -250,7 +211,7 @@ const menuList = readonly<any[]>([
role: "registryEmployee", role: "registryEmployee",
}, },
{ {
key: 10, key: 6,
icon: "mdi-file-certificate-outline", icon: "mdi-file-certificate-outline",
activeIcon: "order", activeIcon: "order",
label: "ออกคำสั่ง", label: "ออกคำสั่ง",
@ -258,7 +219,7 @@ const menuList = readonly<any[]>([
role: "order", role: "order",
}, },
{ {
key: 5, key: 7,
icon: "o_search", icon: "o_search",
activeIcon: "search", activeIcon: "search",
label: "สรรหา", label: "สรรหา",
@ -268,13 +229,13 @@ const menuList = readonly<any[]>([
{ {
label: "ตั้งค่าเว็บสรรหา", label: "ตั้งค่าเว็บสรรหา",
path: "editorweb", path: "editorweb",
key: 5.1, key: 7.1,
role: "recruit", role: "recruit",
}, },
{ {
label: "สอบแข่งขัน", label: "สอบแข่งขัน",
path: "", path: "",
key: 5.2, key: 7.2,
role: "recruit", role: "recruit",
children: [ children: [
{ {
@ -292,7 +253,7 @@ const menuList = readonly<any[]>([
{ {
label: "คัดเลือก", label: "คัดเลือก",
path: "", path: "",
key: 5.3, key: 7.3,
role: "recruit", role: "recruit",
children: [ children: [
{ {
@ -325,7 +286,7 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 6, key: 8,
path: "placement", path: "placement",
icon: "how_to_reg", icon: "how_to_reg",
activeIcon: "how_to_reg", activeIcon: "how_to_reg",
@ -333,67 +294,46 @@ const menuList = readonly<any[]>([
role: "placement", role: "placement",
children: [ children: [
{ {
key: 6.1,
label: "รายชื่อผู้สอบผ่าน", label: "รายชื่อผู้สอบผ่าน",
path: "placement", path: "placement",
role: "placement", role: "placement",
}, },
// {
// key: 6.2,
// label: "ออกคำสั่ง",
// path: "Orderplacement",
// role: "placement",
// },
{ {
key: 6.3,
label: "การทดลองปฏิบัติหน้าที่ราชการ", label: "การทดลองปฏิบัติหน้าที่ราชการ",
path: "probation", path: "probation",
role: "probation", role: "probation",
}, },
{ {
key: 6.4,
label: "รายการขอโอน", label: "รายการขอโอน",
path: "transfer", path: "transfer",
role: "placement", role: "placement",
}, },
{ {
key: 6.5,
label: "รายการรับโอน", label: "รายการรับโอน",
path: "receive", path: "receive",
role: "placement", role: "placement",
}, },
{ {
key: 6.6,
label: "รายการช่วยราชการ", label: "รายการช่วยราชการ",
path: "help-government", path: "help-government",
role: "placement", role: "placement",
}, },
{ {
key: 6.7,
label: "รายการส่งตัวกลับ", label: "รายการส่งตัวกลับ",
path: "repatriate", path: "repatriate",
role: "placement", role: "placement",
}, },
{ {
key: 6.8,
label: "รายการแต่งตั้ง-เลื่อน-ย้าย", label: "รายการแต่งตั้ง-เลื่อน-ย้าย",
path: "appoint-promote", path: "appoint-promote",
role: "placement", role: "placement",
}, },
{ {
key: 6.8,
label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง", label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง",
path: "appoint-employee", path: "appoint-employee",
role: "placement", role: "placement",
}, },
// {
// key: 6.9,
// label: "รายการย้าย",
// path: "relocation",
// role: "placement",
// },
{ {
key: 6.1,
label: "รายการอื่นๆ", label: "รายการอื่นๆ",
path: "other", path: "other",
role: "placement", role: "placement",
@ -401,7 +341,7 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 7, key: 9,
icon: "mdi-account-cancel-outline", icon: "mdi-account-cancel-outline",
activeIcon: "mdi-account-cancel", activeIcon: "mdi-account-cancel",
label: "พ้นจากราชการ", label: "พ้นจากราชการ",
@ -409,51 +349,34 @@ const menuList = readonly<any[]>([
role: "retirement", role: "retirement",
children: [ children: [
{ {
key: 7.1,
label: "ประกาศเกษียณ", label: "ประกาศเกษียณ",
path: "retirement", path: "retirement",
role: "retirement", role: "retirement",
}, },
{ {
key: 7.2,
label: "รายการลาออก", label: "รายการลาออก",
path: "resign", path: "resign",
role: "retirement", role: "retirement",
}, },
{ {
key: 7.3,
label: "Exit interview", label: "Exit interview",
path: "exit-Interview", path: "exit-Interview",
role: "retirement", role: "retirement",
}, },
{ {
key: 7.4,
label: "รายการบันทึกการถึงแก่กรรม", label: "รายการบันทึกการถึงแก่กรรม",
path: "deceased", path: "deceased",
role: "retirement", role: "retirement",
}, },
{ {
key: 7.5,
label: "รายการให้ออก", label: "รายการให้ออก",
path: "dismiss-order", path: "dismiss-order",
role: "retirement", role: "retirement",
}, },
// {
// key: 7.6,
// label: "รายการปลดออก",
// path: "discharged",
// role: "retirement",
// },
// {
// key: 7.7,
// label: "รายการไล่ออก",
// path: "expulsion",
// role: "retirement",
// },
], ],
}, },
{ {
key: 8, key: 10,
icon: "mdi-medal-outline", icon: "mdi-medal-outline",
activeIcon: "mdi-medal", activeIcon: "mdi-medal",
label: "เครื่องราชฯ", label: "เครื่องราชฯ",
@ -461,37 +384,31 @@ const menuList = readonly<any[]>([
role: "insignia", role: "insignia",
children: [ children: [
{ {
key: 8.1,
label: "รอบการเสนอขอ", label: "รอบการเสนอขอ",
path: "insigniaProposals", path: "insigniaProposals",
role: "insignia", role: "insignia",
}, },
{ {
key: 8.2,
label: "จัดการคำขอ", label: "จัดการคำขอ",
path: "insigniaManage", path: "insigniaManage",
role: "insignia", role: "insignia",
}, },
{ {
key: 8.3,
label: "บันทึกผลการเสนอขอ", label: "บันทึกผลการเสนอขอ",
path: "insigniaRecord", path: "insigniaRecord",
role: "insignia", role: "insignia",
}, },
{ {
key: 8.4,
label: "จัดสรรเครื่องราชฯ", label: "จัดสรรเครื่องราชฯ",
path: "insigniaAllocate", path: "insigniaAllocate",
role: "insignia", role: "insignia",
}, },
{ {
key: 8.6,
label: "ยืม-คืนเครื่องราชฯ", label: "ยืม-คืนเครื่องราชฯ",
path: "insigniaBorrow", path: "insigniaBorrow",
role: "insignia", role: "insignia",
}, },
{ {
key: 8.5,
label: "รายงาน", label: "รายงาน",
path: "insigniaReport", path: "insigniaReport",
role: "insignia", role: "insignia",
@ -499,7 +416,7 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 9, key: 11,
icon: "mdi-calendar", icon: "mdi-calendar",
activeIcon: "mdi-calendar", activeIcon: "mdi-calendar",
label: "การลา", label: "การลา",
@ -507,37 +424,31 @@ const menuList = readonly<any[]>([
role: "leave", role: "leave",
children: [ children: [
{ {
key: 9.1,
label: "รอบการปฏิบัติงาน", label: "รอบการปฏิบัติงาน",
path: "/round-time", path: "/round-time",
role: "leave", role: "leave",
}, },
{ {
key: 9.2,
label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน", label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน",
path: "/change-round", path: "/change-round",
role: "leave", role: "leave",
}, },
{ {
key: 9.3,
label: "รายการลงเวลาปฏิบัติงาน", label: "รายการลงเวลาปฏิบัติงาน",
path: "/work-list", path: "/work-list",
role: "leave", role: "leave",
}, },
{ {
key: 9.4,
label: "ลงเวลากรณีพิเศษ", label: "ลงเวลากรณีพิเศษ",
path: "/timestamp-special", path: "/timestamp-special",
role: "leave", role: "leave",
}, },
{ {
key: 9.5,
label: "รายการลา", label: "รายการลา",
path: "/leave", path: "/leave",
role: "leave", role: "leave",
}, },
{ {
key: 9.6,
label: "รายงานสถิติการลา", label: "รายงานสถิติการลา",
path: "/leave-report", path: "/leave-report",
role: "leave", role: "leave",
@ -545,56 +456,50 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 11, key: 12,
icon: "mdi-scale-balance", icon: "mdi-scale-balance",
activeIcon: "mdi-scale-balance", activeIcon: "mdi-scale-balance",
label: "วินัย", label: "วินัย",
role: "discipline", role: "discipline",
children: [ children: [
{ {
key: 11.1, key: 12.0,
label: "เรื่องร้องเรียน", label: "เรื่องร้องเรียน",
path: "disciplineComplaints", path: "disciplineComplaints",
role: "discipline", role: "discipline",
}, },
{ {
key: 11.2, key: 12.0,
label: "สืบสวนข้อเท็จจริง", label: "สืบสวนข้อเท็จจริง",
path: "disciplineInvestigatefacts", path: "disciplineInvestigatefacts",
role: "discipline", role: "discipline",
}, },
{ {
key: 11.3, key: 12.0,
label: "สอบสวนความผิดทางวินัย", label: "สอบสวนความผิดทางวินัย",
path: "disciplineDisciplinary", path: "disciplineDisciplinary",
role: "discipline", role: "discipline",
}, },
{ {
key: 11.4, key: 12.0,
label: "สรุปผลการพิจารณาความผิดทางวินัย", label: "สรุปผลการพิจารณาความผิดทางวินัย",
path: "disciplineResult", path: "disciplineResult",
role: "discipline", role: "discipline",
}, },
{ {
key: 11.5, key: 12.0,
label: "รายชื่อผู้ถูกพักราชการ", label: "รายชื่อผู้ถูกพักราชการ",
path: "disciplineListSuspend", path: "disciplineListSuspend",
role: "discipline", role: "discipline",
}, },
// {
// key: 11.5,
// label: "รายงาน",
// path: "disciplineReport",
// role: "discipline",
// },
{ {
key: 11.5, key: 12.0,
label: "อุทธรณ์/ร้องทุกข์", label: "อุทธรณ์/ร้องทุกข์",
path: "appealComplain", path: "appealComplain",
role: "discipline", role: "discipline",
}, },
{ {
key: 11.5, key: 12.0,
label: "ออกคำสั่งลงโทษทางวินัย", label: "ออกคำสั่งลงโทษทางวินัย",
path: "disciplineOrder", path: "disciplineOrder",
role: "discipline", role: "discipline",
@ -602,7 +507,7 @@ const menuList = readonly<any[]>([
{ {
label: "ข้อมูลพื้นฐาน", label: "ข้อมูลพื้นฐาน",
path: "", path: "",
key: 11.7, key: 12.1,
role: "discipline", role: "discipline",
children: [ children: [
{ {
@ -620,14 +525,14 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 11, key: 13,
icon: "mdi-account-check", icon: "mdi-account-check",
activeIcon: "mdi-account-check", activeIcon: "mdi-account-check",
label: "ประเมินบุคคล", label: "ประเมินบุคคล",
role: "evaluate", role: "evaluate",
children: [ children: [
{ {
key: 11.1, key: 13.0,
label: "คำขอประเมิน", label: "คำขอประเมิน",
path: "evaluate", path: "evaluate",
role: "discipline", role: "discipline",
@ -635,7 +540,7 @@ const menuList = readonly<any[]>([
{ {
label: "กรรมการและการประชุม", label: "กรรมการและการประชุม",
path: "", path: "",
key: 11.7, key: 13.1,
role: "evaluate", role: "evaluate",
children: [ children: [
{ {
@ -653,44 +558,38 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 12, key: 14,
icon: "mdi-cash", icon: "mdi-cash",
activeIcon: "mdi-cash", activeIcon: "mdi-cash",
label: "เงินเดือน/ค่าจ้าง", label: "เงินเดือน/ค่าจ้าง",
role: "salary", role: "salary",
children: [ children: [
{ {
key: 12.1,
label: "ผังบัญชีเงินเดือนข้าราชการฯ", label: "ผังบัญชีเงินเดือนข้าราชการฯ",
path: "salaryChart", path: "salaryChart",
role: "salary", role: "salary",
}, },
{ {
key: 12.2,
label: "ผังบัญชีค่าจ้างลูกจ้างประจำ", label: "ผังบัญชีค่าจ้างลูกจ้างประจำ",
path: "salaryEmployeeChart", path: "salaryEmployeeChart",
role: "salary", role: "salary",
}, },
{ {
key: 12.3,
label: "รอบการขึ้นเงินเดือน", label: "รอบการขึ้นเงินเดือน",
path: "salaryRound", path: "salaryRound",
role: "salary", role: "salary",
}, },
{ {
key: 12.4,
label: "เลื่อนเงินเดือนข้าราชการฯ", label: "เลื่อนเงินเดือนข้าราชการฯ",
path: "salaryLists", path: "salaryLists",
role: "salary", role: "salary",
}, },
{ {
key: 12.5,
label: "เลื่อนค่าจ้างลูกจ้างประจำ", label: "เลื่อนค่าจ้างลูกจ้างประจำ",
path: "salaryEmployeeLists", path: "salaryEmployeeLists",
role: "salary", role: "salary",
}, },
{ {
key: 12.6,
label: "ออกคำสั่งเลื่อนเงินเดือน/ค่าจ้าง", label: "ออกคำสั่งเลื่อนเงินเดือน/ค่าจ้าง",
path: "commandSalary", path: "commandSalary",
role: "salary", role: "salary",
@ -698,14 +597,13 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 13, key: 15,
icon: "mdi-account-star", icon: "mdi-account-star",
activeIcon: "mdi-account-star", activeIcon: "mdi-account-star",
label: "ประเมินผลการปฏิบัติราชการระดับบุคคล", label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
role: "evaluateKPI", role: "evaluateKPI",
children: [ children: [
{ {
key: 13.1,
label: "รอบการประเมิน", label: "รอบการประเมิน",
path: "KPIRound", path: "KPIRound",
role: "evaluateKPI", role: "evaluateKPI",
@ -713,52 +611,39 @@ const menuList = readonly<any[]>([
], ],
}, },
{ {
key: 14, key: 16,
icon: "mdi-briefcase-account", icon: "mdi-briefcase-account",
activeIcon: "mdi-briefcase-account", activeIcon: "mdi-briefcase-account",
label: "พัฒนาบุคลากร", label: "พัฒนาบุคลากร",
role: "development", role: "development",
children: [ children: [
{ {
key: 14.1,
label: "โครงการ/หลักสูตรการฝึกอบรม", label: "โครงการ/หลักสูตรการฝึกอบรม",
path: "developmentMain", path: "developmentMain",
role: "development", role: "development",
}, },
{ {
key: 14.2,
label: "ประวัติฝึกอบรม/ดูงาน ขรก.", label: "ประวัติฝึกอบรม/ดูงาน ขรก.",
path: "developmentHistory", path: "developmentHistory",
role: "development", role: "development",
}, },
{ {
key: 14.3,
label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง", label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง",
path: "developmentEmployeeHistory", path: "developmentEmployeeHistory",
role: "development", role: "development",
}, },
{ {
key: 14.4,
label: "ทุนการศึกษา/ฝึกอบรม", label: "ทุนการศึกษา/ฝึกอบรม",
path: "developmentScholarship", path: "developmentScholarship",
role: "development", role: "development",
}, },
{ {
key: 14.5,
label: "ยุทธศาสตร์", label: "ยุทธศาสตร์",
path: "developmentStrategic", path: "developmentStrategic",
role: "development", role: "development",
}, },
], ],
}, },
// {
// key: 99,
// icon: "mdi-chat",
// activeIcon: "mdi-chat",
// label: "ถาม-ตอบ",
// role: "support",
// path: "support",
// },
]); ]);
const tabList = readonly<tabType[]>([ const tabList = readonly<tabType[]>([

View file

@ -73,10 +73,10 @@ const columns = ref<QTableProps["columns"]>([
{ {
name: "isActive", name: "isActive",
align: "left", align: "left",
label: "สถานะ", label: "สถานะ",
sortable: true, sortable: true,
field: "isActive", field: "isActive",
format: (val) => (val ? "เปืดรอบ" : "ปิดรอบ"), format: (val) => (val ? "เปิด" : "ปิดแล้ว"),
headerStyle: "font-size: 14px", headerStyle: "font-size: 14px",
style: "font-size: 14px", style: "font-size: 14px",
}, },
@ -261,7 +261,7 @@ function onCloseRounde(id: string) {
dialogConfirm( dialogConfirm(
$q, $q,
() => { () => {
showLoader() showLoader();
http http
.get(config.API.kpiPeriod + `/close/${id}`) .get(config.API.kpiPeriod + `/close/${id}`)
.then(() => { .then(() => {

View file

@ -350,6 +350,7 @@ onMounted(() => {
> >
<template v-slot:header="props"> <template v-slot:header="props">
<q-tr :props="props"> <q-tr :props="props">
<q-th auto-width></q-th>
<q-th v-for="col in props.cols" :key="col.name" :props="props"> <q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span> <span class="text-weight-medium">{{ col.label }}</span>
</q-th> </q-th>
@ -357,6 +358,11 @@ onMounted(() => {
</template> </template>
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer"> <q-tr :props="props" class="cursor-pointer">
<q-td v-if="props.row.isDone">
<q-icon name="mdi-check" color="green" size="xs">
<q-tooltip>งไปบนทกททะเบยนประวแล</q-tooltip>
</q-icon>
</q-td>
<q-td v-for="col in props.cols" :key="col.id"> <q-td v-for="col in props.cols" :key="col.id">
<div>{{ col.value ? col.value : "-" }}</div> <div>{{ col.value ? col.value : "-" }}</div>
</q-td> </q-td>

View file

@ -213,152 +213,122 @@ onMounted(() => {
<q-card flat bordered class="q-pa-md"> <q-card flat bordered class="q-pa-md">
<q-toolbar class="q-pa-none"> <q-toolbar class="q-pa-none">
<div class="row q-gutter-sm"> <div class="row q-gutter-sm">
<div> <datepicker
<datepicker style="width: 150px"
style="width: 150px" menu-class-name="modalfix"
menu-class-name="modalfix" v-model="formQuery.year"
v-model="formQuery.year" :locale="'th'"
:locale="'th'" autoApply
autoApply year-picker
year-picker :enableTimePicker="false"
:enableTimePicker="false" @update:model-value="fetchNewList"
@update:model-value="fetchNewList" >
> <template #year="{ year }">{{ year + 543 }}</template>
<template #year="{ year }">{{ year + 543 }}</template> <template #year-overlay-value="{ value }">{{
<template #year-overlay-value="{ value }">{{ parseInt(value + 543)
parseInt(value + 543) }}</template>
}}</template> <template #trigger>
<template #trigger> <q-input
<q-input dense
dense lazy-rules
lazy-rules outlined
outlined :model-value="
:model-value=" formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543
formQuery.year === 0 "
? 'ทั้งหมด' :label="`${'ปีงบประมาณ'}`"
: Number(formQuery.year) + 543 >
" <template v-if="formQuery.year" v-slot:append>
:label="`${'ปีงบประมาณ'}`" <q-icon
> name="cancel"
<template v-if="formQuery.year" v-slot:append> @click.stop.prevent="(formQuery.year = 0), fetchNewList()"
<q-icon class="cursor-pointer"
name="cancel" />
@click.stop.prevent="(formQuery.year = 0), fetchNewList()" </template>
class="cursor-pointer" <template v-slot:prepend>
/> <q-icon
</template> name="event"
<template v-slot:prepend> class="cursor-pointer"
<q-icon style="color: var(--q-primary)"
name="event" >
class="cursor-pointer" </q-icon>
style="color: var(--q-primary)" </template>
> </q-input>
</q-icon> </template>
</template> </datepicker>
</q-input>
</template> <q-select
</datepicker> dense
</div> outlined
<div> v-model="formQuery.type"
<q-select :options="scholarshipTypeOp"
dense emit-value
outlined map-options
v-model="formQuery.type" option-value="id"
:options="scholarshipTypeOp" option-label="name"
emit-value label="เลือกประเภททุน"
map-options @update:model-value="fetchNewList"
option-value="id" class="type"
option-label="name" />
label="เลือกประเภททุน"
@update:model-value="fetchNewList"
style="width: 350px"
/>
</div>
</div> </div>
<q-toolbar-title>
<q-btn
flat
round
dense
icon="add"
color="primary"
@click="onClickAddOrView()"
>
<q-tooltip>เพ</q-tooltip>
</q-btn>
<q-space />
<div class="row q-gutter-sm">
<q-btn <q-btn
flat flat
round round
dense dense
icon="add" icon="mdi-arrow-down-bold-circle-outline"
color="primary" color="blue"
@click="onClickAddOrView()" @click="onDownload"
> >
<q-tooltip>เพ</q-tooltip> <q-tooltip>ดาวนโหลด</q-tooltip>
</q-btn> </q-btn>
</q-toolbar-title>
<q-space /> <q-input
<div class="row q-gutter-sm"> standout
<div> dense
<q-btn v-model="formQuery.keyword"
flat ref="filterRef"
round outlined
dense placeholder="ค้นหา"
icon="mdi-arrow-down-bold-circle-outline" @keyup.enter="fetchNewList()"
color="blue" >
@click="onDownload" <template v-slot:append>
> <q-icon v-if="formQuery.keyword == ''" name="search" />
<q-tooltip>ดาวนโหลด</q-tooltip> <q-icon
</q-btn> v-if="formQuery.keyword !== ''"
<!-- <q-btn name="clear"
flat class="cursor-pointer"
round @click="(formQuery.keyword = ''), fetchNewList()"
color="blue" />
icon="mdi-arrow-down-bold-circle-outline" </template>
> </q-input>
<q-menu>
<q-list style="min-width: 100px" dense> <q-select
<q-item clickable v-close-popup v-for="items in itemDownload"> v-model="visibleColumns"
<q-item-section avatar> multiple
<q-icon :color="items.color" :name="items.icon" /> outlined
</q-item-section> dense
<q-item-section :class="`text-${items.color}`">{{ options-dense
items.label :display-value="$q.lang.table.columns"
}}</q-item-section> emit-value
</q-item> map-options
</q-list> :options="columns"
</q-menu> option-value="name"
<q-tooltip>ดาวนโหลด</q-tooltip> options-cover
</q-btn> --> style="min-width: 150px"
</div> />
<div>
<q-input
standout
dense
v-model="formQuery.keyword"
ref="filterRef"
outlined
placeholder="ค้นหา"
@keyup.enter="fetchNewList()"
>
<template v-slot:append>
<q-icon v-if="formQuery.keyword == ''" name="search" />
<q-icon
v-if="formQuery.keyword !== ''"
name="clear"
class="cursor-pointer"
@click="(formQuery.keyword = ''), fetchNewList()"
/>
</template>
</q-input>
</div>
<div>
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
/>
</div>
</div> </div>
</q-toolbar> </q-toolbar>
@ -416,4 +386,11 @@ onMounted(() => {
</q-card> </q-card>
</template> </template>
<style scoped></style> <style scoped>
.q-select.type >>> .q-field__native > span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 200px;
}
</style>

View file

@ -733,15 +733,18 @@ watch(
@click="link = menuItem.label" @click="link = menuItem.label"
active-class="text-primary menuActiveMini text-weight-medium" active-class="text-primary menuActiveMini text-weight-medium"
v-if=" v-if="
menuItem.key == 3 || menuItem.key == 2 ||
menuItem.key == 5 || menuItem.key == 0 ||
menuItem.key == 6 ||
menuItem.key == 7 || menuItem.key == 7 ||
menuItem.key == 8 || menuItem.key == 8 ||
menuItem.key == 9 || menuItem.key == 9 ||
menuItem.key == 10 ||
menuItem.key == 11 || menuItem.key == 11 ||
menuItem.key == 12 || menuItem.key == 12 ||
menuItem.key == 14 menuItem.key == 13 ||
menuItem.key == 14 ||
menuItem.key == 15 ||
menuItem.key == 16
" "
> >
<div class="row items-center no-wrap"> <div class="row items-center no-wrap">
@ -772,8 +775,24 @@ watch(
:to="{ name: `${subMenu.path}` }" :to="{ name: `${subMenu.path}` }"
> >
<!-- เมนอย 2 --> <!-- เมนอย 2 -->
<div v-if="menuItem.key == 5"> <div
<q-item dense clickable v-if="subMenu.key !== 5.1"> v-if="
menuItem.key == 2 ||
menuItem.key == 7 ||
menuItem.key == 12 ||
menuItem.key == 13
"
>
<q-item
dense
clickable
v-if="
subMenu.key !== 2.0 &&
subMenu.key !== 7.1 &&
subMenu.key !== 12.0 &&
subMenu.key !== 13.0
"
>
<q-item-section <q-item-section
>{{ subMenu.label }} >{{ subMenu.label }}
</q-item-section> </q-item-section>
@ -898,16 +917,18 @@ watch(
expand-icon="mdi-chevron-down" expand-icon="mdi-chevron-down"
expanded-icon="mdi-chevron-up" expanded-icon="mdi-chevron-up"
v-if=" v-if="
menuItem.key == 3 || menuItem.key == 2 ||
menuItem.key == 5 || menuItem.key == 0 ||
menuItem.key == 6 ||
menuItem.key == 7 || menuItem.key == 7 ||
menuItem.key == 8 || menuItem.key == 8 ||
menuItem.key == 9 || menuItem.key == 9 ||
menuItem.key == 10 ||
menuItem.key == 11 || menuItem.key == 11 ||
menuItem.key == 12 || menuItem.key == 12 ||
menuItem.key == 13 || menuItem.key == 13 ||
menuItem.key == 14 menuItem.key == 14 ||
menuItem.key == 15 ||
menuItem.key == 16
" "
> >
<template v-slot:header> <template v-slot:header>
@ -924,7 +945,10 @@ watch(
<!-- เมนอย 2 (สรรหา) --> <!-- เมนอย 2 (สรรหา) -->
<div <div
v-if=" v-if="
menuItem.key == 5 || menuItem.key == 11 || menuItem.key == 3 menuItem.key == 2 ||
menuItem.key == 7 ||
menuItem.key == 12 ||
menuItem.key == 13
" "
> >
<div v-for="(subMenu, i) in menuItem.children" :key="i"> <div v-for="(subMenu, i) in menuItem.children" :key="i">
@ -933,18 +957,10 @@ watch(
dense-toggle dense-toggle
:label="subMenu.label" :label="subMenu.label"
v-if=" v-if="
subMenu.key !== 5.1 && subMenu.key !== 2.0 &&
subMenu.key !== 11.1 && subMenu.key !== 7.1 &&
subMenu.key !== 11.2 && subMenu.key !== 12.0 &&
subMenu.key !== 11.3 && subMenu.key !== 13.0
subMenu.key !== 11.4 &&
subMenu.key !== 11.5 &&
subMenu.key !== 3.1 &&
subMenu.key !== 3.2 &&
subMenu.key !== 3.3 &&
subMenu.key !== 3.4 &&
subMenu.key !== 3.5 &&
subMenu.key !== 3.7
" "
class="expan2" class="expan2"
dense dense