hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m22s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-11-24 11:33:59 +07:00
commit 1e8eea707e
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -769,6 +769,8 @@ function onSubmitDate() {
*/ */
function openModalOrder(val: boolean) { function openModalOrder(val: boolean) {
// ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" && // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
console.log(rowsOrder.value);
rowsOrder.value = rows.value.filter( rowsOrder.value = rows.value.filter(
(e: any) => (e: any) =>
(DataStore.isStaff && (DataStore.isStaff &&
@ -779,7 +781,15 @@ function openModalOrder(val: boolean) {
e.statusId !== "REPORT" && e.statusId !== "REPORT" &&
e.statusId !== "DONE") || e.statusId !== "DONE") ||
(DataStore.isOfficer && (DataStore.isOfficer &&
// e.bmaOfficer != "บุคคลภายนอก" && e.bmaOfficer != "บุคคลภายนอก" &&
e.rootId != e.rootIdOld &&
e.draft == "ส่งตัวแล้ว" &&
e.nodeName !== null &&
e.reportingDate !== null &&
e.statusId !== "REPORT" &&
e.statusId !== "DONE") ||
(DataStore.isOfficer &&
e.root === "สำนักปลัดกรุงเทพมหานคร" &&
e.rootId != e.rootIdOld && e.rootId != e.rootIdOld &&
e.draft == "ส่งตัวแล้ว" && e.draft == "ส่งตัวแล้ว" &&
e.nodeName !== null && e.nodeName !== null &&