From d065650e1bbf85ef2e1cd93995be24f2108bca16 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 10 Oct 2024 11:52:53 +0700
Subject: [PATCH] fix command

---
 .../18_command/components/Step/0_Main.vue     |  1 +
 .../18_command/components/Step/1_Detail.vue   |  9 +---
 .../components/Step/2_ListPersons.vue         | 19 +++------
 .../components/Step/3_ReceivedCopy.vue        |  7 ----
 src/modules/18_command/views/detail.vue       | 41 ++-----------------
 5 files changed, 12 insertions(+), 65 deletions(-)

diff --git a/src/modules/18_command/components/Step/0_Main.vue b/src/modules/18_command/components/Step/0_Main.vue
index f45c19ae3..cf9415f61 100644
--- a/src/modules/18_command/components/Step/0_Main.vue
+++ b/src/modules/18_command/components/Step/0_Main.vue
@@ -46,6 +46,7 @@ async function fetchData() {
       isDraft.value = data.isDraft;
       isSign.value = data.isSign;
       isAttachment.value = data.isAttachment;
+      store.readonly = step.value === 5;
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 7ef602a47..d1ab3c6d6 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref, watch } from "vue";
+import { onMounted, reactive, ref } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 
@@ -102,13 +102,6 @@ onMounted(() => {
     : props.formCommandList.isBangkok;
   fetchCheckIdofficer();
 });
-
-/**
- * ฟังก์ชันที่ต้องการนำฟังก์ชันออกไปใช้ใน Components แม่
- */
-defineExpose({
-  onSubmit,
-});
 </script>
 
 <template>
diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue
index abfd7ec40..a9464e53a 100644
--- a/src/modules/18_command/components/Step/2_ListPersons.vue
+++ b/src/modules/18_command/components/Step/2_ListPersons.vue
@@ -122,9 +122,9 @@ async function onSawpPos(val: any, type: string) {
   showLoader();
   await http
     .get(config.API.commandSwap("tab2", type, val.id))
-    .then((res) => {
+    .then(async () => {
+      await getPersonList();
       success($q, "แก้ไขข้อมูลสำเร็จ");
-      getPersonList();
     })
     .catch((e) => {
       messageError($q, e);
@@ -139,9 +139,9 @@ function onDelete(id: string) {
     showLoader();
     await http
       .delete(config.API.commandAction(id, "tab2"))
-      .then((res) => {
+      .then(async () => {
+        await getPersonList();
         success($q, "ลบข้อมูลสำเร็จ");
-        getPersonList();
       })
       .catch((e) => {
         messageError($q, e);
@@ -228,8 +228,8 @@ async function getPersonList() {
   showLoader();
   await http
     .get(config.API.commandAction(commandId.value, "tab2"))
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       templatePos.value = data.commandSalaryId;
       position.value = data.positionDetail;
       rows.value = data.commandRecives;
@@ -248,13 +248,6 @@ onMounted(async () => {
     await getCommandSalaryList(props.commandSysId);
   }
 });
-
-/**
- * ฟังก์ชันที่ต้องการนำฟังก์ชันออกไปใช้ใน Components แม่
- */
-defineExpose({
-  onSubmit,
-});
 </script>
 
 <template>
diff --git a/src/modules/18_command/components/Step/3_ReceivedCopy.vue b/src/modules/18_command/components/Step/3_ReceivedCopy.vue
index d8a70db27..4f20c3626 100644
--- a/src/modules/18_command/components/Step/3_ReceivedCopy.vue
+++ b/src/modules/18_command/components/Step/3_ReceivedCopy.vue
@@ -196,13 +196,6 @@ function onSubmit() {
 onMounted(() => {
   fetchData();
 });
-
-/**
- * ฟังก์ชันที่ต้องการนำฟังก์ชันออกไปใช้ใน Components แม่
- */
-defineExpose({
-  onSubmit,
-});
 </script>
 
 <template>
diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue
index 340ced511..0314e0e77 100644
--- a/src/modules/18_command/views/detail.vue
+++ b/src/modules/18_command/views/detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, watch, reactive, onBeforeMount } from "vue";
+import { onMounted, ref, reactive } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -18,21 +18,13 @@ import ReceivedCopy from "@/modules/18_command/components/Step/3_ReceivedCopy.vu
 import Attached from "@/modules/18_command/components/Step/4_Attached.vue"; //คำสั่งและบัญชีแนบท้าบ
 
 const $q = useQuasar();
-const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
+const { showLoader, hideLoader, messageError } = useCounterMixin();
 const router = useRouter();
 const route = useRoute();
 const commandId = ref<string>(route.params.id.toString()); //ID คำสั่ง
 const store = useCommandDetail();
 
-const childDetailRef = ref<InstanceType<typeof Detail> | null>(null); //ref components รายละเอียดคำสั่ง
-const childListPersonsRef = ref<InstanceType<typeof ListPersons> | null>(null); //ref components รายชื่อผู้ออกคำสั่ง
-const childReceivedCopyRef = ref<InstanceType<typeof ReceivedCopy> | null>(
-  null
-); //ref components รายชื่อผู้ได้รับสำเนาคำสั่ง
-const childAttachedRef = ref<InstanceType<typeof Attached> | null>(null); //ref components คำสั่งและบัญชีแนบท้าบ
-
 const tabs = ref<string>("Main"); //Tab
-const readonly = ref<boolean>(route.name === "commandViewDetailPage"); //อ่านได้อย่างเดียว
 const isChangeData = ref<boolean>(false); //การเปลี่ยนแปลงของข้อมูล
 //รายการ Tab ละเอียดคำสั่ง
 const tabsManu = ref<ItemTabs[]>([
@@ -62,7 +54,7 @@ let formCommandList = reactive<FormDataDetail>({
   commandAffectDate: null, //วันที่ลงนาม
   commandExcecuteDate: null, //วันที่คำสั่งมีผล
   commandSysId: "", // ประเภท คำสั่ง
-  isAttachment:true
+  isAttachment: true,
 });
 
 /**
@@ -97,28 +89,8 @@ async function fetchDataCommandList() {
     });
 }
 
-/**
- * ดูการเปลี่ยนแปลงของ tabs เมื่อมีการเปลี่ยนแปลง
- *
- * เช็คการเปลี่ยนแปลงของข้อมูล ถ้าการเปลี่ยนแปลงของข้อมูลจะบันทึกข้อมูล
- */
-// watch(tabs, (newValue, oldValue) => {
-//   //เช็คการเปลี่ยนแปลงของข้อมูล
-//   if (isChangeData.value) {
-//     const refMap: { [key: string]: any } = {
-//       Detail: childDetailRef,
-//       ListPersons: childListPersonsRef,
-//       ReceivedCopy: childReceivedCopyRef,
-//       Attached: childAttachedRef,
-//     };
-
-//     refMap[oldValue]?.value?.onSubmit();
-//   }
-// });
-
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
- *
  * กำหนดค่า `store.readonly` เมื่อ  route.name เป็น "commandViewDetailPage" จะอ่านข้อมูลได้อย่างเดียว
  */
 onMounted(async () => {
@@ -169,7 +141,6 @@ onMounted(async () => {
         <q-tab-panel style="padding: 0px" name="Main">
           <q-card>
             <Main
-              ref="childDetailRef"
               v-model:is-change-data="isChangeData"
               :on-check-change-data="onCheckChangeData"
             />
@@ -179,7 +150,6 @@ onMounted(async () => {
         <q-tab-panel style="padding: 0px" name="Detail">
           <q-card>
             <Detail
-              ref="childDetailRef"
               v-model:is-change-data="isChangeData"
               :on-check-change-data="onCheckChangeData"
               :fetch-data-command-list="fetchDataCommandList"
@@ -190,7 +160,6 @@ onMounted(async () => {
 
         <q-tab-panel class="bg-grey-2" style="padding: 0px" name="ListPersons">
           <ListPersons
-            ref="childListPersonsRef"
             v-model:is-change-data="isChangeData"
             :on-check-change-data="onCheckChangeData"
             :fetch-data-command-list="fetchDataCommandList"
@@ -201,7 +170,6 @@ onMounted(async () => {
         <q-tab-panel style="padding: 0px" name="ReceivedCopy">
           <q-card>
             <ReceivedCopy
-              ref="childReceivedCopyRef"
               v-model:is-change-data="isChangeData"
               :on-check-change-data="onCheckChangeData"
             />
@@ -211,10 +179,9 @@ onMounted(async () => {
         <q-tab-panel style="padding: 0px" name="Attached">
           <q-card>
             <Attached
-              ref="childAttachedRef"
               v-model:is-change-data="isChangeData"
               :on-check-change-data="onCheckChangeData"
-              v-model:is-attachment="formCommandList.isAttachment "
+              v-model:is-attachment="formCommandList.isAttachment"
             />
           </q-card>
         </q-tab-panel>