From 1aa4b6290f14ed54be6580d060a91a4c1e911178 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 10 Oct 2023 17:45:44 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=84?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=A7=E0=B9=88=E0=B8=B2=E0=B8=87=20?= =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Discharged/dischargedMain.vue | 13 +++++++++++-- .../components/Discharged/dischargedRegistry.vue | 2 +- .../components/DismissOrder/DismissOrder.vue | 13 +++++++++++-- .../components/DismissOrder/outRegistry.vue | 2 +- .../components/Expulsion/expulsionMain.vue | 13 +++++++++++-- .../components/Expulsion/expulsionRegistry.vue | 2 +- .../06_retirement/components/resign/Resign.vue | 13 +++++++++++-- 7 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/modules/06_retirement/components/Discharged/dischargedMain.vue b/src/modules/06_retirement/components/Discharged/dischargedMain.vue index 72b5954f5..18a3ec57e 100644 --- a/src/modules/06_retirement/components/Discharged/dischargedMain.vue +++ b/src/modules/06_retirement/components/Discharged/dischargedMain.vue @@ -133,7 +133,16 @@ const openModalOrder = () => { openModal(); const row = filters.value.filter( (r: ResponseData) => - r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE" + (r.status == "WAITTING" || + r.status == "PENDING" || + r.status == "APPROVE") && + r.organizationPositionOld && + r.positionTypeOld && + r.positionLevelOld && + r.positionNumberOld && + r.salary && + r.organization && + r.date ); rows2.value = row; }; @@ -148,7 +157,7 @@ const getData = async () => { data.map((r: ResponseData) => { list.push({ createdAt: date2Thai(r.createdAt), - date: new Date(), + date: r.date, firstName: r.firstName ?? "", id: r.id ?? "", isActive: r.isActive ? r.isActive : false, diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue index fd6bb90be..eba5c714c 100644 --- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue +++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue @@ -91,7 +91,7 @@ const getData = async () => { organizationPositionOld.value = data.organizationPositionOld ?? ""; positionTypeOld.value = data.positionTypeOld ?? ""; positionLevelOld.value = data.positionLevelOld ?? ""; - posNo.value = data.posNo ?? ""; + posNo.value = data.positionNumberOld ?? ""; salary.value = data.salary ?? ""; organization.value = data.organization ?? ""; date.value = data.date !== null ? new Date(data.date) : null; diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue index 7802c3aae..005ab821b 100644 --- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue +++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue @@ -116,7 +116,16 @@ const openModalOrder = () => { openModal(); const row = filters.value.filter( (r: ResponseData) => - r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE" + (r.status == "WAITTING" || + r.status == "PENDING" || + r.status == "APPROVE") && + r.organizationPositionOld && + r.positionTypeOld && + r.positionLevelOld && + r.positionNumberOld && + r.salary && + r.organization && + r.date ); rows2.value = row; }; @@ -132,7 +141,7 @@ const getData = async () => { data.map((r: ResponseData) => { list.push({ createdAt: date2Thai(r.createdAt), - date: new Date(), + date: r.date, firstName: r.firstName ?? "", id: r.id ?? "", isActive: r.isActive ? r.isActive : false, diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue index 43839ae3c..72c3a5287 100644 --- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue +++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue @@ -92,7 +92,7 @@ const getData = async () => { organizationPositionOld.value = data.organizationPositionOld ?? ""; positionTypeOld.value = data.positionTypeOld ?? ""; positionLevelOld.value = data.positionLevelOld ?? ""; - posNo.value = data.posNo ?? ""; + posNo.value = data.positionNumberOld ?? ""; salary.value = data.salary ?? ""; organization.value = data.organization ?? ""; date.value = data.date !== null ? new Date(data.date) : null; diff --git a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue index 7543d229f..a78a5521e 100644 --- a/src/modules/06_retirement/components/Expulsion/expulsionMain.vue +++ b/src/modules/06_retirement/components/Expulsion/expulsionMain.vue @@ -123,7 +123,16 @@ const openModalOrder = () => { openModal(); const row = filters.value.filter( (r: ResponseData) => - r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE" + (r.status == "WAITTING" || + r.status == "PENDING" || + r.status == "APPROVE") && + r.organizationPositionOld && + r.positionTypeOld && + r.positionLevelOld && + r.positionNumberOld && + r.salary && + r.organization && + r.date ); rows2.value = row; }; @@ -138,7 +147,7 @@ const getData = async () => { data.map((r: ResponseData) => { list.push({ createdAt: date2Thai(r.createdAt), - date: new Date(), + date: r.date, firstName: r.firstName ?? "", id: r.id ?? "", isActive: r.isActive ? r.isActive : false, diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue index 243d60ab5..3ac9103d8 100644 --- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue +++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue @@ -94,7 +94,7 @@ const getData = async () => { organizationPositionOld.value = data.organizationPositionOld ?? ""; positionTypeOld.value = data.positionTypeOld ?? ""; positionLevelOld.value = data.positionLevelOld ?? ""; - posNo.value = data.posNo ?? ""; + posNo.value = data.positionNumberOld ?? ""; salary.value = data.salary ?? ""; organization.value = data.organization ?? ""; date.value = data.date !== null ? new Date(data.date) : null; diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index a154ba0f2..25ff5e9bf 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -158,7 +158,16 @@ const openModalOrder = () => { openModal(); const row = filters.value.filter( (r: ResponseItems) => - r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE" + (r.status == "WAITTING" || + r.status == "PENDING" || + r.status == "APPROVE") && + r.organizationPositionOld && + r.positionTypeOld && + r.positionLevelOld && + r.positionNumberOld && + r.salary && + r.location && + r.sendDate ); rows2.value = row; }; @@ -195,7 +204,7 @@ const fecthlist = async () => { profileId: r.profileId ?? "", reason: r.reason ?? "", salary: r.salary ? r.salary : 0, - sendDate: new Date(), + sendDate: r.sendDate, status: r.status ?? "", statustext: statusText(r.status ?? ""), fullname: `${r.prefix ?? ""}${r.firstName ?? ""} ${r.lastName ?? ""}`,