Merge branch 'develop' into devTee
# Conflicts: # src/api/14_KPI/api.KPI.ts
This commit is contained in:
STW_TTTY\stwtt
commit
7f0411e710
19 changed files with 1338 additions and 1192 deletions
|
|
@ -2,7 +2,7 @@ import env from "../index";
|
|||
const KPI = `${env.API_URI}/kpi`;
|
||||
const kpiPeriod = `${env.API_URI}/kpi/period`;
|
||||
const kpiEvaluation = `${env.API_URI}/kpi/evaluation`;
|
||||
|
||||
const kpiGroup = `${env.API_URI}/kpi/group`;
|
||||
export default {
|
||||
KPI,
|
||||
/** รอบการประเมินผล*/
|
||||
|
|
@ -12,5 +12,9 @@ export default {
|
|||
|
||||
|
||||
/** role */
|
||||
kpiRoleMainList:`${KPI}/role`
|
||||
kpiRoleMainList:`${KPI}/role`,
|
||||
|
||||
|
||||
kpiGroup,
|
||||
kpiGroupById: (id: string) => `${kpiGroup}/${id}`
|
||||
};
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ const menuList = readonly<any[]>([
|
|||
role: "dashboard",
|
||||
},
|
||||
{
|
||||
key: 3,
|
||||
key: 2,
|
||||
icon: "o_person",
|
||||
activeIcon: "person",
|
||||
label: "ข้อมูลหลัก (ใหม่)",
|
||||
|
|
@ -60,43 +60,41 @@ const menuList = readonly<any[]>([
|
|||
role: "metadata",
|
||||
children: [
|
||||
{
|
||||
key: 3.1,
|
||||
key: 2.0,
|
||||
label: "ข้อมูลเกี่ยวกับบุคคล",
|
||||
path: "masterPersonal",
|
||||
},
|
||||
{
|
||||
key: 3.2,
|
||||
key: 2.0,
|
||||
label: "ข้อมูลตำแหน่งข้าราชการฯ",
|
||||
path: "masterPosition",
|
||||
},
|
||||
{
|
||||
key: 3.3,
|
||||
key: 2.0,
|
||||
label: "ข้อมูลตำแหน่งลูกจ้างประจำ",
|
||||
path: "masterPositionEmployee",
|
||||
},
|
||||
{
|
||||
key: 3.4,
|
||||
key: 2.0,
|
||||
label: "ข้อมูลปฏิทินวันหยุด",
|
||||
path: "masterCalendarWork",
|
||||
},
|
||||
{
|
||||
key: 3.5,
|
||||
key: 2.0,
|
||||
label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
|
||||
path: "masterInsignia",
|
||||
},
|
||||
{
|
||||
key: 3.6,
|
||||
key: 2.1,
|
||||
label: "ตัวชี้วัด",
|
||||
role: "evaluateKPI",
|
||||
children: [
|
||||
{
|
||||
key: 3.61,
|
||||
label: "ตามแผน",
|
||||
path: "KPIIndicatorByPlan",
|
||||
role: "evaluateKPI",
|
||||
},
|
||||
{
|
||||
key: 3.62,
|
||||
label: "ตามตำแหน่ง",
|
||||
path: "KPIIndicatorByRole",
|
||||
role: "evaluateKPI",
|
||||
|
|
@ -104,7 +102,7 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 3.7,
|
||||
key: 2.0,
|
||||
label: "สมรรถนะ",
|
||||
path: "KPICompetency",
|
||||
role: "evaluateKPI",
|
||||
|
|
@ -112,52 +110,15 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 4,
|
||||
key: 3,
|
||||
icon: "o_groups",
|
||||
activeIcon: "groups",
|
||||
label: "โครงสร้างอัตรากำลัง (ใหม่)",
|
||||
path: "organizationalNew",
|
||||
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",
|
||||
activeIcon: "groups",
|
||||
label: "อัตรากำลังลูกจ้างประจำฯ",
|
||||
|
|
@ -173,7 +134,7 @@ const menuList = readonly<any[]>([
|
|||
role: "organization",
|
||||
},
|
||||
{
|
||||
key: 2,
|
||||
key: 100,
|
||||
icon: "o_person",
|
||||
activeIcon: "person",
|
||||
label: "ข้อมูลหลัก",
|
||||
|
|
@ -181,7 +142,7 @@ const menuList = readonly<any[]>([
|
|||
role: "metadata",
|
||||
},
|
||||
{
|
||||
key: 3,
|
||||
key: 0,
|
||||
icon: "o_groups",
|
||||
activeIcon: "groups",
|
||||
label: "โครงสร้างอัตรากำลัง",
|
||||
|
|
@ -242,7 +203,7 @@ const menuList = readonly<any[]>([
|
|||
role: "registryverify",
|
||||
},
|
||||
{
|
||||
key: 10,
|
||||
key: 5,
|
||||
icon: "o_contact_page",
|
||||
activeIcon: "registry_employee_page",
|
||||
label: "ทะเบียนประวัติลูกจ้าง",
|
||||
|
|
@ -250,7 +211,7 @@ const menuList = readonly<any[]>([
|
|||
role: "registryEmployee",
|
||||
},
|
||||
{
|
||||
key: 10,
|
||||
key: 6,
|
||||
icon: "mdi-file-certificate-outline",
|
||||
activeIcon: "order",
|
||||
label: "ออกคำสั่ง",
|
||||
|
|
@ -258,7 +219,7 @@ const menuList = readonly<any[]>([
|
|||
role: "order",
|
||||
},
|
||||
{
|
||||
key: 5,
|
||||
key: 7,
|
||||
icon: "o_search",
|
||||
activeIcon: "search",
|
||||
label: "สรรหา",
|
||||
|
|
@ -268,13 +229,13 @@ const menuList = readonly<any[]>([
|
|||
{
|
||||
label: "ตั้งค่าเว็บสรรหา",
|
||||
path: "editorweb",
|
||||
key: 5.1,
|
||||
key: 7.1,
|
||||
role: "recruit",
|
||||
},
|
||||
{
|
||||
label: "สอบแข่งขัน",
|
||||
path: "",
|
||||
key: 5.2,
|
||||
key: 7.2,
|
||||
role: "recruit",
|
||||
children: [
|
||||
{
|
||||
|
|
@ -292,7 +253,7 @@ const menuList = readonly<any[]>([
|
|||
{
|
||||
label: "คัดเลือก",
|
||||
path: "",
|
||||
key: 5.3,
|
||||
key: 7.3,
|
||||
role: "recruit",
|
||||
children: [
|
||||
{
|
||||
|
|
@ -325,7 +286,7 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 6,
|
||||
key: 8,
|
||||
path: "placement",
|
||||
icon: "how_to_reg",
|
||||
activeIcon: "how_to_reg",
|
||||
|
|
@ -333,67 +294,46 @@ const menuList = readonly<any[]>([
|
|||
role: "placement",
|
||||
children: [
|
||||
{
|
||||
key: 6.1,
|
||||
label: "รายชื่อผู้สอบผ่าน",
|
||||
path: "placement",
|
||||
role: "placement",
|
||||
},
|
||||
// {
|
||||
// key: 6.2,
|
||||
// label: "ออกคำสั่ง",
|
||||
// path: "Orderplacement",
|
||||
// role: "placement",
|
||||
// },
|
||||
{
|
||||
key: 6.3,
|
||||
label: "การทดลองปฏิบัติหน้าที่ราชการ",
|
||||
path: "probation",
|
||||
role: "probation",
|
||||
},
|
||||
{
|
||||
key: 6.4,
|
||||
label: "รายการขอโอน",
|
||||
path: "transfer",
|
||||
role: "placement",
|
||||
},
|
||||
{
|
||||
key: 6.5,
|
||||
label: "รายการรับโอน",
|
||||
path: "receive",
|
||||
role: "placement",
|
||||
},
|
||||
{
|
||||
key: 6.6,
|
||||
label: "รายการช่วยราชการ",
|
||||
path: "help-government",
|
||||
role: "placement",
|
||||
},
|
||||
{
|
||||
key: 6.7,
|
||||
label: "รายการส่งตัวกลับ",
|
||||
path: "repatriate",
|
||||
role: "placement",
|
||||
},
|
||||
{
|
||||
key: 6.8,
|
||||
label: "รายการแต่งตั้ง-เลื่อน-ย้าย",
|
||||
path: "appoint-promote",
|
||||
role: "placement",
|
||||
},
|
||||
{
|
||||
key: 6.8,
|
||||
label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง",
|
||||
path: "appoint-employee",
|
||||
role: "placement",
|
||||
},
|
||||
// {
|
||||
// key: 6.9,
|
||||
// label: "รายการย้าย",
|
||||
// path: "relocation",
|
||||
// role: "placement",
|
||||
// },
|
||||
{
|
||||
key: 6.1,
|
||||
label: "รายการอื่นๆ",
|
||||
path: "other",
|
||||
role: "placement",
|
||||
|
|
@ -401,7 +341,7 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 7,
|
||||
key: 9,
|
||||
icon: "mdi-account-cancel-outline",
|
||||
activeIcon: "mdi-account-cancel",
|
||||
label: "พ้นจากราชการ",
|
||||
|
|
@ -409,51 +349,34 @@ const menuList = readonly<any[]>([
|
|||
role: "retirement",
|
||||
children: [
|
||||
{
|
||||
key: 7.1,
|
||||
label: "ประกาศเกษียณ",
|
||||
path: "retirement",
|
||||
role: "retirement",
|
||||
},
|
||||
{
|
||||
key: 7.2,
|
||||
label: "รายการลาออก",
|
||||
path: "resign",
|
||||
role: "retirement",
|
||||
},
|
||||
{
|
||||
key: 7.3,
|
||||
label: "Exit interview",
|
||||
path: "exit-Interview",
|
||||
role: "retirement",
|
||||
},
|
||||
{
|
||||
key: 7.4,
|
||||
label: "รายการบันทึกการถึงแก่กรรม",
|
||||
path: "deceased",
|
||||
role: "retirement",
|
||||
},
|
||||
{
|
||||
key: 7.5,
|
||||
label: "รายการให้ออก",
|
||||
path: "dismiss-order",
|
||||
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",
|
||||
activeIcon: "mdi-medal",
|
||||
label: "เครื่องราชฯ",
|
||||
|
|
@ -461,37 +384,31 @@ const menuList = readonly<any[]>([
|
|||
role: "insignia",
|
||||
children: [
|
||||
{
|
||||
key: 8.1,
|
||||
label: "รอบการเสนอขอ",
|
||||
path: "insigniaProposals",
|
||||
role: "insignia",
|
||||
},
|
||||
{
|
||||
key: 8.2,
|
||||
label: "จัดการคำขอ",
|
||||
path: "insigniaManage",
|
||||
role: "insignia",
|
||||
},
|
||||
{
|
||||
key: 8.3,
|
||||
label: "บันทึกผลการเสนอขอ",
|
||||
path: "insigniaRecord",
|
||||
role: "insignia",
|
||||
},
|
||||
{
|
||||
key: 8.4,
|
||||
label: "จัดสรรเครื่องราชฯ",
|
||||
path: "insigniaAllocate",
|
||||
role: "insignia",
|
||||
},
|
||||
{
|
||||
key: 8.6,
|
||||
label: "ยืม-คืนเครื่องราชฯ",
|
||||
path: "insigniaBorrow",
|
||||
role: "insignia",
|
||||
},
|
||||
{
|
||||
key: 8.5,
|
||||
label: "รายงาน",
|
||||
path: "insigniaReport",
|
||||
role: "insignia",
|
||||
|
|
@ -499,7 +416,7 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 9,
|
||||
key: 11,
|
||||
icon: "mdi-calendar",
|
||||
activeIcon: "mdi-calendar",
|
||||
label: "การลา",
|
||||
|
|
@ -507,37 +424,31 @@ const menuList = readonly<any[]>([
|
|||
role: "leave",
|
||||
children: [
|
||||
{
|
||||
key: 9.1,
|
||||
label: "รอบการปฏิบัติงาน",
|
||||
path: "/round-time",
|
||||
role: "leave",
|
||||
},
|
||||
{
|
||||
key: 9.2,
|
||||
label: "แก้ไขรอบการปฎิบัติงานผู้ใช้งาน",
|
||||
path: "/change-round",
|
||||
role: "leave",
|
||||
},
|
||||
{
|
||||
key: 9.3,
|
||||
label: "รายการลงเวลาปฏิบัติงาน",
|
||||
path: "/work-list",
|
||||
role: "leave",
|
||||
},
|
||||
{
|
||||
key: 9.4,
|
||||
label: "ลงเวลากรณีพิเศษ",
|
||||
path: "/timestamp-special",
|
||||
role: "leave",
|
||||
},
|
||||
{
|
||||
key: 9.5,
|
||||
label: "รายการลา",
|
||||
path: "/leave",
|
||||
role: "leave",
|
||||
},
|
||||
{
|
||||
key: 9.6,
|
||||
label: "รายงานสถิติการลา",
|
||||
path: "/leave-report",
|
||||
role: "leave",
|
||||
|
|
@ -545,56 +456,50 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 11,
|
||||
key: 12,
|
||||
icon: "mdi-scale-balance",
|
||||
activeIcon: "mdi-scale-balance",
|
||||
label: "วินัย",
|
||||
role: "discipline",
|
||||
children: [
|
||||
{
|
||||
key: 11.1,
|
||||
key: 12.0,
|
||||
label: "เรื่องร้องเรียน",
|
||||
path: "disciplineComplaints",
|
||||
role: "discipline",
|
||||
},
|
||||
{
|
||||
key: 11.2,
|
||||
key: 12.0,
|
||||
label: "สืบสวนข้อเท็จจริง",
|
||||
path: "disciplineInvestigatefacts",
|
||||
role: "discipline",
|
||||
},
|
||||
{
|
||||
key: 11.3,
|
||||
key: 12.0,
|
||||
label: "สอบสวนความผิดทางวินัย",
|
||||
path: "disciplineDisciplinary",
|
||||
role: "discipline",
|
||||
},
|
||||
{
|
||||
key: 11.4,
|
||||
key: 12.0,
|
||||
label: "สรุปผลการพิจารณาความผิดทางวินัย",
|
||||
path: "disciplineResult",
|
||||
role: "discipline",
|
||||
},
|
||||
{
|
||||
key: 11.5,
|
||||
key: 12.0,
|
||||
label: "รายชื่อผู้ถูกพักราชการ",
|
||||
path: "disciplineListSuspend",
|
||||
role: "discipline",
|
||||
},
|
||||
// {
|
||||
// key: 11.5,
|
||||
// label: "รายงาน",
|
||||
// path: "disciplineReport",
|
||||
// role: "discipline",
|
||||
// },
|
||||
{
|
||||
key: 11.5,
|
||||
key: 12.0,
|
||||
label: "อุทธรณ์/ร้องทุกข์",
|
||||
path: "appealComplain",
|
||||
role: "discipline",
|
||||
},
|
||||
{
|
||||
key: 11.5,
|
||||
key: 12.0,
|
||||
label: "ออกคำสั่งลงโทษทางวินัย",
|
||||
path: "disciplineOrder",
|
||||
role: "discipline",
|
||||
|
|
@ -602,7 +507,7 @@ const menuList = readonly<any[]>([
|
|||
{
|
||||
label: "ข้อมูลพื้นฐาน",
|
||||
path: "",
|
||||
key: 11.7,
|
||||
key: 12.1,
|
||||
role: "discipline",
|
||||
children: [
|
||||
{
|
||||
|
|
@ -620,14 +525,14 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 11,
|
||||
key: 13,
|
||||
icon: "mdi-account-check",
|
||||
activeIcon: "mdi-account-check",
|
||||
label: "ประเมินบุคคล",
|
||||
role: "evaluate",
|
||||
children: [
|
||||
{
|
||||
key: 11.1,
|
||||
key: 13.0,
|
||||
label: "คำขอประเมิน",
|
||||
path: "evaluate",
|
||||
role: "discipline",
|
||||
|
|
@ -635,7 +540,7 @@ const menuList = readonly<any[]>([
|
|||
{
|
||||
label: "กรรมการและการประชุม",
|
||||
path: "",
|
||||
key: 11.7,
|
||||
key: 13.1,
|
||||
role: "evaluate",
|
||||
children: [
|
||||
{
|
||||
|
|
@ -653,44 +558,38 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 12,
|
||||
key: 14,
|
||||
icon: "mdi-cash",
|
||||
activeIcon: "mdi-cash",
|
||||
label: "เงินเดือน/ค่าจ้าง",
|
||||
role: "salary",
|
||||
children: [
|
||||
{
|
||||
key: 12.1,
|
||||
label: "ผังบัญชีเงินเดือนข้าราชการฯ",
|
||||
path: "salaryChart",
|
||||
role: "salary",
|
||||
},
|
||||
{
|
||||
key: 12.2,
|
||||
label: "ผังบัญชีค่าจ้างลูกจ้างประจำ",
|
||||
path: "salaryEmployeeChart",
|
||||
role: "salary",
|
||||
},
|
||||
{
|
||||
key: 12.3,
|
||||
label: "รอบการขึ้นเงินเดือน",
|
||||
path: "salaryRound",
|
||||
role: "salary",
|
||||
},
|
||||
{
|
||||
key: 12.4,
|
||||
label: "เลื่อนเงินเดือนข้าราชการฯ",
|
||||
path: "salaryLists",
|
||||
role: "salary",
|
||||
},
|
||||
{
|
||||
key: 12.5,
|
||||
label: "เลื่อนค่าจ้างลูกจ้างประจำ",
|
||||
path: "salaryEmployeeLists",
|
||||
role: "salary",
|
||||
},
|
||||
{
|
||||
key: 12.6,
|
||||
label: "ออกคำสั่งเลื่อนเงินเดือน/ค่าจ้าง",
|
||||
path: "commandSalary",
|
||||
role: "salary",
|
||||
|
|
@ -698,14 +597,13 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 13,
|
||||
key: 15,
|
||||
icon: "mdi-account-star",
|
||||
activeIcon: "mdi-account-star",
|
||||
label: "ประเมินผลการปฏิบัติราชการระดับบุคคล",
|
||||
role: "evaluateKPI",
|
||||
children: [
|
||||
{
|
||||
key: 13.1,
|
||||
label: "รอบการประเมิน",
|
||||
path: "KPIRound",
|
||||
role: "evaluateKPI",
|
||||
|
|
@ -713,52 +611,39 @@ const menuList = readonly<any[]>([
|
|||
],
|
||||
},
|
||||
{
|
||||
key: 14,
|
||||
key: 16,
|
||||
icon: "mdi-briefcase-account",
|
||||
activeIcon: "mdi-briefcase-account",
|
||||
label: "พัฒนาบุคลากร",
|
||||
role: "development",
|
||||
children: [
|
||||
{
|
||||
key: 14.1,
|
||||
label: "โครงการ/หลักสูตรการฝึกอบรม",
|
||||
path: "developmentMain",
|
||||
role: "development",
|
||||
},
|
||||
{
|
||||
key: 14.2,
|
||||
label: "ประวัติฝึกอบรม/ดูงาน ขรก.",
|
||||
path: "developmentHistory",
|
||||
role: "development",
|
||||
},
|
||||
{
|
||||
key: 14.3,
|
||||
label: "ประวัติฝึกอบรม/ดูงานลูกจ้าง",
|
||||
path: "developmentEmployeeHistory",
|
||||
role: "development",
|
||||
},
|
||||
{
|
||||
key: 14.4,
|
||||
label: "ทุนการศึกษา/ฝึกอบรม",
|
||||
path: "developmentScholarship",
|
||||
role: "development",
|
||||
},
|
||||
{
|
||||
key: 14.5,
|
||||
label: "ยุทธศาสตร์",
|
||||
path: "developmentStrategic",
|
||||
role: "development",
|
||||
},
|
||||
],
|
||||
},
|
||||
// {
|
||||
// key: 99,
|
||||
// icon: "mdi-chat",
|
||||
// activeIcon: "mdi-chat",
|
||||
// label: "ถาม-ตอบ",
|
||||
// role: "support",
|
||||
// path: "support",
|
||||
// },
|
||||
]);
|
||||
|
||||
const tabList = readonly<tabType[]>([
|
||||
|
|
|
|||
|
|
@ -18,23 +18,23 @@ const rows = ref<any>();
|
|||
|
||||
const competencyTypeOp = ref<DataOption[]>([
|
||||
{
|
||||
id: "ID1",
|
||||
id: "HEAD",
|
||||
name: "สมรรถนะหลัก",
|
||||
},
|
||||
{
|
||||
id: "ID2",
|
||||
id: "GROUP",
|
||||
name: "สมรรถนะประจำกลุ่มงาน",
|
||||
},
|
||||
{
|
||||
id: "ID3",
|
||||
id: "EXECUTIVE",
|
||||
name: "สมรรถนะประจำผู้บริหารกรุงเทพมหานคร",
|
||||
},
|
||||
{
|
||||
id: "ID4",
|
||||
id: "DIRECTOR",
|
||||
name: "สมรรถนะเฉพาะสำหรับตำแหน่ง ผอ.เขต ผช.ผอ.เขต และหัวหน้าฝ่ายในสังกัด สนง.เขต",
|
||||
},
|
||||
{
|
||||
id: "ID5",
|
||||
id: "INSPECTOR",
|
||||
name: "สมรรถนะเฉพาะสำหรับตำแหน่งผู้ตรวจราชการ กทม. และผู้ตรวจราชการ",
|
||||
},
|
||||
]);
|
||||
|
|
@ -64,11 +64,11 @@ const visibleColumns = ref<string[]>(["competency"]);
|
|||
async function getData() {
|
||||
const data = [
|
||||
{
|
||||
id: "ID1",
|
||||
id: "1",
|
||||
competency: "รายการสมรรถะ 1",
|
||||
},
|
||||
{
|
||||
id: "ID2",
|
||||
id: "2",
|
||||
competency: "รายการสมรรถะ 2",
|
||||
},
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,21 +3,19 @@ import { ref, onMounted } from "vue";
|
|||
import type { QTableProps } from "quasar";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useRouter } from "vue-router";
|
||||
|
||||
import Header from "@/components/DialogHeader.vue";
|
||||
import dialogHeader from "@/components/DialogHeader.vue";
|
||||
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
|
||||
|
||||
import type { ResponseObject } from "@/modules/14_KPI/interface/response/KpiGroup";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const modal = ref<boolean>(false);
|
||||
const router = useRouter();
|
||||
const rows = ref<any>();
|
||||
const rows = ref<ResponseObject[]>([]);
|
||||
const groupName = ref<string>("");
|
||||
|
||||
const editStatus = ref<boolean>(false);
|
||||
|
||||
const editId = ref<string>("");
|
||||
const competencyTypeOp = ref<DataOption[]>([
|
||||
{
|
||||
id: "ID1",
|
||||
|
|
@ -42,11 +40,11 @@ const competencyTypeOp = ref<DataOption[]>([
|
|||
]);
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "groupName",
|
||||
name: "nameGroupKPI",
|
||||
align: "left",
|
||||
label: "รายการกลุ่มงาน",
|
||||
sortable: true,
|
||||
field: "groupName",
|
||||
field: "nameGroupKPI",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
sort: (a: string, b: string) =>
|
||||
|
|
@ -56,71 +54,81 @@ const columns = ref<QTableProps["columns"]>([
|
|||
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
|
||||
|
||||
const competencyType = ref<string>("ID1");
|
||||
const {
|
||||
dialogRemove,
|
||||
dialogConfirm,
|
||||
showLoader,
|
||||
hideLoader,
|
||||
messageError,
|
||||
success,
|
||||
} = mixin;
|
||||
const filterKeyword = ref<string>("");
|
||||
|
||||
const visibleColumns = ref<string[]>(["groupName"]);
|
||||
const visibleColumns = ref<string[]>(["nameGroupKPI"]);
|
||||
|
||||
/** ดึงข้อมูล */
|
||||
async function getData() {
|
||||
const data = [
|
||||
{
|
||||
id: "ID1",
|
||||
groupName: "กลุ่มงาน 1",
|
||||
},
|
||||
{
|
||||
id: "ID2",
|
||||
groupName: "กลุ่มงาน 2",
|
||||
},
|
||||
];
|
||||
rows.value = data;
|
||||
// showLoader();
|
||||
// await http
|
||||
// .get(config.API.orgPrefix)
|
||||
// .then(async (res) => {
|
||||
// })
|
||||
// .catch((err) => {
|
||||
// messageError($q, err);
|
||||
// })
|
||||
// .finally(() => {
|
||||
// hideLoader();
|
||||
// });
|
||||
async function fetchData() {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.kpiGroup)
|
||||
.then(async (res) => {
|
||||
rows.value = res.data.result.data;
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
async function addData() {
|
||||
await http
|
||||
.post(config.API.kpiGroup, {
|
||||
nameGroupKPI: groupName.value,
|
||||
})
|
||||
.then(() => {
|
||||
fetchData();
|
||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
async function editData(id: string) {
|
||||
console.log(id);
|
||||
// await http
|
||||
// .put(config.API.orgPrefixId(id), {
|
||||
// name: prefix.value,
|
||||
// })
|
||||
// .then(() => {
|
||||
// getData();
|
||||
// success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
// })
|
||||
// .catch((err) => {
|
||||
// messageError($q, err);
|
||||
// })
|
||||
// .finally(() => {
|
||||
// hideLoader();
|
||||
// });
|
||||
await http
|
||||
.put(config.API.kpiGroupById(id), {
|
||||
nameGroupKPI: groupName.value,
|
||||
})
|
||||
.then(() => {
|
||||
fetchData();
|
||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
async function deleteData(id: string) {
|
||||
console.log(id);
|
||||
// await http
|
||||
// .delete(config.API.orgPrefixId(id))
|
||||
// .then(() => {
|
||||
// getData();
|
||||
// success($q, "ลบข้อมูลสำเร็จ");
|
||||
// })
|
||||
// .catch((err) => {
|
||||
// messageError($q, err);
|
||||
// })
|
||||
// .finally(() => {
|
||||
// hideLoader();w
|
||||
// });
|
||||
await http
|
||||
.delete(config.API.kpiGroupById(id))
|
||||
.then(() => {
|
||||
fetchData();
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
/** เปลี่ยนเป็นหน้าเพิ่มข้อมูล */
|
||||
|
|
@ -128,42 +136,38 @@ function onAdd() {
|
|||
modal.value = true;
|
||||
}
|
||||
|
||||
function close() {
|
||||
function closeDialog() {
|
||||
modal.value = false;
|
||||
editStatus.value = false;
|
||||
groupName.value = ''
|
||||
groupName.value = "";
|
||||
}
|
||||
|
||||
function onEdit(data: any) {
|
||||
modal.value = true;
|
||||
editStatus.value = true;
|
||||
groupName.value = data.groupName
|
||||
groupName.value = data.nameGroupKPI;
|
||||
editId.value = data.id;
|
||||
}
|
||||
|
||||
function onSubmit() {
|
||||
console.log("save");
|
||||
close()
|
||||
async function onSubmit() {
|
||||
dialogConfirm(
|
||||
$q,
|
||||
async () => {
|
||||
editStatus.value ? editData(editId.value) : addData();
|
||||
closeDialog();
|
||||
},
|
||||
"ยืนยันการบันทึกข้อมูล",
|
||||
"ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
|
||||
);
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
getData();
|
||||
fetchData();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<q-toolbar style="padding: 0">
|
||||
<!-- <q-select
|
||||
v-model="competencyType"
|
||||
outlined
|
||||
label="ประเภทสมรรถนะ"
|
||||
dense
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
:options="competencyTypeOp"
|
||||
style="min-width: 200px"
|
||||
emit-value
|
||||
map-options
|
||||
/> -->
|
||||
<q-btn flat round color="primary" icon="add" @click="onAdd()">
|
||||
<q-tooltip> เพิ่มข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
|
|
@ -210,15 +214,11 @@ onMounted(async () => {
|
|||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.id"
|
||||
@click="onEdit(props.row)"
|
||||
>
|
||||
<q-td v-for="col in props.cols" :key="col.id">
|
||||
{{ col.value }}
|
||||
</q-td>
|
||||
<q-td auto-width>
|
||||
<!-- <q-btn
|
||||
<q-btn
|
||||
color="edit"
|
||||
flat
|
||||
dense
|
||||
|
|
@ -227,17 +227,10 @@ onMounted(async () => {
|
|||
size="12px"
|
||||
icon="edit"
|
||||
clickable
|
||||
@click.stop="
|
||||
() => {
|
||||
dialogStatus = 'edit';
|
||||
dialog = true;
|
||||
prefix = props.row.name;
|
||||
editId = props.row.id;
|
||||
}
|
||||
"
|
||||
@click="onEdit(props.row)"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn> -->
|
||||
</q-btn>
|
||||
<q-btn
|
||||
color="red"
|
||||
flat
|
||||
|
|
@ -261,9 +254,9 @@ onMounted(async () => {
|
|||
<q-dialog v-model="modal" persistent>
|
||||
<q-card flat bordered style="min-width: 50vh">
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit">
|
||||
<Header
|
||||
<dialog-header
|
||||
:tittle="editStatus ? 'แก้ไขกลุ่มงาน' : 'เพิ่มกลุ่มงาน'"
|
||||
:close="close"
|
||||
:close="closeDialog"
|
||||
/>
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
import { ref, reactive } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
|
||||
import FormMain from "@/modules/14_KPI/components/competency/Forms/01_FormMain.vue";
|
||||
import FormGroup from "@/modules/14_KPI/components/competency/Forms/02_FormGroup.vue";
|
||||
import FormExecutive from "@/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue";
|
||||
import FormExecutivePosition from "@/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue";
|
||||
import FormExecutiveLevel from "@/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue";
|
||||
import Main from "@/modules/14_KPI/components/competency/Forms/Main.vue";
|
||||
// import FormMain from "@/modules/14_KPI/components/competency/Forms/01_FormMain.vue";
|
||||
// import FormGroup from "@/modules/14_KPI/components/competency/Forms/02_FormGroup.vue";
|
||||
// import FormExecutive from "@/modules/14_KPI/components/competency/Forms/03_FormExecutive.vue";
|
||||
// import FormExecutivePosition from "@/modules/14_KPI/components/competency/Forms/04_FormExecutivePosition.vue";
|
||||
// import FormExecutiveLevel from "@/modules/14_KPI/components/competency/Forms/05_FormExecutiveLevel.vue";
|
||||
import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
|
||||
|
||||
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
|
||||
|
|
@ -29,23 +30,23 @@ const formData = reactive<FormCompetency>({
|
|||
|
||||
const competencyTypeOp = ref<DataOption[]>([
|
||||
{
|
||||
id: "ID1",
|
||||
id: "HEAD",
|
||||
name: "สมรรถนะหลัก",
|
||||
},
|
||||
{
|
||||
id: "ID2",
|
||||
id: "GROUP",
|
||||
name: "สมรรถนะประจำกลุ่มงาน",
|
||||
},
|
||||
{
|
||||
id: "ID3",
|
||||
id: "EXECUTIVE",
|
||||
name: "สมรรถนะประจำผู้บริหารกรุงเทพมหานคร",
|
||||
},
|
||||
{
|
||||
id: "ID4",
|
||||
id: "DIRECTOR",
|
||||
name: "สมรรถนะเฉพาะสำหรับตำแหน่ง ผอ.เขต ผช.ผอ.เขต และหัวหน้าฝ่ายในสังกัด สนง.เขต",
|
||||
},
|
||||
{
|
||||
id: "ID5",
|
||||
id: "INSPECTOR",
|
||||
name: "สมรรถนะเฉพาะสำหรับตำแหน่งผู้ตรวจราชการ กทม. และผู้ตรวจราชการ",
|
||||
},
|
||||
]);
|
||||
|
|
@ -108,134 +109,13 @@ function onSubmit() {
|
|||
/>
|
||||
</div>
|
||||
|
||||
<FormMain v-if="store.competencyType === 'ID1'" />
|
||||
<Main />
|
||||
<!-- <FormMain v-if="store.competencyType === 'ID1'" />
|
||||
<FormGroup v-else-if="store.competencyType === 'ID2'" />
|
||||
<FormExecutive v-else-if="store.competencyType === 'ID3'" />
|
||||
<FormExecutivePosition v-else-if="store.competencyType === 'ID4'" />
|
||||
<FormExecutiveLevel v-else-if="store.competencyType === 'ID5'" />
|
||||
|
||||
<!-- <div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.competencyName"
|
||||
dense
|
||||
outlined
|
||||
label="ชื่อสมรรถนะ"
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกชื่อสมรรถนะ'}`,]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.definition"
|
||||
label="คำจำกัดความ"
|
||||
dense
|
||||
type="textarea"
|
||||
outlined
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกคำจำกัดความ'}`,]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-card flat bordered>
|
||||
<q-card-section class="bg-grey-4">
|
||||
<div
|
||||
class="row items-center text-dark text-body2 text-weight-medium"
|
||||
>
|
||||
<div class="col-3">
|
||||
<div class="row items-center">
|
||||
<div class="col-1">
|
||||
<q-btn
|
||||
dense
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
icon="add"
|
||||
@click="ocClickAdd"
|
||||
>
|
||||
<q-tooltip>เพิ่ม</q-tooltip></q-btn
|
||||
>
|
||||
</div>
|
||||
<div class="col-11 text-center">
|
||||
<span>ระดับสมรรถนะ</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<span>คำอธิบายระดับ/พฤติกรรมที่คาดหวัง/พฤติกรรมย่อย</span>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-section>
|
||||
<div
|
||||
class="row q-pa-sm"
|
||||
v-for="(items, index) in itemsFormCard"
|
||||
key="index"
|
||||
>
|
||||
<div
|
||||
class="col-3 text-center self-center text-body1 text-weight-medium"
|
||||
>
|
||||
<span>{{ index + 1 }}</span>
|
||||
</div>
|
||||
<div class="col-9">
|
||||
<q-editor
|
||||
v-model="formData.level_1[index]"
|
||||
:dense="$q.screen.lt.md"
|
||||
min-height="5rem"
|
||||
:toolbar="[
|
||||
[
|
||||
'bold',
|
||||
'italic',
|
||||
'strike',
|
||||
'underline',
|
||||
'subscript',
|
||||
'superscript',
|
||||
],
|
||||
|
||||
['unordered', 'ordered'],
|
||||
]"
|
||||
:fonts="{
|
||||
arial: 'Arial',
|
||||
arial_black: 'Arial Black',
|
||||
comic_sans: 'Comic Sans MS',
|
||||
courier_new: 'Courier New',
|
||||
impact: 'Impact',
|
||||
lucida_grande: 'Lucida Grande',
|
||||
times_new_roman: 'Times New Roman',
|
||||
verdana: 'Verdana',
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div> -->
|
||||
|
||||
<!-- <div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.definition"
|
||||
label="กำหนดเกณฑ์การประเมิน"
|
||||
dense
|
||||
type="textarea"
|
||||
outlined
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกกำหนดเกณฑ์การประเมิน'}`,]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div> -->
|
||||
<FormExecutiveLevel v-else-if="store.competencyType === 'ID5'" /> -->
|
||||
</div>
|
||||
</q-card-section>
|
||||
<!-- <div class="text-right q-pa-sm">
|
||||
<q-btn
|
||||
dense
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
id="onSubmit"
|
||||
type="submit"
|
||||
color="public"
|
||||
class="q-px-md"
|
||||
>
|
||||
<q-tooltip>บันทึกข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</div> -->
|
||||
<!-- </q-form> -->
|
||||
</q-card>
|
||||
</template>
|
||||
|
|
|
|||
240
src/modules/14_KPI/components/competency/Forms/Main.vue
Normal file
240
src/modules/14_KPI/components/competency/Forms/Main.vue
Normal file
|
|
@ -0,0 +1,240 @@
|
|||
div
|
||||
<script setup lang="ts">
|
||||
import { ref, reactive } from "vue";
|
||||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKPIDataStore } from "@/modules/14_KPI/store/KPIStore";
|
||||
import { useRouter } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogConfirm, showLoader, hideLoader, success, messageError } = mixin;
|
||||
const router = useRouter();
|
||||
const store = useKPIDataStore();
|
||||
|
||||
const formData = reactive({
|
||||
competencyType: "",
|
||||
competencyName: "",
|
||||
definition: "",
|
||||
levels: [
|
||||
{
|
||||
level: "1",
|
||||
description: "",
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
function ocClickAdd() {
|
||||
// if (formData.levels.length !== 6) {
|
||||
const levelName = formData.levels.length + 1;
|
||||
const data = {
|
||||
level: levelName.toString(),
|
||||
description: "",
|
||||
};
|
||||
formData.levels.push(data);
|
||||
formData.levels[formData.levels.length].level = levelName.toString();
|
||||
// }
|
||||
}
|
||||
|
||||
function onSubmit() {
|
||||
dialogConfirm($q, () => {
|
||||
const body = {
|
||||
competencyType: store.competencyType,
|
||||
competencyName: formData.competencyName,
|
||||
definition: formData.definition,
|
||||
levels: formData.levels,
|
||||
};
|
||||
// showLoader()
|
||||
// http
|
||||
// .put(config.API.???,body)
|
||||
// .then((res)=>{
|
||||
// success($q,'บันทึกสำเร็จ')
|
||||
// router.push(`/KPI-competency`)
|
||||
// }).catch((e)=>{
|
||||
// messageError($q,e)
|
||||
// }).finally(()=>{
|
||||
// hideLoader()
|
||||
// })
|
||||
console.log(body);
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit" class="col-12">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.competencyName"
|
||||
dense
|
||||
outlined
|
||||
label="ชื่อสมรรถนะ"
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกชื่อสมรรถนะ'}`,]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<q-card-section class="col-12 q-px-none">
|
||||
<div>
|
||||
<q-field
|
||||
class="q_field_p_none"
|
||||
ref="fieldRef"
|
||||
v-model="formData.definition"
|
||||
label-slot
|
||||
borderless
|
||||
:rules="[(val) => !!val || 'กรุณากรอกคำจำกัดความสมรรถนะ']"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template #control>
|
||||
<q-editor
|
||||
class="full-width"
|
||||
v-model="formData.definition"
|
||||
:dense="$q.screen.lt.md"
|
||||
min-height="7rem"
|
||||
placeholder="คำจำกัดความสมรรถนะ"
|
||||
:toolbar="[
|
||||
[
|
||||
'bold',
|
||||
'italic',
|
||||
'strike',
|
||||
'underline',
|
||||
'subscript',
|
||||
'superscript',
|
||||
],
|
||||
|
||||
['unordered', 'ordered'],
|
||||
]"
|
||||
:fonts="{
|
||||
arial: 'Arial',
|
||||
arial_black: 'Arial Black',
|
||||
comic_sans: 'Comic Sans MS',
|
||||
courier_new: 'Courier New',
|
||||
impact: 'Impact',
|
||||
lucida_grande: 'Lucida Grande',
|
||||
times_new_roman: 'Times New Roman',
|
||||
verdana: 'Verdana',
|
||||
}"
|
||||
/>
|
||||
</template>
|
||||
</q-field>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<div class="col-12">
|
||||
<q-card flat bordered>
|
||||
<q-card-section class="bg-grey-4">
|
||||
<div
|
||||
class="row items-center text-dark text-body2 text-weight-medium"
|
||||
>
|
||||
<div class="col-3">
|
||||
<div class="row items-center">
|
||||
<div class="col-1">
|
||||
<q-btn
|
||||
dense
|
||||
flat
|
||||
round
|
||||
color="primary"
|
||||
icon="add"
|
||||
@click="ocClickAdd"
|
||||
>
|
||||
<q-tooltip>เพิ่ม</q-tooltip></q-btn
|
||||
>
|
||||
</div>
|
||||
<div class="col-11 text-center">
|
||||
<span>ระดับสมรรถนะ</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<span>พฤติกรรมที่คาดหวัง/พฤติกรรมย่อย</span>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-section>
|
||||
<div
|
||||
class="row q-pa-sm"
|
||||
v-for="(items, index) in formData.levels"
|
||||
key="index"
|
||||
>
|
||||
<div class="col-3 align-center q-pr-lg">
|
||||
<q-input
|
||||
:readonly="
|
||||
store.competencyType === 'HEAD' ||
|
||||
store.competencyType === 'GROUP'
|
||||
"
|
||||
v-model="formData.levels[index].level"
|
||||
dense
|
||||
outlined
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกระดับสมรรถนะ'}`,]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div class="col-9">
|
||||
<q-field
|
||||
class="q_field_p_none"
|
||||
ref="fieldRef"
|
||||
v-model="formData.levels[index].description"
|
||||
label-slot
|
||||
borderless
|
||||
:rules="[
|
||||
(val) =>
|
||||
!!val || 'กรุณากรอกพฤติกรรมที่คาดหวัง/พฤติกรรมย่อย',
|
||||
]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template #control>
|
||||
<q-editor
|
||||
class="full-width"
|
||||
v-model="formData.levels[index].description"
|
||||
:dense="$q.screen.lt.md"
|
||||
min-height="5rem"
|
||||
:toolbar="[
|
||||
[
|
||||
'bold',
|
||||
'italic',
|
||||
'strike',
|
||||
'underline',
|
||||
'subscript',
|
||||
'superscript',
|
||||
],
|
||||
|
||||
['unordered', 'ordered'],
|
||||
]"
|
||||
:fonts="{
|
||||
arial: 'Arial',
|
||||
arial_black: 'Arial Black',
|
||||
comic_sans: 'Comic Sans MS',
|
||||
courier_new: 'Courier New',
|
||||
impact: 'Impact',
|
||||
lucida_grande: 'Lucida Grande',
|
||||
times_new_roman: 'Times New Roman',
|
||||
verdana: 'Verdana',
|
||||
}"
|
||||
/>
|
||||
</template>
|
||||
</q-field>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
<div class="col-12 q-my-sm"><q-separator /></div>
|
||||
<div class="col-12 row justify-end">
|
||||
<q-btn
|
||||
dense
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
class="q-px-md"
|
||||
type="submit"
|
||||
>
|
||||
<q-tooltip>บันทึกข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
</q-form>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
|
|
@ -101,11 +101,15 @@ function updateSelected(data: any) {
|
|||
planData.strategyChildPlannedId = data.id;
|
||||
planData.strategyChildPlannedNode = data.level;
|
||||
}
|
||||
function updateSelectedAgency(data: any) {
|
||||
planData.agencyId = data.orgTreeId;
|
||||
planData.agencyLevel = data.orgLevel;
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
onMounted(async () => {
|
||||
// fetchData();
|
||||
fetchTree();
|
||||
fetchOrganizationActive();
|
||||
await fetchTree();
|
||||
await fetchOrganizationActive();
|
||||
setTimeout(async () => {
|
||||
store.activeId && (await fetchDataTree(store.activeId));
|
||||
}, 200);
|
||||
|
|
@ -116,38 +120,6 @@ onMounted(() => {
|
|||
<q-form @submit.prevent greedy @validation-success="onSubmit()">
|
||||
<div>
|
||||
<div class="row q-col-gutter-md q-pa-md">
|
||||
<div class="col-8">
|
||||
<q-input
|
||||
outlined
|
||||
v-model="planData.tree"
|
||||
label="หน่วยงาน/ส่วนราชการ"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'หน่วยงาน/ส่วนราชการ'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="planData.round"
|
||||
:options="roundOp"
|
||||
label="รอบการประเมิน"
|
||||
hide-bottom-space
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
map-options
|
||||
emit-value
|
||||
lazy-rules
|
||||
class="inputgreen"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${'กรุณาเลือกรอบการประเมิน'}`,
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
|
|
@ -179,7 +151,27 @@ onMounted(() => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<div class="col-2">
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="planData.round"
|
||||
:options="roundOp"
|
||||
label="รอบการประเมิน"
|
||||
hide-bottom-space
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
map-options
|
||||
emit-value
|
||||
lazy-rules
|
||||
class="inputgreen"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${'กรุณาเลือกรอบการประเมิน'}`,
|
||||
]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<q-input
|
||||
outlined
|
||||
v-model="planData.Data1"
|
||||
|
|
@ -257,11 +249,11 @@ onMounted(() => {
|
|||
<q-input
|
||||
outlined
|
||||
v-model="planData.point5"
|
||||
label="ระดับคะแนน"
|
||||
label="กรอกผลสำเร็จของงาน"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกระดับคะแนน'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -274,11 +266,11 @@ onMounted(() => {
|
|||
<q-input
|
||||
outlined
|
||||
v-model="planData.point4"
|
||||
label="ระดับคะแนน"
|
||||
label="กรอกผลสำเร็จของงาน"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกระดับคะแนน'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -291,11 +283,11 @@ onMounted(() => {
|
|||
<q-input
|
||||
outlined
|
||||
v-model="planData.point3"
|
||||
label="ระดับคะแนน"
|
||||
label="กรอกผลสำเร็จของงาน"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกระดับคะแนน'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -308,11 +300,11 @@ onMounted(() => {
|
|||
<q-input
|
||||
outlined
|
||||
v-model="planData.point2"
|
||||
label="ระดับคะแนน"
|
||||
label="กรอกผลสำเร็จของงาน"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกระดับคะแนน'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -325,11 +317,11 @@ onMounted(() => {
|
|||
<q-input
|
||||
outlined
|
||||
v-model="planData.point1"
|
||||
label="ระดับคะแนน"
|
||||
label="กรอกผลสำเร็จของงาน"
|
||||
bg-color="white"
|
||||
dense
|
||||
class="inputgreen"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกระดับคะแนน'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผลสำเร็จของงาน'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -367,7 +359,7 @@ onMounted(() => {
|
|||
<div
|
||||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
|
||||
>
|
||||
หน่วยงาน
|
||||
หน่วยงาน/ส่วนราชการ
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
|
|
@ -384,11 +376,12 @@ onMounted(() => {
|
|||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
style="height: 350px; overflow: scroll"
|
||||
dense
|
||||
:nodes="nodeAgency"
|
||||
node-key="orgTreeId"
|
||||
label-key="labelName"
|
||||
default-expand-all
|
||||
selected-color="primary"
|
||||
:filter="filterAgency"
|
||||
:no-results-label="notFound"
|
||||
:no-nodes-label="noData"
|
||||
|
|
@ -397,8 +390,8 @@ onMounted(() => {
|
|||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelectedAgency(prop.node)"
|
||||
:active="nodeId == prop.node.orgTreeId"
|
||||
@click.stop="updateSelected(prop.node)"
|
||||
active-class="my-list-link text-primary text-weight-medium"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
|
|
@ -445,6 +438,7 @@ onMounted(() => {
|
|||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
style="height: 350px; overflow: scroll"
|
||||
dense
|
||||
:nodes="nodeplan"
|
||||
selected-color="primary"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ interface FormQueryRound {
|
|||
|
||||
interface FormRound {
|
||||
durationKPI: string;
|
||||
year: number | null;
|
||||
startDate: Date | null;
|
||||
endDate: Date | null;
|
||||
}
|
||||
|
|
|
|||
7
src/modules/14_KPI/interface/response/KpiGroup.ts
Normal file
7
src/modules/14_KPI/interface/response/KpiGroup.ts
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
//ข้อมูล
|
||||
interface ResponseObject {
|
||||
nameGroupKPI: string,
|
||||
}
|
||||
|
||||
export type { ResponseObject };
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ import { ref } from "vue";
|
|||
|
||||
// store
|
||||
export const useKPIDataStore = defineStore("KPIDataStore", () => {
|
||||
const competencyType = ref<string>("ID1");
|
||||
const competencyType = ref<string>("HEAD");
|
||||
|
||||
return { competencyType };
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@ import { useRouter } from "vue-router";
|
|||
|
||||
/** importStore*/
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
/** use*/
|
||||
const $q = useQuasar();
|
||||
const router = useRouter();
|
||||
const { showLoader, hideLoader, dialogRemove, success } = useCounterMixin();
|
||||
const { showLoader, hideLoader, dialogRemove, success, messageError } =
|
||||
useCounterMixin();
|
||||
|
||||
/** หัวตาราง */
|
||||
const rows = ref<any>([]);
|
||||
|
|
@ -42,6 +44,10 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
]);
|
||||
const node = ref<any>([]);
|
||||
const expanded = ref<any>([]);
|
||||
const filter = ref<string>("");
|
||||
const filterMain = ref<string>("");
|
||||
const visibleColumns = ref<string[]>([
|
||||
"indicatorNo",
|
||||
"indicatorPass",
|
||||
|
|
@ -66,6 +72,11 @@ const formFilter = reactive({
|
|||
keyword: "",
|
||||
});
|
||||
|
||||
const nodeData = reactive<any>({
|
||||
node: null,
|
||||
nodeId: null,
|
||||
});
|
||||
|
||||
function fetchList() {
|
||||
showLoader();
|
||||
const data = [
|
||||
|
|
@ -101,8 +112,49 @@ function onClickDelete(id: number) {
|
|||
});
|
||||
}
|
||||
|
||||
function fetchActive() {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.activeOrganization)
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
fetchTree(data.activeId);
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
async function fetchTree(id: string) {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.orgByid(id.toString()))
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
node.value = data;
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
function updateSelectedTreeMain(data: any) {
|
||||
if (nodeData.node === data.orgLevel && nodeData.nodeId === data.orgTreeId) {
|
||||
nodeData.node = null;
|
||||
nodeData.nodeId = null;
|
||||
} else {
|
||||
nodeData.node = data.orgLevel;
|
||||
nodeData.nodeId = data.orgTreeId;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
fetchList();
|
||||
fetchActive();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
|
@ -111,139 +163,207 @@ onMounted(() => {
|
|||
รายการตัวชี้วัดตามแผนฯ
|
||||
</div>
|
||||
<q-card flat bordered class="q-pa-md">
|
||||
<q-toolbar class="q-pa-none">
|
||||
<div class="row q-gutter-x-sm">
|
||||
<div>
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="formFilter.org"
|
||||
:options="orgOp"
|
||||
label="หน่วยงาน/ส่วนราชการ"
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
emit-value
|
||||
map-options
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="formFilter.round"
|
||||
:options="roundOp"
|
||||
label="รอบการประเมิน"
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
emit-value
|
||||
map-options
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<q-toolbar-title>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="add"
|
||||
color="primary"
|
||||
@click="onClickAddOrView()"
|
||||
>
|
||||
<q-tooltip>เพิ่ม</q-tooltip>
|
||||
</q-btn>
|
||||
</q-toolbar-title>
|
||||
|
||||
<q-space />
|
||||
<div class="row q-gutter-sm">
|
||||
<div>
|
||||
<q-input
|
||||
standout
|
||||
dense
|
||||
v-model="formFilter.keyword"
|
||||
ref="filterRef"
|
||||
outlined
|
||||
debounce="300"
|
||||
placeholder="ค้นหา"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon v-if="formFilter.keyword == ''" name="search" />
|
||||
<q-icon
|
||||
v-if="formFilter.keyword !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="formFilter.keyword = ''"
|
||||
/>
|
||||
</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>
|
||||
</q-toolbar>
|
||||
|
||||
<div class="col-12">
|
||||
<d-table
|
||||
for="table"
|
||||
ref="table"
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="subject"
|
||||
flat
|
||||
bordered
|
||||
dense
|
||||
class="custom-header-table"
|
||||
:visible-columns="visibleColumns"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.name"
|
||||
:props="props"
|
||||
@click="onClickAddOrView(true, props.row.id)"
|
||||
>
|
||||
<div class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
<div class="row q-col-gutter-sm">
|
||||
<q-card bordered class="col-4">
|
||||
<q-card-section class="q-py-sm">
|
||||
<div class="text-subtitle2 text-bold">หน่วยงาน/ส่วนราชการ</div>
|
||||
</q-card-section>
|
||||
<div class="col-xs-12 col-sm-3 row">
|
||||
<div class="col-12 row no-wrap">
|
||||
<div class="col-12 q-py-sm q-px-sm">
|
||||
<div class="q-gutter-sm">
|
||||
<q-input dense outlined v-model="filterMain" label="ค้นหา">
|
||||
<template v-slot:append>
|
||||
<q-icon
|
||||
v-if="filterMain !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="filterMain = ''"
|
||||
/>
|
||||
<q-icon v-else name="search" color="grey-5" />
|
||||
</template>
|
||||
</q-input>
|
||||
<div>
|
||||
<q-tree
|
||||
class="tree-container"
|
||||
dense
|
||||
:nodes="node"
|
||||
node-key="orgTreeName"
|
||||
label-key="labelName"
|
||||
v-model:expanded="expanded"
|
||||
:filter="filterMain"
|
||||
no-results-label="ไม่พบข้อมูลที่ค้นหา"
|
||||
no-nodes-label="ไม่มีข้อมูล"
|
||||
v-model:selected="nodeData.nodeId"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<q-item
|
||||
clickable
|
||||
@click.stop="updateSelectedTreeMain(prop.node)"
|
||||
:active="nodeData.nodeId === prop.node.orgTreeId"
|
||||
active-class="my-list-link text-primary text-weight-medium"
|
||||
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
|
||||
>
|
||||
<div>
|
||||
<div class="text-weight-medium">
|
||||
{{ prop.node.orgTreeName }}
|
||||
</div>
|
||||
<div class="text-weight-light text-grey-8">
|
||||
{{
|
||||
prop.node.orgCode == null
|
||||
? null
|
||||
: prop.node.orgCode
|
||||
}}
|
||||
{{
|
||||
prop.node.orgTreeShortName == null
|
||||
? null
|
||||
: prop.node.orgTreeShortName
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-tree>
|
||||
</div>
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onClickDelete(props.rowIndex)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
</div>
|
||||
<div class="col-12 row">
|
||||
<q-separator :vertical="!$q.screen.lt.md" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
<div class="col-8">
|
||||
<div class="row q-col-gutter-sm q-mb-sm">
|
||||
<div class="col-3">
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="formFilter.round"
|
||||
:options="roundOp"
|
||||
label="รอบการประเมิน"
|
||||
option-label="name"
|
||||
option-value="id"
|
||||
emit-value
|
||||
map-options
|
||||
/>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="add"
|
||||
color="primary"
|
||||
@click="onClickAddOrView()"
|
||||
>
|
||||
<q-tooltip>เพิ่ม</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<q-input
|
||||
standout
|
||||
dense
|
||||
v-model="formFilter.keyword"
|
||||
ref="filterRef"
|
||||
outlined
|
||||
debounce="300"
|
||||
placeholder="ค้นหา"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon v-if="formFilter.keyword == ''" name="search" />
|
||||
<q-icon
|
||||
v-if="formFilter.keyword !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
@click="formFilter.keyword = ''"
|
||||
/>
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<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 class="col-12">
|
||||
<d-table
|
||||
for="table"
|
||||
ref="table"
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="subject"
|
||||
flat
|
||||
bordered
|
||||
dense
|
||||
class="custom-header-table"
|
||||
:visible-columns="visibleColumns"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
<q-th auto-width />
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props" class="cursor-pointer">
|
||||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.name"
|
||||
:props="props"
|
||||
@click="onClickAddOrView(true, props.row.id)"
|
||||
>
|
||||
<div class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onClickDelete(props.rowIndex)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
<style lang="scss" scoped>
|
||||
.tree-container {
|
||||
overflow: auto;
|
||||
height: 65vh;
|
||||
border: 1px solid #e6e6e7;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.my-list-link {
|
||||
color: rgb(118, 168, 222);
|
||||
border-radius: 5px;
|
||||
background: #a3d3fb48 !important;
|
||||
font-weight: 600;
|
||||
border: 1px solid rgba(175, 185, 196, 0.217);
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -70,17 +70,32 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "isActive",
|
||||
align: "left",
|
||||
label: "สถานะ",
|
||||
sortable: true,
|
||||
field: "isActive",
|
||||
format: (val) => (val ? "เปิด" : "ปิดแล้ว"),
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
]);
|
||||
const visibleColumns = ref<string[]>([
|
||||
"durationKPI",
|
||||
"startDate",
|
||||
"endDate",
|
||||
"isActive",
|
||||
]);
|
||||
const visibleColumns = ref<string[]>(["durationKPI", "startDate", "endDate"]);
|
||||
|
||||
/** itemMenu*/
|
||||
const itemMenu = ref<ItemsMenu[]>([
|
||||
{
|
||||
label: "เปิดรอบ",
|
||||
value: "open",
|
||||
icon: "mdi-check",
|
||||
color: "primary",
|
||||
},
|
||||
// {
|
||||
// label: "เปิดรอบ",
|
||||
// value: "open",
|
||||
// icon: "mdi-check",
|
||||
// color: "primary",
|
||||
// },
|
||||
{
|
||||
label: "ปิดรอบ",
|
||||
value: "close",
|
||||
|
|
@ -113,6 +128,7 @@ const formQuery = reactive<FormQueryRound>({
|
|||
const totalList = ref<number>(1);
|
||||
const formData = reactive<FormRound>({
|
||||
durationKPI: "",
|
||||
year: null,
|
||||
startDate: null,
|
||||
endDate: null,
|
||||
});
|
||||
|
|
@ -172,6 +188,7 @@ function clearFormData() {
|
|||
formData.durationKPI = "";
|
||||
formData.startDate = null;
|
||||
formData.endDate = null;
|
||||
formData.year = null;
|
||||
}
|
||||
|
||||
/** function บันทึกข้อมูลเพิ่มรอบการประเมิน*/
|
||||
|
|
@ -244,6 +261,7 @@ function onCloseRounde(id: string) {
|
|||
dialogConfirm(
|
||||
$q,
|
||||
() => {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.kpiPeriod + `/close/${id}`)
|
||||
.then(() => {
|
||||
|
|
@ -336,7 +354,9 @@ onMounted(() => {
|
|||
dense
|
||||
lazy-rules
|
||||
outlined
|
||||
:model-value="Number(formQuery.year) + 543"
|
||||
:model-value="
|
||||
formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543
|
||||
"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
|
|
@ -347,6 +367,15 @@ onMounted(() => {
|
|||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
<template v-if="formQuery.year" v-slot:append>
|
||||
<q-icon
|
||||
name="cancel"
|
||||
@click.stop.prevent="
|
||||
(formQuery.year = 0), (formQuery.page = 1), fetchList()
|
||||
"
|
||||
class="cursor-pointer"
|
||||
/>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
|
|
@ -462,7 +491,9 @@ onMounted(() => {
|
|||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
v-for="items in itemMenu"
|
||||
v-for="items in props.row.isActive
|
||||
? itemMenu
|
||||
: itemMenu.slice(1, 2)"
|
||||
@click="onClickAction(items.value, props.row.id)"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
|
|
@ -526,6 +557,49 @@ onMounted(() => {
|
|||
]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="formData.year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
hide-bottom-space
|
||||
class="inputgreen"
|
||||
:model-value="
|
||||
formData.year === null
|
||||
? null
|
||||
: Number(formData.year) + 543
|
||||
"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${'กรุณาเลือกปีงบประมาณ'}`,
|
||||
]"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
|
|
|
|||
|
|
@ -350,6 +350,7 @@ onMounted(() => {
|
|||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th auto-width></q-th>
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
</q-th>
|
||||
|
|
@ -357,6 +358,11 @@ onMounted(() => {
|
|||
</template>
|
||||
<template v-slot:body="props">
|
||||
<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">
|
||||
<div>{{ col.value ? col.value : "-" }}</div>
|
||||
</q-td>
|
||||
|
|
|
|||
|
|
@ -87,11 +87,13 @@ function fetchData() {
|
|||
formMainProject.trainingStart = data.dateStart ? data.dateStart : null;
|
||||
formMainProject.trainingEnd = data.dateEnd ? data.dateEnd : null;
|
||||
formMainProject.totalTraining = data.totalDate ? data.totalDate : null;
|
||||
formMainProject.location = data.addressAcademic ? data.addressAcademic : null;
|
||||
formMainProject.location = data.addressAcademic
|
||||
? data.addressAcademic
|
||||
: null;
|
||||
formMainProject.topic = data.topicAcademic ? data.topicAcademic : null;
|
||||
// formMainProject.studyStart = data.dateStudyStart;
|
||||
// formMainProject.studyEnd = data.dateStudyEnd;
|
||||
formMainProject.organizingTraining = data.org? data.org : null;
|
||||
formMainProject.organizingTraining = data.org ? data.org : null;
|
||||
|
||||
dateOrder.value = data.dateOrder;
|
||||
order.value = data.order;
|
||||
|
|
@ -133,68 +135,76 @@ onMounted(() => {
|
|||
ข้อมูลข้าราชการฯ
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-col-gutter-md q-pa-md">
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
เลขประจําตัวประชาชน
|
||||
</div>
|
||||
<div class="row q-pa-md q-col-gutter-md">
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
เลขประจําตัวประชาชน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.citizenId ?? "-" }}
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.citizenId ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อ - นามสกุล
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.name ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ตําแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.position ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ประเภทตําแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.type ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ระดับตําแหน่ง
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ระดับตําแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.level ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อ - นามสกุล
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.level ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ตําแหน่งทางการบริหาร
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.name ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ตําแหน่งทางการบริหาร
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.positionSide ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่สังกัด
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.positionSide ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ตําแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.position ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่สังกัด
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.oc ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ประเภทตําแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.type ?? "-" }}
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.oc ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -206,85 +216,93 @@ onMounted(() => {
|
|||
ข้อมูลโครงการ
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-col-gutter-md q-pa-md">
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อโครงการ/หลักสูตรการฝึกอบรม
|
||||
</div>
|
||||
<div class="row q-pa-md q-col-gutter-md">
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อโครงการ/หลักสูตรการฝึกอบรม
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.project ?? "-" }}
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.project ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ปีงบประมาณที่เข้ารับการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ Number(formMainProject.year) + 543 ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หัวข้อการไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.topic ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
สถานที่ไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.location ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันเริ่มต้นการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันเริ่มต้นการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingStart
|
||||
? date2Thai(formMainProject.trainingStart)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ปีงบประมาณที่เข้ารับการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingStart
|
||||
? date2Thai(formMainProject.trainingStart)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันสิ้นสุดการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.year ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันสิ้นสุดการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingEnd
|
||||
? date2Thai(formMainProject?.trainingEnd)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
รวมระยะเวลาในการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingEnd
|
||||
? date2Thai(formMainProject?.trainingEnd)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หัวข้อการไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.totalTraining ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่รับผิดชอบ
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.topic ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
รวมระยะเวลาในการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.totalTraining ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
สถานที่ไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.location ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-6">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่รับผิดชอบ
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.organizingTraining ?? "-" }}
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.organizingTraining ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,33 +1,27 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
/** importType*/
|
||||
import type {
|
||||
FormAddHistoryEmployee,
|
||||
FormAddHistoryProject,
|
||||
} from "@/modules/15_development/interface/request/Main";
|
||||
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
|
||||
|
||||
/** importStore*/
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
import DialogGov from "@/modules/15_development/components/historyEmployee/DialogGov.vue";
|
||||
import DialogProject from "@/modules/15_development/components/historyEmployee/DialogProject.vue";
|
||||
import { useQuasar, type QTableProps } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
/** use*/
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
|
||||
const id = ref<string>(route.params.id as string);
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogConfirm, showLoader, hideLoader, messageError, date2Thai } =
|
||||
mixin;
|
||||
const store = useDevelopmentDataStore();
|
||||
const modalDialogGov = ref<boolean>(false);
|
||||
const modalDialogProject = ref<boolean>(false);
|
||||
const { showLoader, hideLoader, messageError, date2Thai } = mixin;
|
||||
|
||||
const id = ref<string>(route.params.id as string);
|
||||
const dateOrder = ref<Date | null>(null);
|
||||
const order = ref<string>("");
|
||||
|
||||
|
|
@ -54,8 +48,8 @@ const formMainProject = reactive<FormAddHistoryProject>({
|
|||
id: "",
|
||||
project: "", //ชื่อโครงการ/หลักสูตรการฝึกอบรม
|
||||
year: "", //ปีงบประมาณที่เข้ารับการฝึกอบรม
|
||||
trainingStart: "", //วันเริ่มต้นการฝึกอบรม
|
||||
trainingEnd: "", //วันสิ้นสุดการฝึกอบรม
|
||||
trainingStart: null, //วันเริ่มต้นการฝึกอบรม
|
||||
trainingEnd: null, //วันสิ้นสุดการฝึกอบรม
|
||||
totalTraining: "", //รวมระยะเวลาในการฝึกอบรม
|
||||
location: "", //สถานที่ไปศึกษาดูงาน
|
||||
topic: "", //หัวข้อการไปศึกษาดูงาน
|
||||
|
|
@ -64,90 +58,11 @@ const formMainProject = reactive<FormAddHistoryProject>({
|
|||
organizingTraining: "", //หน่วยงานที่รับผิดชอบจัดการอบรม
|
||||
});
|
||||
|
||||
const fieldLabels = {
|
||||
citizenId: "เลขประจําตัวประชาชน",
|
||||
name: "ชื่อ - นามสกุล",
|
||||
position: "ตําแหน่ง",
|
||||
type: "กลุ่มงาน",
|
||||
|
||||
level: "ระดับชั้นงาน",
|
||||
oc: "หน่วยงานที่สังกัด",
|
||||
};
|
||||
|
||||
const fieldLabelsProject = {
|
||||
project: "ชื่อโครงการ/หลักสูตรการฝึกอบรม",
|
||||
year: "ปีงบประมาณที่เข้ารับการฝึกอบรม",
|
||||
trainingStart: "วันเริ่มต้นการฝึกอบรม",
|
||||
trainingEnd: "วันสิ้นสุดการฝึกอบรม",
|
||||
totalTraining: "รวมระยะเวลาในการฝึกอบรม",
|
||||
|
||||
location: "สถานที่ไปศึกษาดูงาน",
|
||||
topic: "หัวข้อการไปศึกษาดูงาน",
|
||||
studyStart: "วันเริ่มต้นการศึกษาดูงาน",
|
||||
studyEnd: "วันสิ้นสุดการศึกษาดูงาน",
|
||||
organizingTraining: "หน่วยงานที่รับผิดชอบจัดการอบรม",
|
||||
};
|
||||
|
||||
function getClass() {
|
||||
return "inputgreen";
|
||||
}
|
||||
/** save */
|
||||
function onSubmit() {
|
||||
const url = id.value
|
||||
? config.API.developmentHistoryListByid("employee", id.value)
|
||||
: config.API.developmentHistoryAdd("employee");
|
||||
|
||||
const body = {
|
||||
rank: null,
|
||||
prefix: formMain.prefix,
|
||||
firstName: formMain.firstName,
|
||||
lastName: formMain.lastName,
|
||||
citizenId: formMain.citizenId,
|
||||
position: formMain.position,
|
||||
posExecutive: null,
|
||||
posLevelId: formMain.posLevelId,
|
||||
posTypeId: formMain.posTypeId,
|
||||
|
||||
developmentId: formMainProject.id,
|
||||
order: order.value,
|
||||
dateOrder: dateOrder.value,
|
||||
};
|
||||
dialogConfirm($q, () => {
|
||||
showLoader();
|
||||
http[id.value ? "put" : "post"](url, body)
|
||||
.then(() => {
|
||||
router.push(`/development/employee-history`);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function upDate(data: FormAddHistoryEmployee) {
|
||||
formMain.id = data.id;
|
||||
formMain.citizenId = data.citizenId;
|
||||
formMain.name = data.name;
|
||||
formMain.prefix = data.prefix;
|
||||
formMain.firstName = data.firstName;
|
||||
formMain.lastName = data.lastName;
|
||||
formMain.position = data.position;
|
||||
formMain.posLevelId = data.posLevelId;
|
||||
formMain.posTypeId = data.posTypeId;
|
||||
formMain.type = data.type;
|
||||
formMain.level = data.level;
|
||||
}
|
||||
|
||||
function upDateProject(data: any) {
|
||||
formMainProject.id = data.id;
|
||||
formMainProject.project = data.project;
|
||||
formMainProject.year = data.year;
|
||||
}
|
||||
|
||||
function getDataEdit() {
|
||||
function fetchDataDetail() {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.developmentHistoryListByid("employee", id.value))
|
||||
|
|
@ -170,17 +85,21 @@ function getDataEdit() {
|
|||
formMain.positionSide = data.positionSide ? data.positionSide : null;
|
||||
formMain.oc = data.org ? data.org : null;
|
||||
|
||||
formMainProject.id = data.developmentId;
|
||||
formMainProject.project = data.projectName;
|
||||
formMainProject.year = data.year;
|
||||
formMainProject.trainingStart = data.dateStart;
|
||||
formMainProject.trainingEnd = data.dateEnd;
|
||||
formMainProject.totalTraining = data.totalDate;
|
||||
formMainProject.location = data.addressAcademic;
|
||||
formMainProject.topic = data.topicAcademic;
|
||||
formMainProject.studyStart = data.dateStudyStart;
|
||||
formMainProject.studyEnd = data.dateStudyEnd;
|
||||
formMainProject.organizingTraining = data.org;
|
||||
formMainProject.id = data.developmentId ? data.developmentId : null;
|
||||
formMainProject.project = data.projectName ? data.projectName : null;
|
||||
formMainProject.year = data.year ? data.year : null;
|
||||
formMainProject.trainingStart = data.dateStart ? data.dateStart : null;
|
||||
formMainProject.trainingEnd = data.dateEnd ? data.dateEnd : null;
|
||||
formMainProject.totalTraining = data.totalDate ? data.totalDate : null;
|
||||
formMainProject.location = data.addressAcademic
|
||||
? data.addressAcademic
|
||||
: null;
|
||||
formMainProject.topic = data.topicAcademic ? data.topicAcademic : null;
|
||||
formMainProject.studyStart = data.dateStudyStart
|
||||
? data.dateStudyStart
|
||||
: null;
|
||||
formMainProject.studyEnd = data.dateStudyEnd ? data.dateStudyEnd : null;
|
||||
formMainProject.organizingTraining = data.org ? data.org : null;
|
||||
|
||||
dateOrder.value = data.dateOrder;
|
||||
order.value = data.order;
|
||||
|
|
@ -195,7 +114,7 @@ function getDataEdit() {
|
|||
|
||||
onMounted(() => {
|
||||
if (id.value) {
|
||||
getDataEdit();
|
||||
fetchDataDetail();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
|
@ -212,206 +131,234 @@ onMounted(() => {
|
|||
class="q-mr-sm"
|
||||
@click="router.go(-1)"
|
||||
/>
|
||||
<span>{{
|
||||
id
|
||||
? `แก้ไขประวัติฝึกอบรม/ดูงานลูกจ้าง`
|
||||
: `เพิ่มประวัติฝึกอบรม/ดูงานลูกจ้าง`
|
||||
}}</span>
|
||||
<span> ประวัติฝึกอบรม/ดูงานลูกจ้าง </span>
|
||||
</div>
|
||||
<q-card flat bordered>
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit">
|
||||
<q-card-section>
|
||||
<q-card flat bordered style="border: 1px solid #d6dee1">
|
||||
<div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
|
||||
ข้อมูลลูกจ้าง
|
||||
|
||||
<!-- <q-btn
|
||||
flat
|
||||
class="btn-fixed-width"
|
||||
color="teal"
|
||||
label="เลือกลูกจ้าง"
|
||||
icon="add"
|
||||
@click="modalDialogGov = true"
|
||||
/> -->
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-col-gutter-md q-pa-md">
|
||||
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
|
||||
<div
|
||||
class="row"
|
||||
v-for="(field, index) in Object.keys(fieldLabels).slice(0, 4)"
|
||||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabels[field as keyof typeof fieldLabels]
|
||||
}}</span>
|
||||
<q-card-section>
|
||||
<!-- Card ข้อมูลลูกจ้าง -->
|
||||
<q-card flat bordered style="border: 1px solid #d6dee1">
|
||||
<div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
|
||||
ข้อมูลลูกจ้าง
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-pa-md q-col-gutter-md">
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
เลขประจําตัวประชาชน
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{ formMain[field] ? formMain[field] : "-" }}</span>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.citizenId ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
|
||||
<div
|
||||
class="row"
|
||||
v-for="(field, index) in Object.keys(fieldLabels).slice(4, 7)"
|
||||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabels[field as keyof typeof fieldLabels]
|
||||
}}</span>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อ - นามสกุล
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{ formMain[field] ? formMain[field] : "-" }}</span>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.name ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ตำแหน่ง
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.position ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
กลุ่มงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.type ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
|
||||
<q-card flat bordered class="q-mt-md" style="border: 1px solid #d6dee1">
|
||||
<div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
|
||||
ข้อมูลโครงการ
|
||||
<!-- <q-btn
|
||||
flat
|
||||
class="btn-fixed-width"
|
||||
color="teal"
|
||||
label="เลือกโครงการ"
|
||||
icon="add"
|
||||
@click="modalDialogProject = true"
|
||||
/> -->
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-col-gutter-md q-pa-md">
|
||||
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
|
||||
<div
|
||||
class="row"
|
||||
v-for="(field, index) in Object.keys(fieldLabelsProject).slice(
|
||||
0,
|
||||
5
|
||||
)"
|
||||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabelsProject[field as keyof typeof fieldLabelsProject]
|
||||
}}</span>
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ระดับชั้นงาน
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span v-if="index == 1">{{
|
||||
formMainProject[field] ? formMainProject[field] + 543 : "-"
|
||||
}}</span>
|
||||
<span v-else-if="index == 2 || index == 3">{{
|
||||
formMainProject[field]
|
||||
? date2Thai(formMainProject[field])
|
||||
: "-"
|
||||
}}</span>
|
||||
<span v-else>{{
|
||||
formMainProject[field] ? formMainProject[field] : "-"
|
||||
}}</span>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.level ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่สังกัด
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMain.oc ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
|
||||
<div
|
||||
class="row"
|
||||
v-for="(field, index) in Object.keys(fieldLabelsProject).slice(
|
||||
5,
|
||||
10
|
||||
)"
|
||||
:key="index"
|
||||
>
|
||||
<div class="col-12 col-sm-12 col-md-4">
|
||||
<span class="text-grey-6 text-weight-medium">{{
|
||||
fieldLabelsProject[field as keyof typeof fieldLabelsProject]
|
||||
}}</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
formMainProject[field] ? formMainProject[field] : "-"
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mt-md">
|
||||
<div class="col-3">
|
||||
<q-input
|
||||
readonly
|
||||
label="เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"
|
||||
v-model="order"
|
||||
dense
|
||||
outlined
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<datepicker
|
||||
readonly
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateOrder"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
</template>
|
||||
<template #year-overlay-value="{ value }">
|
||||
{{ parseInt(value + 543) }}
|
||||
</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
readonly
|
||||
outlined
|
||||
dense
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:model-value="dateOrder != null ? date2Thai(dateOrder) : null"
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
|
||||
label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<!-- <q-separator />
|
||||
<div class="text-right q-pa-sm">
|
||||
<q-btn
|
||||
dense
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
id="onSubmit"
|
||||
type="submit"
|
||||
color="public"
|
||||
class="q-px-md"
|
||||
>
|
||||
<q-tooltip>บันทึกข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</div> -->
|
||||
</q-form>
|
||||
</q-card>
|
||||
</q-card>
|
||||
|
||||
<DialogGov v-model:modal="modalDialogGov" :up-date="upDate" />
|
||||
<DialogProject v-model:modal="modalDialogProject" :up-date="upDateProject" />
|
||||
<!-- Card ข้อมูลโครงการ -->
|
||||
<q-card flat bordered class="q-mt-md" style="border: 1px solid #d6dee1">
|
||||
<div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
|
||||
ข้อมูลโครงการ
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div class="row q-pa-md q-col-gutter-md">
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ชื่อโครงการ/หลักสูตรการฝึกอบรม
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.project ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
ปีงบประมาณที่เข้ารับการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ Number(formMainProject.year) + 543 ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หัวข้อการไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.topic ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
สถานที่ไปฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.location ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันเริ่มต้นการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingStart
|
||||
? date2Thai(formMainProject.trainingStart)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
วันสิ้นสุดการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{
|
||||
formMainProject.trainingEnd
|
||||
? date2Thai(formMainProject?.trainingEnd)
|
||||
: "-"
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
รวมระยะเวลาในการฝึกอบรม/ศึกษาดูงาน
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.totalTraining ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-12">
|
||||
<div class="col-sm-12 col-md-5 text-grey-6 text-weight-medium">
|
||||
หน่วยงานที่รับผิดชอบ
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-sm-12 col-md-7">
|
||||
{{ formMainProject.organizingTraining ?? "-" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mt-md">
|
||||
<div class="col-3">
|
||||
<q-input
|
||||
readonly
|
||||
label="เลขที่คำสั่ง/เลขที่หนังสืออนุมัติ"
|
||||
v-model="order"
|
||||
dense
|
||||
outlined
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่คำสั่ง/เลขที่หนังสืออนุมัติ'}`,]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<datepicker
|
||||
readonly
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateOrder"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
</template>
|
||||
<template #year-overlay-value="{ value }">
|
||||
{{ parseInt(value + 543) }}
|
||||
</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
readonly
|
||||
outlined
|
||||
dense
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:model-value="dateOrder != null ? date2Thai(dateOrder) : null"
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
|
||||
label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -6,11 +6,6 @@ import config from "@/app.config";
|
|||
import genReportXLSX from "@/plugins/genreportxlsx";
|
||||
import { useRouter } from "vue-router";
|
||||
|
||||
import type {
|
||||
DataOption,
|
||||
FormFilter,
|
||||
} from "@/modules/15_development/interface/index/Main";
|
||||
|
||||
/** importStore*/
|
||||
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
|
@ -27,7 +22,7 @@ const pagination = ref({
|
|||
});
|
||||
const maxPage = ref<number>(1);
|
||||
const formFilter = reactive({
|
||||
root: "",
|
||||
root: null,
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
keyword: "",
|
||||
|
|
@ -35,7 +30,6 @@ const formFilter = reactive({
|
|||
});
|
||||
|
||||
const rows = ref<any>([]);
|
||||
const agency = ref<string>("");
|
||||
const agencyOp = ref<[]>([]);
|
||||
|
||||
const visibleColumns = ref<string[]>([
|
||||
|
|
@ -111,9 +105,10 @@ function fetchListOrg() {
|
|||
http
|
||||
.get(config.API.developmentHistoryListOrg("employee", formFilter.year))
|
||||
.then((res) => {
|
||||
formFilter.root = "";
|
||||
formFilter.root = null;
|
||||
rows.value = [];
|
||||
agencyOp.value = res.data.result;
|
||||
getData();
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
|
|
@ -148,14 +143,6 @@ function onEdit(id: string) {
|
|||
}
|
||||
|
||||
function getData() {
|
||||
let queryParams: any = {
|
||||
page: formFilter.page,
|
||||
pageSize: formFilter.pageSize,
|
||||
keyword: formFilter.keyword,
|
||||
year: formFilter.year,
|
||||
root: formFilter.root,
|
||||
};
|
||||
|
||||
showLoader();
|
||||
http
|
||||
.post(config.API.developmentHistoryList("employee"), formFilter)
|
||||
|
|
@ -184,10 +171,6 @@ function getData() {
|
|||
});
|
||||
}
|
||||
|
||||
function yearAll() {
|
||||
formFilter.year = 0;
|
||||
// getData();
|
||||
}
|
||||
onMounted(() => {
|
||||
fetchListOrg();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ function fetchListOrg() {
|
|||
.get(config.API.developmentHistoryListOrg("officer", formFilter.year))
|
||||
.then((res) => {
|
||||
formFilter.root = null;
|
||||
rows.value = [];
|
||||
agencyOp.value = res.data.result;
|
||||
getData();
|
||||
})
|
||||
|
|
|
|||
|
|
@ -213,152 +213,122 @@ onMounted(() => {
|
|||
<q-card flat bordered class="q-pa-md">
|
||||
<q-toolbar class="q-pa-none">
|
||||
<div class="row q-gutter-sm">
|
||||
<div>
|
||||
<datepicker
|
||||
style="width: 150px"
|
||||
menu-class-name="modalfix"
|
||||
v-model="formQuery.year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
@update:model-value="fetchNewList"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
dense
|
||||
lazy-rules
|
||||
outlined
|
||||
:model-value="
|
||||
formQuery.year === 0
|
||||
? 'ทั้งหมด'
|
||||
: Number(formQuery.year) + 543
|
||||
"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
>
|
||||
<template v-if="formQuery.year" v-slot:append>
|
||||
<q-icon
|
||||
name="cancel"
|
||||
@click.stop.prevent="(formQuery.year = 0), fetchNewList()"
|
||||
class="cursor-pointer"
|
||||
/>
|
||||
</template>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
<div>
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="formQuery.type"
|
||||
:options="scholarshipTypeOp"
|
||||
emit-value
|
||||
map-options
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
label="เลือกประเภททุน"
|
||||
@update:model-value="fetchNewList"
|
||||
style="width: 350px"
|
||||
/>
|
||||
</div>
|
||||
<datepicker
|
||||
style="width: 150px"
|
||||
menu-class-name="modalfix"
|
||||
v-model="formQuery.year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
@update:model-value="fetchNewList"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
dense
|
||||
lazy-rules
|
||||
outlined
|
||||
:model-value="
|
||||
formQuery.year === 0 ? 'ทั้งหมด' : Number(formQuery.year) + 543
|
||||
"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
>
|
||||
<template v-if="formQuery.year" v-slot:append>
|
||||
<q-icon
|
||||
name="cancel"
|
||||
@click.stop.prevent="(formQuery.year = 0), fetchNewList()"
|
||||
class="cursor-pointer"
|
||||
/>
|
||||
</template>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
|
||||
<q-select
|
||||
dense
|
||||
outlined
|
||||
v-model="formQuery.type"
|
||||
:options="scholarshipTypeOp"
|
||||
emit-value
|
||||
map-options
|
||||
option-value="id"
|
||||
option-label="name"
|
||||
label="เลือกประเภททุน"
|
||||
@update:model-value="fetchNewList"
|
||||
class="type"
|
||||
/>
|
||||
</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
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="add"
|
||||
color="primary"
|
||||
@click="onClickAddOrView()"
|
||||
icon="mdi-arrow-down-bold-circle-outline"
|
||||
color="blue"
|
||||
@click="onDownload"
|
||||
>
|
||||
<q-tooltip>เพิ่ม</q-tooltip>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
</q-toolbar-title>
|
||||
|
||||
<q-space />
|
||||
<div class="row q-gutter-sm">
|
||||
<div>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="mdi-arrow-down-bold-circle-outline"
|
||||
color="blue"
|
||||
@click="onDownload"
|
||||
>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- <q-btn
|
||||
flat
|
||||
round
|
||||
color="blue"
|
||||
icon="mdi-arrow-down-bold-circle-outline"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 100px" dense>
|
||||
<q-item clickable v-close-popup v-for="items in itemDownload">
|
||||
<q-item-section avatar>
|
||||
<q-icon :color="items.color" :name="items.icon" />
|
||||
</q-item-section>
|
||||
<q-item-section :class="`text-${items.color}`">{{
|
||||
items.label
|
||||
}}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
<q-tooltip>ดาวน์โหลด</q-tooltip>
|
||||
</q-btn> -->
|
||||
</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>
|
||||
<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>
|
||||
|
||||
<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>
|
||||
</q-toolbar>
|
||||
|
||||
|
|
@ -416,4 +386,11 @@ onMounted(() => {
|
|||
</q-card>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
<style scoped>
|
||||
.q-select.type >>> .q-field__native > span {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
width: 200px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -733,15 +733,18 @@ watch(
|
|||
@click="link = menuItem.label"
|
||||
active-class="text-primary menuActiveMini text-weight-medium"
|
||||
v-if="
|
||||
menuItem.key == 3 ||
|
||||
menuItem.key == 5 ||
|
||||
menuItem.key == 6 ||
|
||||
menuItem.key == 2 ||
|
||||
menuItem.key == 0 ||
|
||||
menuItem.key == 7 ||
|
||||
menuItem.key == 8 ||
|
||||
menuItem.key == 9 ||
|
||||
menuItem.key == 10 ||
|
||||
menuItem.key == 11 ||
|
||||
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">
|
||||
|
|
@ -772,8 +775,24 @@ watch(
|
|||
:to="{ name: `${subMenu.path}` }"
|
||||
>
|
||||
<!-- เมนูย่อย 2 ชั้น -->
|
||||
<div v-if="menuItem.key == 5">
|
||||
<q-item dense clickable v-if="subMenu.key !== 5.1">
|
||||
<div
|
||||
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
|
||||
>{{ subMenu.label }}
|
||||
</q-item-section>
|
||||
|
|
@ -898,16 +917,18 @@ watch(
|
|||
expand-icon="mdi-chevron-down"
|
||||
expanded-icon="mdi-chevron-up"
|
||||
v-if="
|
||||
menuItem.key == 3 ||
|
||||
menuItem.key == 5 ||
|
||||
menuItem.key == 6 ||
|
||||
menuItem.key == 2 ||
|
||||
menuItem.key == 0 ||
|
||||
menuItem.key == 7 ||
|
||||
menuItem.key == 8 ||
|
||||
menuItem.key == 9 ||
|
||||
menuItem.key == 10 ||
|
||||
menuItem.key == 11 ||
|
||||
menuItem.key == 12 ||
|
||||
menuItem.key == 13 ||
|
||||
menuItem.key == 14
|
||||
menuItem.key == 14 ||
|
||||
menuItem.key == 15 ||
|
||||
menuItem.key == 16
|
||||
"
|
||||
>
|
||||
<template v-slot:header>
|
||||
|
|
@ -924,7 +945,10 @@ watch(
|
|||
<!-- เมนูย่อย 2 ชั้น (สรรหา) -->
|
||||
<div
|
||||
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">
|
||||
|
|
@ -933,18 +957,10 @@ watch(
|
|||
dense-toggle
|
||||
:label="subMenu.label"
|
||||
v-if="
|
||||
subMenu.key !== 5.1 &&
|
||||
subMenu.key !== 11.1 &&
|
||||
subMenu.key !== 11.2 &&
|
||||
subMenu.key !== 11.3 &&
|
||||
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
|
||||
subMenu.key !== 2.0 &&
|
||||
subMenu.key !== 7.1 &&
|
||||
subMenu.key !== 12.0 &&
|
||||
subMenu.key !== 13.0
|
||||
"
|
||||
class="expan2"
|
||||
dense
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue