From 7e462f6e3ea21d4c2bac31aac7d92834795c9a71 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Dec 2024 16:35:57 +0700
Subject: [PATCH 1/4] fix Call API province

---
 src/modules/15_development/components/Other.vue         | 2 +-
 src/modules/15_development/components/ProjectDetail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/15_development/components/Other.vue b/src/modules/15_development/components/Other.vue
index 93acfef4e..9a5b136c9 100644
--- a/src/modules/15_development/components/Other.vue
+++ b/src/modules/15_development/components/Other.vue
@@ -127,7 +127,7 @@ const formData = reactive<FormData>({
 /** ดึงข้อมูล จังหวัด */
 function getProvince() {
   http
-    .get(config.API.province)
+    .get(config.API.orgProvince)
     .then((res) => {
       const data = res.data.result;
 
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 3bade272e..15f04d24e 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -128,7 +128,7 @@ const expanded2 = ref<Array<string | null>>([]);
  */
 function fetchProvince() {
   http
-    .get(config.API.province)
+    .get(config.API.orgProvince)
     .then((res) => {
       const data = res.data.result;
       provinceOp.value = data.map((item: DataOption) => ({

From 8d9ff789c0247ff17a16c96ea42c4a861b0f4095 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 25 Dec 2024 18:50:41 +0700
Subject: [PATCH 2/4] fixing sit 25

---
 .../05_placement/components/PersonalList/Table.vue       | 2 ++
 src/modules/18_command/components/Step/View0_Digital.vue | 9 ++++++++-
 src/modules/18_command/components/Step/View0_Live.vue    | 9 ++++++++-
 src/modules/18_command/interface/request/Main.ts         | 1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 71db2219c..2d01035ef 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -752,6 +752,7 @@ function onSubmitDate() {
  */
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
+
   rowsOrder.value = rows.value.filter(
     (e: any) =>
       (DataStore.isStaff &&
@@ -762,6 +763,7 @@ function openModalOrder(val: boolean) {
         e.statusId !== "REPORT" &&
         e.statusId !== "DONE") ||
       (DataStore.isOfficer &&
+        e.bmaOfficer != "บุคคลภายนอก" &&
         e.rootId != e.rootIdOld &&
         e.draft == "ส่งตัวแล้ว" &&
         e.nodeName !== null &&
diff --git a/src/modules/18_command/components/Step/View0_Digital.vue b/src/modules/18_command/components/Step/View0_Digital.vue
index b50dc30d1..2ae8b4ed8 100644
--- a/src/modules/18_command/components/Step/View0_Digital.vue
+++ b/src/modules/18_command/components/Step/View0_Digital.vue
@@ -491,7 +491,14 @@ onMounted(async () => {
               </q-card>
             </div>
 
-            <div class="col-6" v-if="isAttachment">
+            <div
+              class="col-6"
+              v-if="
+                isAttachment ||
+                (store.dataCommand &&
+                  store.dataCommand.commandCode == 'C-PM-38')
+              "
+            >
               <q-card
                 bordered
                 class="row col-12"
diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index ae8aef787..93bf0933b 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -392,7 +392,14 @@ onMounted(async () => {
               </q-card>
             </div>
 
-            <div class="col-6" v-if="isAttachment">
+            <div
+              class="col-6"
+              v-if="
+                isAttachment ||
+                (store.dataCommand &&
+                  store.dataCommand.commandCode == 'C-PM-38')
+              "
+            >
               <q-card
                 bordered
                 class="row col-12"
diff --git a/src/modules/18_command/interface/request/Main.ts b/src/modules/18_command/interface/request/Main.ts
index 00f3f021f..c5b9f70c0 100644
--- a/src/modules/18_command/interface/request/Main.ts
+++ b/src/modules/18_command/interface/request/Main.ts
@@ -22,6 +22,7 @@ interface FormDataDetail {
   commandAffectDate: Date | null; //วันที่ลงนาม
   commandExcecuteDate: Date | null; //วันที่คำสั่งมีผล
   isBangkok: string | null; //คำสั่งสำนักปลัดกรุงเทพมหานคร
+  commandCode?: string; //รหัสคำสั่ง
 }
 
 interface FormCommandList {

From 8fcdb9c91903d8fa1f4ed70091cd979876258d27 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Dec 2024 18:55:16 +0700
Subject: [PATCH 3/4] fix

---
 .../15_development/components/scholarship/DetailView.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 9a2a260f2..8d1fcd4ec 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -576,7 +576,7 @@ onMounted(async () => {
         class="q-mr-sm"
         icon="mdi-arrow-left"
         color="primary"
-        @click="router.go(-1)"
+        @click="router.push('/development/scholarship')"
       />
       {{
         checkRouteDetail

From b4a4d8c641feecfc5c9c9e44d19ba3dcf9bd4d62 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Dec 2024 20:41:31 +0700
Subject: [PATCH 4/4] =?UTF-8?q?fix=20load=20report=20=E0=B8=96=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=87=E0=B9=81=E0=B8=81=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/05_deceased/DetailDeceased.vue  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/06_retirement/components/05_deceased/DetailDeceased.vue b/src/modules/06_retirement/components/05_deceased/DetailDeceased.vue
index 33a000193..8e463505a 100644
--- a/src/modules/06_retirement/components/05_deceased/DetailDeceased.vue
+++ b/src/modules/06_retirement/components/05_deceased/DetailDeceased.vue
@@ -75,9 +75,10 @@ async function fileDownload(type: string) {
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /** Hook */