From 701355ed5705f86bfea66d7b0c705443d381add7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 21 Jul 2023 14:25:01 +0700 Subject: [PATCH 1/8] expanded tree --- .../components/PersonalList/OrgTree.vue | 325 +++++++++--------- .../components/PersonalList/Table.vue | 5 +- 2 files changed, 173 insertions(+), 157 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue index 5d2f99365..a2f2055b1 100644 --- a/src/modules/05_placement/components/PersonalList/OrgTree.vue +++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue @@ -58,6 +58,7 @@ const fetchPublishFile = async () => { // โหลดข้อมูลโครงสร้างจาก json const treeData = ref>([]); const loadTreeData = async () => { + expanded.value = []; await http .get(`${config.s3ClusterUrl}${selectedFile.value}`) .then((res: any) => { @@ -126,20 +127,20 @@ const myFilterMethod = (node: any, filter: string) => { // ((node.name && node.name == null) || !node.name) && (node.name && node.name.indexOf(filt) > -1) || (node.organizationName && node.organizationName.indexOf(filt) > -1) || - (node.positionNum && node.positionNum.indexOf(filt) > -1) || - (node.positionName && node.positionName.indexOf(filt) > -1) || - (node.governmentCode && - node.governmentCode.toString().indexOf(filt) > -1) || - (node.agency && node.agency.indexOf(filt) > -1) || - (node.government && node.government.indexOf(filt) > -1) || - (node.department && node.department.indexOf(filt) > -1) || - (node.pile && node.pile.indexOf(filt) > -1) || - (node.organizationShortName && - node.organizationShortName.indexOf(filt) > -1) || - (node.positionSideName && node.positionSideName.indexOf(filt) > -1) || - (node.executivePosition && node.executivePosition.indexOf(filt) > -1) || - (node.executivePositionSide && - node.executivePositionSide.indexOf(filt) > -1) || + (node.positionNum && node.positionNum.indexOf(filt) > -1) || + (node.positionName && node.positionName.indexOf(filt) > -1) || + (node.governmentCode && + node.governmentCode.toString().indexOf(filt) > -1) || + (node.agency && node.agency.indexOf(filt) > -1) || + (node.government && node.government.indexOf(filt) > -1) || + (node.department && node.department.indexOf(filt) > -1) || + (node.pile && node.pile.indexOf(filt) > -1) || + (node.organizationShortName && + node.organizationShortName.indexOf(filt) > -1) || + (node.positionSideName && node.positionSideName.indexOf(filt) > -1) || + (node.executivePosition && node.executivePosition.indexOf(filt) > -1) || + (node.executivePositionSide && + node.executivePositionSide.indexOf(filt) > -1) || (node.positionLevel && node.positionLevel.indexOf(filt) > -1) ); }; @@ -361,8 +362,10 @@ const checkPosition = (val: string) => { return num; }; const personal = ref(); +const expanded = ref([]); watch(props, () => { + expanded.value = []; const dataPersonal = props.personal; if (dataPersonal) { dataPersonal.map((data: any) => { @@ -373,26 +376,37 @@ watch(props, () => { // console.log("draft===>", personal.value.draft); - if (personal.value.draft === true) { + if (personal.value.draft === false) { // const findData = dataRespone.value.find(findByPerson); let findData: any = null; + console.log(dataRespone.value); + dataRespone.value.map((x: any) => { findData = findByPerson(x); if (findData != null) { console.log("findData===>", findData); - selectedPosition(findData) + selectedPosition(findData); + for (let i = 3; i <= findData.keyId.length; i += 2) { + expanded.value.push(findData.keyId.slice(0, i)); + } } - }) + }); // loadTreeData(); // selectedPosition(findData.children.children.children) } }); -function findByPerson(element: any) { +function findByPerson(element: any): any { // console.log("searchTree element===>", element) - if (element.positionNumId && element.positionLineId === personal.value.positionLineId && + if ( + element.positionNumId && + element.positionLineId === personal.value.positionLineId && element.positionTypeId === personal.value.positionTypeId && - element.positionNumId === personal.value.posNoId + element.positionNumId === personal.value.posNoId && + (element.positionLevelObj === null || + element.positionLevelObj[0].Id === personal.value.positionLevelId) && + (element.positionSideNameObj === null || + element.positionSideNameObj[0].Id === personal.value.positionPathSideId) ) { return element; } else if (element.children) { @@ -408,153 +422,156 @@ function findByPerson(element: any) { + + + + + +
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index d85c9247e..2eae18436 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -195,9 +195,9 @@ const convertContainStatus = (val: string) => { }; const convertDraft = (val: boolean) => { switch (val) { - case true: - return "รอส่งตัว"; case false: + return "รอส่งตัว"; + case true: return "ส่งตัวแล้ว"; default: return "-"; @@ -893,7 +893,6 @@ const paginationLabel = (start: number, end: number, total: number) => { - ส่งรายชื่อไปยังหน่วยงาน From f41c0ba6537bf9f5d54f78c8da4ff870d92220d1 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 21 Jul 2023 14:42:18 +0700 Subject: [PATCH 2/8] =?UTF-8?q?ui=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A1=E0=B8=AD?= =?UTF-8?q?=E0=B8=9A=E0=B8=AB=E0=B8=A1=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/probation/AddWork.vue | 2117 ++++++++++------- src/modules/05_placement/router.ts | 12 + 2 files changed, 1239 insertions(+), 890 deletions(-) diff --git a/src/modules/05_placement/components/probation/AddWork.vue b/src/modules/05_placement/components/probation/AddWork.vue index 3259cecac..871af71dc 100644 --- a/src/modules/05_placement/components/probation/AddWork.vue +++ b/src/modules/05_placement/components/probation/AddWork.vue @@ -1,904 +1,1235 @@ \ No newline at end of file +.text-top0 { + font-weight: 600; + padding-bottom: 8px; + color: rgb(70, 68, 68); +} +.text-Hd { + font-weight: 600; + font-size: 1rem; + padding-bottom: 5px; + color: #02a998; +} + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 417accbaf..9964173ae 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -31,6 +31,8 @@ const probationForm = () => const probationWorkAdd = () => import("@/modules/05_placement/components/probation/MainDetail.vue"); + const probationWorkAdd2 = () => + import("@/modules/05_placement/components/probation/AddWork.vue"); export default [ { path: "/placement", @@ -142,4 +144,14 @@ export default [ Role: "placement", }, }, + { + path: "/probation/add", + name: "probationWorkAdd", + component: probationWorkAdd2, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", + }, + }, ]; From cecb277d8a919d5224b89a066e3255f099e29105 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 21 Jul 2023 15:05:25 +0700 Subject: [PATCH 3/8] =?UTF-8?q?ui=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=A2?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=B0?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=82=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../04_registry/components/Profile.vue | 92 +++++++++++++++++++ src/modules/04_registry/router.ts | 14 +++ 2 files changed, 106 insertions(+) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index ade292c48..ffca86ac7 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -153,6 +153,49 @@
+ + + {{ + reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ" + }} + + + + + + + ถึงแก่กรรม + + + + + + ให้ออกจากราชการ + + + + + + ปลดออกจากราชการ + + + + + + ไล่ออกจากราชการ + + + + + + + + + + +
แนบใบมรณบัตร
+ + + ปิดหน้านี้ + + + + + + + + + + @@ -559,9 +637,11 @@ const dialog = ref(false); const dialogShort = ref(false); const dialogLeave = ref(false); const dialogImage = ref(false); +const dialogPassaway = ref(false); const loader = ref(false); //รอโหลด const statusEdit = ref(false); const activeImage = ref(null); +const filePassaway = ref(null); const images = ref([]); const profileId = ref(route.params.id.toString()); const profileType = ref(""); @@ -806,6 +886,10 @@ const closeImage = () => { dialogImage.value = false; }; +const closePassaway = () => { + dialogPassaway.value = false; +}; + const closeLeave = () => { dialogLeave.value = false; }; @@ -818,6 +902,10 @@ const closeKp7Short = () => { dialogShort.value = false; }; +const clickaddOrder = () => { + router.push({ name: "addOrder" }); +}; + const downloadKP7 = () => {}; const downloadKP7Short = () => {}; @@ -896,6 +984,10 @@ const clickRetire = async () => { } }; +const clickPassaway = async () => { + dialogPassaway.value = true; +}; + const Retire = async () => { if (reasonStatus.value == true) { loaderPage(true); diff --git a/src/modules/04_registry/router.ts b/src/modules/04_registry/router.ts index 7f78516ff..18571351a 100644 --- a/src/modules/04_registry/router.ts +++ b/src/modules/04_registry/router.ts @@ -4,6 +4,10 @@ const Main = () => import("@/modules/04_registry/views/Main.vue"); const Detail = () => import("@/modules/04_registry/components/Profile.vue"); +const addOrder = () => + import( + "@/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue" + ); export default [ { @@ -26,4 +30,14 @@ export default [ Role: "registry", }, }, + { + path: "/dismiss-order/add", + name: "addOrder", + component: addOrder, + meta: { + Auth: true, + Key: [7], + Role: "registry", + }, + }, ]; From cf7a653160eba1ad4325e963868d5048a2946353 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 21 Jul 2023 15:08:37 +0700 Subject: [PATCH 4/8] =?UTF-8?q?copy=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D>=20/resign-?= =?UTF-8?q?order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/OrderPlacement/ResignOrder.vue | 791 ++++++++++++++++++ src/modules/05_placement/router.ts | 12 + 2 files changed, 803 insertions(+) create mode 100644 src/modules/05_placement/components/OrderPlacement/ResignOrder.vue diff --git a/src/modules/05_placement/components/OrderPlacement/ResignOrder.vue b/src/modules/05_placement/components/OrderPlacement/ResignOrder.vue new file mode 100644 index 000000000..d4ac841a2 --- /dev/null +++ b/src/modules/05_placement/components/OrderPlacement/ResignOrder.vue @@ -0,0 +1,791 @@ + + + + + + \ No newline at end of file diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 8da059631..8861854ec 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -33,6 +33,8 @@ const probationWorkAdd = () => import("@/modules/05_placement/components/probation/MainDetail.vue"); const probationWorkAdd2 = () => import("@/modules/05_placement/components/probation/AddWork.vue"); + const resignOrder = () => + import("@/modules/05_placement/components/OrderPlacement/ResignOrder.vue"); export default [ { path: "/placement", @@ -153,5 +155,15 @@ export default [ Key: [6.3], Role: "placement", }, + }, + { + path: "/placement/resign-order", + name: "ResignOrderplacement", + component: resignOrder, + meta: { + Auth: true, + Key: [6.2], + Role: "placement", + }, }, ]; From b95e36304258f76103aa78a8b1c54925b4ee16d7 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 21 Jul 2023 15:15:50 +0700 Subject: [PATCH 5/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/04_registry/components/Profile.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index ffca86ac7..5fa28e74f 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -154,14 +154,7 @@ - + {{ reasonStatus ? "การกลับเข้ารับราชการ" : "การออกจากราชการ" }} From c13df46549f55983186bf596f8463d37efee4e04 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 21 Jul 2023 15:30:54 +0700 Subject: [PATCH 6/8] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=A2=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=A2=20retirement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 39 ++++++++++++++++++++++++++++++ src/views/MainLayout.vue | 11 +++++---- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index a37a5b0ad..9b9501dbe 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -206,6 +206,7 @@ const menuList = readonly([ }, ], }, + { key: 7, icon: "mdi-account-cancel-outline", @@ -213,6 +214,44 @@ const menuList = readonly([ label: "พ้นจากราชการ", path: "retirement", role: "retirement", + children: [ + { + key: 7.1, + label: "ประกาศเกษียณ", + path: "retirement", + role: "retirement", + }, + { + key: 7.2, + label: "ลาออก", + path: "resign", + role: "retirement", + }, + { + key: 7.3, + label: "คำสั่งลาออก", + path: "resign-order", + role: "retirement", + }, + { + key: 7.4, + label: "Exit interviwe", + // path: "", + role: "retirement", + }, + { + key: 7.5, + label: "ถึงแก่กรรม", + path: "deceased", + role: "retirement", + }, + { + key: 7.6, + label: "คำสั่งให้ออก ปลดออก ไล่ออก", + path: "dismiss-order", + role: "retirement", + }, + ], }, { key: 8, diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index ef5b9d5d2..f75b39507 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -719,6 +719,7 @@ if (keycloak.tokenParsed != null) { menuItem.key == 3 || menuItem.key == 5 || menuItem.key == 6 || + menuItem.key == 7 || menuItem.key == 8 " > @@ -942,11 +943,11 @@ if (keycloak.tokenParsed != null) { .expan2 .q-item { padding-left: 10%; } -.subLabel{ - white-space: nowrap; - width: 160px; - overflow: hidden; - text-overflow: ellipsis; +.subLabel { + white-space: nowrap; + width: 160px; + overflow: hidden; + text-overflow: ellipsis; } .font-400 { font-weight: 400; From 14e13941289680e30bce05c77f4ffe1a0d90e60e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 21 Jul 2023 16:38:02 +0700 Subject: [PATCH 7/8] no message --- src/modules/05_placement/components/PersonalList/OrgTree.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/OrgTree.vue b/src/modules/05_placement/components/PersonalList/OrgTree.vue index a2f2055b1..5cca4ecb9 100644 --- a/src/modules/05_placement/components/PersonalList/OrgTree.vue +++ b/src/modules/05_placement/components/PersonalList/OrgTree.vue @@ -373,10 +373,9 @@ watch(props, () => { }); console.log("personal", personal.value); } - // console.log("draft===>", personal.value.draft); - - if (personal.value.draft === false) { + + if (personal.value && personal.value.draft === false) { // const findData = dataRespone.value.find(findByPerson); let findData: any = null; console.log(dataRespone.value); From 6e15c59bdea996046d7b1538524646c7b407f77f Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 21 Jul 2023 17:13:48 +0700 Subject: [PATCH 8/8] update style send placement popup --- .../components/PersonalList/Table.vue | 861 +++++++----------- 1 file changed, 312 insertions(+), 549 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 2eae18436..c05d8a671 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -297,8 +297,8 @@ const saveDeferment = async () => { hideLoader(); }); }) - .onCancel(() => {}) - .onDismiss(() => {}); + .onCancel(() => { }) + .onDismiss(() => { }); } }); }; @@ -338,8 +338,8 @@ const saveDisclaim = async () => { hideLoader(); }); }) - .onCancel(() => {}) - .onDismiss(() => {}); + .onCancel(() => { }) + .onDismiss(() => { }); } }); }; @@ -441,6 +441,10 @@ const validateData = async () => { }); }; +const clickCloseSendModal = () => { + modaladdlist.value = false +} + const clickClose = async () => { userNote.value = ""; if (editRow.value == true) { @@ -537,435 +541,235 @@ const paginationLabel = (start: number, end: number, total: number) => {