From 6f9edd15458b2754f8cc781ccc54daecede21d88 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 22 Aug 2023 09:15:41 +0700 Subject: [PATCH 1/2] no message --- .../05_placement/components/AppointMent/Detail.vue | 13 ++++++++++--- .../05_placement/components/AppointMent/Main.vue | 2 ++ .../components/Relocation/RelocationMain.vue | 11 +++++++++++ .../components/Relocation/RelocationbyId.vue | 5 +++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue index e95135d42..7e184c97d 100644 --- a/src/modules/05_placement/components/AppointMent/Detail.vue +++ b/src/modules/05_placement/components/AppointMent/Detail.vue @@ -42,7 +42,7 @@ const salary = ref(""); const educationOld = ref(""); const reason = ref(""); const date = ref(null); - +const status = ref(""); onMounted(async () => { await fecthappointmentByid(); }); @@ -61,7 +61,8 @@ const fecthappointmentByid = async () => { title.value.organizationPositionOld = data.organizationPositionOld ?? "-"; title.value.positionLevelOld = data.positionLevelOld ?? "-"; title.value.positionTypeOld = data.positionTypeOld ?? "-"; - + status.value = data.status, + console.log("🚀 ~ file: Detail.vue:65 ~ .then ~ status:", status.value) educationOld.value = data.educationOld; organizationPositionOld.value = data.organizationPositionOld; positionTypeOld.value = data.positionTypeOld; @@ -71,6 +72,7 @@ const fecthappointmentByid = async () => { // organization.value = data.organization; //ไม่มี reason.value = data.reason; date.value = data.positionDate; + }) .catch((e) => { messageError($q, e); @@ -189,7 +191,8 @@ const getClass = (val: boolean) => { แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -
+
+
@@ -198,6 +201,10 @@ const getClass = (val: boolean) => {
+ + + +
diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 3f0854ee7..ecf1cb1f9 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -105,6 +105,7 @@ const fecthlistappointment = async () => { positionNumber: e.positionNumber, positionPath: e.positionPath, status: status(e.status), + birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth), })); // console.log(rows.value); @@ -474,6 +475,7 @@ const status = (val: string) => { ([ "fullname", "organizationName", "dateOfBirth", + "statusText", "btn", ]); const visibleColumns2 = ref([ @@ -113,6 +114,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "statusText", + align: "left", + label: "สถานะ", + sortable: true, + field: "statusText", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "btn", align: "left", @@ -486,6 +496,7 @@ onMounted(async () => { { แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
-
+
{ style="width: 80px" @click="cancelBtn" /> -
+
+
From 7d0c2217d45f2d69f2f9f7691138513f4c3b2a32 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 22 Aug 2023 14:02:35 +0700 Subject: [PATCH 2/2] no message --- .../components/AppointMent/Main.vue | 28 +++++++- .../05_placement/components/Other/Detail.vue | 72 ++++++++++--------- .../05_placement/components/Other/Main.vue | 27 +++++-- .../components/Relocation/RelocationMain.vue | 20 +++++- .../components/Discharged/dischargedMain.vue | 20 +++++- .../Discharged/dischargedRegistry.vue | 6 +- .../components/DismissOrder/DismissOrder.vue | 20 +++++- .../components/DismissOrder/outRegistry.vue | 71 +++++++++--------- .../components/Expulsion/expulsionMain.vue | 20 +++++- .../Expulsion/expulsionRegistry.vue | 68 ++++++++++-------- .../components/resign/Deceased.vue | 20 +++++- .../interface/response/discharged.ts | 2 +- .../interface/response/expulsion.ts | 2 +- 13 files changed, 262 insertions(+), 114 deletions(-) diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index ecf1cb1f9..9165fa683 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -8,6 +8,7 @@ import DialogOrgTree from "@/modules/05_placement/components/AppointMent/Appoint import { useCounterMixin } from "@/stores/mixin"; import http from "@/plugins/http"; import config from "@/app.config"; +import { WeekNumberContainer } from "@fullcalendar/core/internal"; const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง const { showLoader, @@ -53,6 +54,7 @@ const visibleColumns = ref([ "fullname", "organizationName", "birthday", + "createdAt", "status", ]); const visibleColumns2 = ref([ @@ -105,6 +107,7 @@ const fecthlistappointment = async () => { positionNumber: e.positionNumber, positionPath: e.positionPath, status: status(e.status), + createdAt:date2Thai(e.createdAt), birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth), })); @@ -170,8 +173,7 @@ const columns = ref([ field: "organizationName", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, { name: "birthday", @@ -182,6 +184,17 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "createdAt", + align: "left", + label: "วันที่ดำเนินการ", + sortable: true, + field: "createdAt", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + sort: (a, b) => (b.createdAt) - (a.createdAt) + + }, { name: "status", align: "left", @@ -192,6 +205,7 @@ const columns = ref([ style: "font-size: 14px", }, ]); + const columns2 = ref([ { name: "no", @@ -240,6 +254,7 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + ]); const openModalTree = (id: string) => { @@ -391,7 +406,7 @@ const status = (val: string) => { :columns="columns" :rows="rows" :filter="filterKeyword" - row-key="fullname" + row-key="citizenId" :visible-columns="visibleColumns" >