From ffa3631986315d6bd4f3376e15fdb761791dc022 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 1 Dec 2025 12:03:02 +0700
Subject: [PATCH 1/4] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2:=20=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=8D=E0=B8=8A=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/components/05_Leave/DetailLeavePage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index db801d50c..953bca091 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -1227,7 +1227,7 @@ onMounted(async () => {
           label="ส่งไปพิจารณา"
           color="secondary"
           @click="onSend"
-          :disable="rows?.approvers.length == 0 || rows?.commanders.length == 0"
+          :disable="rows?.approvers.length == 0"
           ><q-tooltip>คลิกเพื่อส่งไปพิจารณา</q-tooltip></q-btn
         >
       </q-card-actions>

From e51db11fe0a12e438bc788c3b91cc4f506fb44fe Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 2 Dec 2025 13:28:58 +0700
Subject: [PATCH 2/4] fix

---
 src/modules/15_development/components/Budget.vue                | 2 ++
 .../15_development/components/scholarship/DetailView.vue        | 1 +
 .../15_development/components/scholarship/DialogReturn.vue      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/15_development/components/Budget.vue b/src/modules/15_development/components/Budget.vue
index 2661281fd..ce85a9f88 100644
--- a/src/modules/15_development/components/Budget.vue
+++ b/src/modules/15_development/components/Budget.vue
@@ -204,6 +204,7 @@ defineExpose({
               label="จํานวนงบประมาณที่ขอรับการจัดสรร ฯ"
               mask="###,###,###,###,###"
               reverse-fill-mask
+              maxlength="18"
               @update:model-value="props.onCheckChangeData()"
             />
           </div>
@@ -216,6 +217,7 @@ defineExpose({
               v-model="formData.receive"
               mask="###,###,###,###,###"
               reverse-fill-mask
+              maxlength="18"
               label="จํานวนงบประมาณที่ได้รับการจัดสรร ฯ"
               @update:model-value="props.onCheckChangeData()"
             />
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index c61b07099..a16e770c5 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -1028,6 +1028,7 @@ onMounted(async () => {
                   label="งบประมาณที่ได้รับอนุมัติตลอดหลักสูตร"
                   mask="###,###,###,###,###,###"
                   reverse-fill-mask
+                  maxlength="18"
                   :rules="[
                     (val: any) => {
                       if (!val && !formBody.isNoUseBudget && formBody.fundType != 'FUND4') {
diff --git a/src/modules/15_development/components/scholarship/DialogReturn.vue b/src/modules/15_development/components/scholarship/DialogReturn.vue
index 0c0199316..27131c4b7 100644
--- a/src/modules/15_development/components/scholarship/DialogReturn.vue
+++ b/src/modules/15_development/components/scholarship/DialogReturn.vue
@@ -159,7 +159,7 @@ watch(
                     class="inputgreen"
                     :rules="[
                             (val:string) =>
-                                !!val || `${'กรุณากรอกหนังสือรายงานตัวกลับเข้าปฏิบัติราชการลงวันที่'}`,
+                                !!val || `${'กรุณาเลือกลงวันที่ของหนังสือรายงานตัวกลับเข้าปฏิบัติราชการ'}`,
                             ]"
                   >
                     <template v-slot:prepend>

From cac4ff2bfa37831c238b297c1983ca318003e429 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 2 Dec 2025 16:40:08 +0700
Subject: [PATCH 3/4] fix

---
 src/components/Dialogs/AddPersonal.vue        | 78 +++++++++++++------
 .../components/1_Complaint/Form.vue           |  6 +-
 .../components/1_Complaint/TableComplaint.vue |  4 +-
 .../components/2_InvestigateFacts/Form.vue    |  5 +-
 .../3_InvestigateDisciplinary/EditPage.vue    |  4 +
 .../3_InvestigateDisciplinary/Form.vue        |  2 +-
 .../3_InvestigateDisciplinary/Table.vue       |  3 +-
 .../components/4_Result/Form.vue              |  2 +-
 .../components/8_AppealComplain/Form.vue      |  2 +-
 .../11_discipline/components/UploadFile.vue   |  2 +-
 .../interface/response/complaint.ts           |  1 +
 .../11_discipline/store/ComplaintsStore.ts    |  1 +
 .../store/InvestigateDisStore.ts              |  1 +
 13 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 264c245d2..1efebccab 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -45,9 +45,11 @@ interface tableType {
 }
 
 const rows = ref<tableType[]>([]);
+const rowsMain = ref<tableType[]>([]);
 const type = ref<string>("citizenId");
 const search = ref<string>("");
 const selected = ref<any>([]);
+const isSelect = ref<boolean>(false);
 
 const employeeClass = ref<string>("officer");
 const employeeClassOption = ref<typeOp[]>([
@@ -105,6 +107,8 @@ const emit = defineEmits(["returnData"]);
 async function close() {
   modal.value = false;
   rows.value = [];
+  rowsMain.value = [];
+  selected.value = [];
   employeeClass.value = "officer";
   search.value = "";
 }
@@ -196,24 +200,26 @@ async function getSearch() {
         child3DnaId: e.child3DnaId,
         child4DnaId: e.child4DnaId,
       }));
+      rowsMain.value = list;
+      rows.value = list;
 
-      if (route.name == "disciplineInvestigatefactsEdit") {
-        const idIsSend = mainStore.rowsAdd
-          .filter(
-            (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true
-          )
-          .map((item: any) => item.personId);
-        rows.value = list.filter(
-          (item: any) => !idIsSend.includes(item.personId)
-        );
-      } else {
-        const idIsSend = mainStore.rowsAdd
-          .filter((item: any) => item.isAncestorDNA === true)
-          .map((item: any) => item.personId);
-        rows.value = list.filter(
-          (item: any) => !idIsSend.includes(item.personId)
-        );
-      }
+      // if (route.name == "disciplineInvestigatefactsEdit") {
+      //   const idIsSend = mainStore.rowsAdd
+      //     .filter(
+      //       (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true
+      //     )
+      //     .map((item: any) => item.personId);
+      //   rows.value = list.filter(
+      //     (item: any) => !idIsSend.includes(item.personId)
+      //   );
+      // } else {
+      //   const idIsSend = mainStore.rowsAdd
+      //     .filter((item: any) => item.isAncestorDNA === true)
+      //     .map((item: any) => item.personId);
+      //   rows.value = list.filter(
+      //     (item: any) => !idIsSend.includes(item.personId)
+      //   );
+      // }
     })
     .catch((err) => {
       messageError($q, err);
@@ -226,20 +232,33 @@ async function getSearch() {
 function updateSelect() {
   search.value = "";
 }
-watch(
-  () => props.selectedData,
-  () => {
-    if (props.selectedData) {
-      selected.value = props.selectedData;
-    }
-  }
-);
+// watch(
+//   () => props.selectedData,
+//   () => {
+//     if (props.selectedData) {
+//       selected.value = props.selectedData;
+//     }
+//   }
+// );
 
 function updatePagination(newPagination: any) {
   pagination.value.page = 1;
   pagination.value.rowsPerPage = newPagination.rowsPerPage;
 }
 
+function checkList(propsRow: tableType) {
+  // const filterCondition =
+  //   route.name === "disciplineInvestigatefactsEdit"
+  //     ? (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true
+  //     : (item: any) => item.isAncestorDNA === true;
+
+  const idIsSend = mainStore.rowsAdd
+    // .filter(filterCondition)
+    .map((item: any) => item.personId);
+
+  return !idIsSend.includes(propsRow.personId);
+}
+
 watch(
   () => pagination.value.rowsPerPage,
   async () => {
@@ -384,11 +403,20 @@ watch(
               <q-tr :props="props" class="cursor-pointer">
                 <td class="text-center">
                   <q-checkbox
+                    v-if="checkList(props.row)"
                     keep-color
                     color="primary"
                     dense
                     v-model="props.selected"
                   />
+                  <q-checkbox
+                    v-else
+                    disable
+                    keep-color
+                    color="primary"
+                    dense
+                    v-model="isSelect"
+                  />
                 </td>
                 <q-td v-for="col in props.cols" :key="col.name" :props="props">
                   <div v-if="col.name == 'no'">
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 9c085af6b..f09578759 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -182,7 +182,7 @@ function handleSave(returnData: any) {
 }
 
 /**
- * ฟังก์ชั่นสำหรับอัพโหลดไฟล์เอกสารหลักฐาน
+ * ฟังก์ชั่นสำหรับอัปโหลดไฟล์เอกสารหลักฐาน
  */
 function upLoadFileDoc() {
   const Data = new FormData();
@@ -195,7 +195,7 @@ function upLoadFileDoc() {
       countNum.value = 2;
       formData.documentFile = null;
 
-      success($q, "อัพโหลดไฟล์สำเร็จ");
+      success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
@@ -960,7 +960,7 @@ onMounted(async () => {
           <div class="row"><q-separator vertical /></div>
         </div>
 
-        <!-- อัพโหลดไฟล์ -->
+        <!-- อัปโหลดไฟล์ -->
         <div class="col-sm-12 col-md-3">
           <div flat class="q-pa-md">
             <div class="col-12 row q-col-gutter-md">
diff --git a/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue b/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue
index a0bccc8fd..6f6758130 100644
--- a/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue
+++ b/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue
@@ -173,10 +173,12 @@ onMounted(() => {
             @click="onDetail(props.row.id)"
             ><q-tooltip>รายละเอียด</q-tooltip></q-btn
           >
+
           <q-btn
             v-if="
               checkPermission($route)?.attrIsUpdate &&
-              checkPermission($route)?.attrIsGet
+              checkPermission($route)?.attrIsGet &&
+              props.row.statusMain != 'SEND_INVESTIGATE'
             "
             id="addComplaints"
             for="addComplaints"
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index b95ae7ad4..b8e6e5b48 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -546,7 +546,7 @@ function onclickViewinfo(id: string, type: string) {
   isEmpType.value = type;
 }
 
-/** อัพเดต ปิด/เปิดเมนู ทะเบียนประวัติ */
+/** อัปเดต ปิด/เปิดเมนู ทะเบียนประวัติ */
 function updatemodalPersonal(modal: boolean) {
   modalPersonal.value = modal;
 }
@@ -1287,7 +1287,6 @@ onMounted(async () => {
                         </div>
                       </div>
 
-                      <!-- วันที่สืบสวน (List Log) -->
                       <div
                         v-if="
                           formData.investigationExtendHistory !== null &&
@@ -1761,7 +1760,7 @@ onMounted(async () => {
     </q-form>
   </div>
 
-  <!-- อัพโหลดไฟล์ -->
+  <!-- อัปโหลดไฟล์ -->
   <DialogDuty
     :modal="modalEditDirector"
     :close-popup="closeEditDirector"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index 3c109cb54..1bf6a12a2 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -161,6 +161,8 @@ async function fetchDetailInvestigate() {
       )
     )
     .then((res) => {
+      console.log(res);
+
       const dataList = res.data.result;
       dataInvestigatefacts.id = dataList.id;
       dataInvestigatefacts.idComplaint = dataList.idComplaint;
@@ -191,6 +193,8 @@ async function fetchDetailInvestigate() {
         dataList.investigationDaysExtend;
       dataInvestigatefacts.organizationId = dataList.organizationId;
       dataInvestigatefacts.organization = dataList.organization;
+      dataInvestigatefacts.investigationExtendHistory =
+        dataList.investigationExtendHistory;
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 7d7ad81db..1afb7673e 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -1849,7 +1849,7 @@ onMounted(async () => {
           </div>
           <div class="row"><q-separator vertical /></div>
         </div>
-        <!-- อัพโหลดไฟล์ -->
+        <!-- อัปโหลดไฟล์ -->
         <div class="col-xs-12 col-sm-12 col-md-3">
           <div class="q-col-gutter-md row q-pa-md">
             <!-- ยังไม่มี api  -->
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
index 04ae6b6ac..950ff47e7 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
@@ -244,7 +244,8 @@ function filterOptionFn(val: string, update: Function) {
               <q-btn
                 v-if="
                   checkPermission($route)?.attrIsUpdate &&
-                  checkPermission($route)?.attrIsGet
+                  checkPermission($route)?.attrIsGet &&
+                  props.row.startMain !== 'DONE'
                 "
                 flat
                 dense
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index db7733034..0c9ca761f 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -633,7 +633,7 @@ watch(
           <div class="row"><q-separator vertical /></div>
         </div>
 
-        <!-- อัพโหลดไฟล์ -->
+        <!-- อัปโหลดไฟล์ -->
         <div class="col-sm-12 col-md-3 q-pa-md">
           <q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
             <div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index dea819eea..51b746fdb 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -658,7 +658,7 @@ onMounted(() => {
             </div>
             <div class="row"><q-separator vertical /></div>
           </div>
-          <!-- อัพโหลดไฟล์ -->
+          <!-- อัปโหลดไฟล์ -->
           <div v-if="isReadonly" class="col-sm-12 col-md-3 q-pa-md">
             <q-card
               bordered
diff --git a/src/modules/11_discipline/components/UploadFile.vue b/src/modules/11_discipline/components/UploadFile.vue
index b53b14f8b..c062b6d96 100644
--- a/src/modules/11_discipline/components/UploadFile.vue
+++ b/src/modules/11_discipline/components/UploadFile.vue
@@ -87,7 +87,7 @@ async function uploadFile() {
     .then(() => {
       file.value = null;
       props.fetchData();
-      success($q, "บันทึกข้อมูลสำเร็จ");
+      success($q, "อัปโหลดไฟล์สำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/11_discipline/interface/response/complaint.ts b/src/modules/11_discipline/interface/response/complaint.ts
index 0d82c29e0..f3e69103c 100644
--- a/src/modules/11_discipline/interface/response/complaint.ts
+++ b/src/modules/11_discipline/interface/response/complaint.ts
@@ -9,6 +9,7 @@ interface DataListRow {
   levelConsideration: string;
   dateConsideration: string | null;
   status: string;
+  statusMain?: string;
 }
 interface DataAdd {
   id: string;
diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts
index 7993b203c..e35f4ef5e 100644
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@@ -45,6 +45,7 @@ export const useComplainstDataStore = defineStore(
           ? date2Thai(e.dateConsideration)
           : "-",
         status: e.status ? statusTothai(e.status) : "-",
+        statusMain: e.status,
       }));
       rows.value = dataList;
     }
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index d93cdce23..f582bddb1 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -277,6 +277,7 @@ export const useInvestigateDisStore = defineStore(
               )}`
             : "-",
         status: convertStatus(e.status) ?? "-",
+        startMain: e.status,
         dateReceived: e.dateReceived ? date2Thai(e.dateReceived) : "-",
       }));
 

From 5cf6edd2f21e3916bc3e3dbe1b234862bc0b818f Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 2 Dec 2025 17:14:30 +0700
Subject: [PATCH 4/4] roll back leave fix commander

---
 src/modules/09_leave/components/05_Leave/DetailLeavePage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index 953bca091..db801d50c 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -1227,7 +1227,7 @@ onMounted(async () => {
           label="ส่งไปพิจารณา"
           color="secondary"
           @click="onSend"
-          :disable="rows?.approvers.length == 0"
+          :disable="rows?.approvers.length == 0 || rows?.commanders.length == 0"
           ><q-tooltip>คลิกเพื่อส่งไปพิจารณา</q-tooltip></q-btn
         >
       </q-card-actions>