Merge branch 'develop' into devTee

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 &&

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 */

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;
 

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) => ({

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

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"

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"

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 {