From 38fc145e931c96354b9f5df862605a4167f36488 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 25 Nov 2025 09:43:44 +0700 Subject: [PATCH 1/5] fix(probation): probationPersonalList status --- .../components/probation/DialogOrder.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue index 6cc4f26bc..351cc3d92 100644 --- a/src/modules/05_placement/components/probation/DialogOrder.vue +++ b/src/modules/05_placement/components/probation/DialogOrder.vue @@ -96,7 +96,7 @@ const columns = ref([ name: "name", align: "left", label: "ชื่อ-นามสกุล", - sortable: true, + sortable: false, field: "name", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -105,7 +105,7 @@ const columns = ref([ name: "position_line", align: "left", label: "ตำแหน่งในสายงาน", - sortable: true, + sortable: false, field: "position_line", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -114,7 +114,7 @@ const columns = ref([ name: "position_level", align: "left", label: "ระดับ", - sortable: true, + sortable: false, field: "position_level", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -123,7 +123,7 @@ const columns = ref([ name: "organization", align: "left", label: "สังกัด", - sortable: true, + sortable: false, field: "organization", headerStyle: "font-size: 14px", style: "font-size: 14px ", @@ -133,7 +133,7 @@ const columns = ref([ name: "probation_no", align: "center", label: "ครั้งที่ทดลองปฏิบัติหน้าที่ราชการ", - sortable: true, + sortable: false, field: "probation_no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -145,7 +145,7 @@ const columns = ref([ name: "order_number", align: "center", label: "เลขที่คําสั่งบรรจุแต่งตั้ง", - sortable: true, + sortable: false, field: "order_number", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -157,7 +157,7 @@ const columns = ref([ name: "probation_status", align: "left", label: "สถานะ", - sortable: true, + sortable: false, field: "probation_status", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -203,7 +203,7 @@ async function getList() { .get( config.API.probationPersonalList() + `?status=${ - commandType.value ? (commandType.value == "C-PM-11" ? 2 : 3) : "" + commandType.value ? (commandType.value == "C-PM-11" ? 3 : 2) : "" }&page=${pagination.value.page}&pageSize=${ pagination.value.rowsPerPage }&keyword=${filter.value.trim()}` From 273487cb50926e0cd63fb9c2f927b0848e43ec0d Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 25 Nov 2025 10:39:51 +0700 Subject: [PATCH 2/5] fix(salary): status isPunish --- .../13_salary/components/04_salaryLists/TableTypePending.vue | 2 +- .../components/05_salaryListsEmployee/TableTypePending.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue index b9c8dd646..dde372515 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue @@ -529,7 +529,7 @@ function onClickViewInfo(type: string, id: string) {
Date: Tue, 25 Nov 2025 15:42:07 +0700 Subject: [PATCH 3/5] fix(placement):filter --- .../components/PersonalList/Table.vue | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 2892a916c..4dc36d34d 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -415,14 +415,19 @@ async function getTable() { rowsAwait.value = rowData; await onUpdateNewRows(typeEmployee.value, positionCandidate.value); + const filteredRows = await filterRowsMain( + typeEmployee.value, + positionCandidate.value + ); + // รายชื่อไปยังหน่วยงาน - rowsFilter.value = await rows.value.filter( + rowsFilter.value = await filteredRows.filter( (e: any) => e.draft == "รอส่งตัว" && e.nodeName !== null && e.reportingDate !== null ); - rowsFilterData.value = await rows.value.filter( + rowsFilterData.value = await filteredRows.filter( (e: any) => e.draft == "รอส่งตัว" && e.nodeName !== null && @@ -830,6 +835,25 @@ async function onUpdateNewRows(type: string, pos: string) { }); } +async function filterRowsMain(type: string, pos: string) { + return rowsAwait.value.filter((item: any) => { + const isTypeMatch = + type === "OFFICER" + ? item.bmaOfficerCheck === "OFFICER" + : type === "EXTERNAL" + ? item.bmaOfficerCheck === null + : item.bmaOfficerCheck === "OFFICER" || item.bmaOfficerCheck === null; + + const isPositionMatch = pos === "" || item.positionCandidate === pos; + + const isStatusMatch = containStatus.value + ? item.statusId === "DONE" + : item.statusId !== "DONE"; + + return isTypeMatch && isPositionMatch && isStatusMatch; + }); +} + async function getWorkFlow() { showLoader(); await http From d72551f90bb574e183e6156a259c424e2ee0c261 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 25 Nov 2025 16:55:40 +0700 Subject: [PATCH 4/5] fix --- src/modules/05_placement/components/PersonalList/Table.vue | 3 ++- .../05_placement/components/probation/MainProbation.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 4dc36d34d..07dfad06d 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -1196,7 +1196,8 @@ onMounted(async () => { v-if=" props.row.statusId === 'UN-CONTAIN' || (props.row.statusId === 'PREPARE-CONTAIN' && - checkPermission($route)?.attrIsUpdate) + checkPermission($route)?.attrIsUpdate && + !props.row.root) " clickable v-close-popup diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 31c5a2227..f3190d4ea 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -102,7 +102,7 @@ const columns = ref([ label: "สังกัด", sortable: true, field: "organization", - headerStyle: "font-size: 14px", + headerStyle: "font-size: 14px;min-width: 250px", style: "font-size: 14px ", classes: "table_ellipsis", }, From 5aa48d73d3683609b6461020c079fd39d1771c2e Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 25 Nov 2025 17:20:38 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B8=A3=E0=B8=AB?= =?UTF-8?q?=E0=B8=B2=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AA=E0=B8=A1?= =?UTF-8?q?=E0=B8=B1=E0=B8=84=E0=B8=A3=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=81?= =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../03_recruiting/views/02_qualify/Period.vue | 20 +++++++++----- .../views/02_qualify/PeriodAdd.vue | 27 ++++++++++++------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/modules/03_recruiting/views/02_qualify/Period.vue b/src/modules/03_recruiting/views/02_qualify/Period.vue index f3a1a85b4..f55598bf9 100644 --- a/src/modules/03_recruiting/views/02_qualify/Period.vue +++ b/src/modules/03_recruiting/views/02_qualify/Period.vue @@ -260,13 +260,17 @@ async function deleteData(id: string) { * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง * @param val ช่วงวันที่ */ -function dateThaiRange(val: [Date, Date]) { +function dateThaiRange(val: [Date, Date], time: boolean = false) { if (val === null) { return "-"; } else if (date2Thai(val[0], true) === date2Thai(val[1], true)) { - return `${date2Thai(val[0], true)}`; + return `${date2Thai(val[0], true, time)}`; } else { - return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`; + return `${date2Thai(val[0], true, time)} - ${date2Thai( + val[1], + true, + time + )}`; } } @@ -355,11 +359,15 @@ onMounted(async () => { {{ props.rowIndex + 1 }}
+
+ {{ dateThaiRange(col.value, true) }} +
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue index 53924ea73..8d93dd0e7 100644 --- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue +++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue @@ -768,13 +768,19 @@ function clickDeletePosition(row: any) { * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง * @param val ช่วงวันที่ */ -function dateThaiRange(val: [Date, Date] | null) { +function dateThaiRange(val: [Date, Date] | null, showTime: boolean = false) { if (val === null) { return ""; - } else if (date2Thai(val[0], true) === date2Thai(val[1], true)) { - return `${date2Thai(val[0], true)}`; + } else if ( + date2Thai(val[0], true, showTime) === date2Thai(val[1], true, showTime) + ) { + return `${date2Thai(val[0], true, showTime)}`; } else { - return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`; + return `${date2Thai(val[0], true, showTime)} - ${date2Thai( + val[1], + true, + showTime + )}`; } } @@ -1145,6 +1151,11 @@ onMounted(async () => { borderless range week-start="0" + :enableTimePicker="true" + :start-time="[ + { hours: 8, minutes: 0 }, + { hours: 16, minutes: 0 }, + ]" >