From 5808e94b8bb1a90d84d1b94bee6d1420768dbac3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 9 Jan 2024 18:03:45 +0700 Subject: [PATCH 1/5] no message --- .../12_evaluatePersonal/components/Detail/step/step3.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue index 7d598f2c7..f89edbf2e 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue @@ -131,7 +131,7 @@ onMounted(() => { > แบบตรวจสอบความถูกต้องครบถ้วนของข้อมูลเพื่อประกอบการคัดเลือกบุคคล - (เอกสารแบบ ก.) Date: Wed, 10 Jan 2024 10:03:17 +0700 Subject: [PATCH 2/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20filteStatus=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/10_order/views/Main.vue | 12 +++--------- .../11_discipline/components/9_Order/MainPage.vue | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/modules/10_order/views/Main.vue b/src/modules/10_order/views/Main.vue index d712763f9..1cca30c22 100644 --- a/src/modules/10_order/views/Main.vue +++ b/src/modules/10_order/views/Main.vue @@ -229,7 +229,9 @@ const OrderStatus = ref("ทั้งหมด"); const OrderStatusOption = ref([ { id: "ทั้งหมด", name: "ทั้งหมด" }, ]); -const OrderStatusFilter1 = ref([]); +const OrderStatusFilter1 = ref([ + { id: "ทั้งหมด", name: "ทั้งหมด" }, +]); const addedOrderStatusValues: string[] = []; const OrderStatusFilter = async () => { for (let data of OriginalData.value) { @@ -243,15 +245,7 @@ const OrderStatusFilter = async () => { } if (!addedOrderStatusValues.includes(OrderStatusValue)) { - OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }]; - OrderStatusOption.value.push({ - // id: OrderStatusValue, - id: OrderStatusOption.value.length.toString(), - name: OrderStatusValue, - }); - OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }]; OrderStatusFilter1.value.push({ - // id: OrderStatusValue, id: OrderStatusFilter1.value.length.toString(), name: OrderStatusValue, }); diff --git a/src/modules/11_discipline/components/9_Order/MainPage.vue b/src/modules/11_discipline/components/9_Order/MainPage.vue index a75b6ffcb..6f0da331b 100644 --- a/src/modules/11_discipline/components/9_Order/MainPage.vue +++ b/src/modules/11_discipline/components/9_Order/MainPage.vue @@ -224,7 +224,9 @@ const OrderStatus = ref("ทั้งหมด"); const OrderStatusOption = ref([ { id: "ทั้งหมด", name: "ทั้งหมด" }, ]); -const OrderStatusFilter1 = ref([]); +const OrderStatusFilter1 = ref([ + { id: "ทั้งหมด", name: "ทั้งหมด" }, +]); const addedOrderStatusValues: string[] = []; const OrderStatusFilter = async () => { for (let data of stroe.mainData) { @@ -238,15 +240,7 @@ const OrderStatusFilter = async () => { } if (!addedOrderStatusValues.includes(OrderStatusValue)) { - OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }]; - OrderStatusOption.value.push({ - // id: OrderStatusValue, - id: OrderStatusOption.value.length.toString(), - name: OrderStatusValue, - }); - OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }]; OrderStatusFilter1.value.push({ - // id: OrderStatusValue, id: OrderStatusFilter1.value.length.toString(), name: OrderStatusValue, }); From 507763bbbf2e9b0835dd123e93ac32800134456f Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 10 Jan 2024 10:05:24 +0700 Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?= =?UTF-8?q?=E0=B8=B4=E0=B8=99=20>>=20=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=95=E0=B8=AD=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=206=20?= =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B9=80=E0=B8=95=E0=B8=A3=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=A1=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=A5=E0=B9=88=E0=B8=A1=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/12_evaluatePersonal/components/Detail/step/step6.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue index 9a63c3136..4df260d41 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue @@ -109,6 +109,7 @@ onMounted(() => {
Date: Wed, 10 Jan 2024 11:04:27 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=20?= =?UTF-8?q?=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=97=E0=B8=B4=E0=B8=99=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B3=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../09_leave/views/ChangeRoundMain.vue | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/ChangeRoundMain.vue index ed6d7b1b2..48509c548 100644 --- a/src/modules/09_leave/views/ChangeRoundMain.vue +++ b/src/modules/09_leave/views/ChangeRoundMain.vue @@ -56,11 +56,30 @@ function Openmodal(check: string, detail: any) { } } +/** + * function เรียกข้อมูลปฏิทินวันทำงาน + * @param id profileId + */ +async function fetchDataCalendarWork(id: string) { + showLoader(); + await http + .get(config.API.leaveWorkByid(id)) + .then((res) => { + dateWork.value = res.data.result.work; + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + modalFix.value = true; + hideLoader(); + }); +} + const detailByid = ref(); -function OpenmodalFix(detail: any) { - dateWork.value = "NORMAL"; +async function OpenmodalFix(detail: any) { + await fetchDataCalendarWork(detail.profileId); detailByid.value = detail; - modalFix.value = true; } /** Function closePopup */ From 914db6dd3bd35e1124c00d3451117f7ed30e8d2c Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 10 Jan 2024 12:36:22 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20bug=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=B8=E0=B8=A1=E0=B8=B1=E0=B8=95=E0=B8=B4?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7?= =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../09_leave/components/4_specialTime/DialogApprove.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue index 0e52be3fc..10821b360 100644 --- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue +++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue @@ -29,8 +29,8 @@ const props = defineProps({ date: { type: String, default: "" }, dateFix: { type: String, default: "" }, id: { type: String, default: "" }, - checkInStatus: { type: String, default: "NORMAL" }, - checkOutStatus: { type: String, default: "NORMAL" }, + checkInStatus: { type: String, default: "" }, + checkOutStatus: { type: String, default: "" }, closeDialog: { type: Function, default: () => {} }, detailData: Object, }); @@ -125,7 +125,6 @@ function close() { watch( () => props.modal, () => { - console.log("props===>", props); if (props.editCheck === "APPROVE") { formData.checkIn = ""; formData.checkOut = ""; @@ -145,7 +144,7 @@ watch( !props.detailData.checkInEdit && props.detailData.checkOutEdit ) { - formData.checkIn = props.detailData.startAfternoon; + formData.checkIn = props.detailData.startTimeAfternoon; formData.checkOut = props.detailData.endTimeAfternoon; } formData.note = props.detailData.note;