fixing sit 25

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