fix

2024-10-03 14:12:34 +07:00 · 2024-10-03 14:12:34 +07:00 · cedcbb0eaa
commit cedcbb0eaa
parent 3736aa7e80
8 changed files with 102 additions and 111 deletions
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@ -13,7 +13,7 @@ import type {
  FormData,
  ArrayPerson,
  ArrayFileList,
-} from "@/modules/11_discipline/interface/request/Complaint";
+} from "@/modules/11_discipline/interface/request/complaint";

 import Form from "@/modules/11_discipline/components/1_Complaint/Form.vue";
 import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
@ -163,16 +163,17 @@ const visibleColumns = ref<string[]>([
  "organization",
 ]);

-
-
 /** ดึงข้อมูล */
 async function getData() {
  showLoader();
  await http
    .get(
-      config.API.complaintbyGetId(id.value, mainStore.pathComplaints(route.name as string))
+      config.API.complaintbyGetId(
+        id.value,
+        mainStore.pathComplaints(route.name as string)
+      )
    )
-    .then((res) => {
+    .then(async (res) => {
      const dataList = res.data.result;
      data.id = dataList.id;
      data.respondentType = dataList.respondentType;
@ -194,8 +195,7 @@ async function getData() {
      data.result = dataList.result;
      data.disciplineComplaintDocs = dataList.disciplineComplaintDocs;
      data.activeId = dataList.activeId;
-
-      mainStore.fetchDataRowsSend(dataList.persons);
+      await mainStore.fetchDataRowsSend(dataList.persons);
    })
    .catch((e) => {
      messageError($q, e);
@ -214,8 +214,8 @@ async function onSubmit(data: any) {

  http
    .put(config.API.complaintbyId(id.value), data)
-    .then((res) => {
-      getData();
+    .then(async () => {
+      await getData();
      success($q, "บันทึกข้อมูลสำเร็จ");
    })
    .catch((e) => {
@ -233,31 +233,28 @@ function sentInvestigate() {
  } else {
    dialogConfirm(
      $q,
-      () => sentConfirmNoPerson(),
+      () => {
+        showLoader();
+        http
+          .put(config.API.complaintApprove(id.value), {
+            persons: [],
+          })
+          .then(() => {
+            router.push(`/discipline/complaints`);
+          })
+          .catch((e) => {
+            messageError($q, e);
+          })
+          .finally(() => {
+            hideLoader();
+          });
+      },
      "ยืนยันส่งไปสืบสวน",
      "ต้องการยืนยันยืนยันส่งไปสืบสวนใช่หรือไม่?"
    );
  }
 }

-/** ส่งไปสืบสวน */
-function sentConfirmNoPerson() {
-  showLoader();
-  http
-    .put(config.API.complaintApprove(id.value), {
-      persons: [],
-    })
-    .then((res) => {
-      router.push(`/discipline/complaints`);
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
 /** ปิด dialog */
 function closePopup() {
  modalPopup.value = false;
@ -267,7 +264,21 @@ function closePopup() {
 function endInvestigate() {
  dialogConfirm(
    $q,
-    () => confirmEndInvestigate(),
+    () => {
+      showLoader();
+      http
+        .get(config.API.complaintReject(id.value))
+        .then(async () => {
+          await getData();
+          success($q, "ยุติเรื่องสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(async () => {
+          hideLoader();
+        });
+    },
    "ยืนยันยุติเรื่อง",
    "ต้องการยืนยันยุติเรื่องใช่หรือไม่?"
  );
@ -277,58 +288,38 @@ function endInvestigate() {
 function cancelInvestigate() {
  dialogConfirm(
    $q,
-    () => confirmCancelInvestigate(),
+    () => {
+      showLoader();
+      http
+        .get(config.API.complaintResume(id.value))
+        .then(async () => {
+          await getData();
+          success($q, "ยกเลิกยุติเรื่องสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
    "ยืนยันยกเลิกการยุติเรื่อง",
    "ต้องการยืนยันยกเลิกการยุติเรื่องใช่หรือไม่?"
  );
 }

-/** ฟังชั่น ยุติเรื่อง*/
-function confirmEndInvestigate() {
-  showLoader();
-  http
-    .get(config.API.complaintReject(id.value))
-    .then((res) => {
-      success($q, "ยุติเรื่องสำเร็จ");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      await getData();
-    });
-}
-
-/** ฟังชั่น ยกเลิกการยุติเรื่อง*/
-function confirmCancelInvestigate() {
-  showLoader();
-  http
-    .get(config.API.complaintResume(id.value))
-    .then((res) => {
-      getData();
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-      success($q, "ยกเลิกยุติเรื่องสำเร็จ");
-    });
-}
-
 /**
 * ดึงข้อมูล จาก component เเล้ว update
 * @param data person data
 */
 function sendPersonToNext(data: ArrayPerson[]) {
  const dataMapId = data.map((item: ArrayPerson) => item.id);
-
  showLoader();
  http
    .put(config.API.complaintApprove(id.value), {
      persons: dataMapId,
    })
-    .then((res) => {
+    .then(() => {
      router.push(`/discipline/complaints`);
    })
    .catch((e) => {
@ -340,8 +331,8 @@ function sendPersonToNext(data: ArrayPerson[]) {
 }

 /** เรียกใช้งาน ฟังชั่น ตอนเริ่มโหลดหน้า */
-onMounted(() => {
-  getData();
+onMounted(async () => {
+  await getData();
 });
 </script>

--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@ -14,7 +14,7 @@ import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
 import type {
  FormData,
  ArrayFileList,
-} from "@/modules/11_discipline/interface/request/Complaint";
+} from "@/modules/11_discipline/interface/request/complaint";

 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
@ -133,8 +133,6 @@ function onSubmit() {
    if (mainStore.rowsAdd) {
      formData.persons = await mainStore.rowsAdd;
    }
-    console.log("formData===>", formData);
-
    await props.onSubmit(formData);
    isSave.value = false;
  });
@ -156,9 +154,9 @@ function confirmDelete(id: string) {
  showLoader();
  http
    .delete(config.API.complaintFileDelete(formData.id, id))
-    .then((res) => {
+    .then(async (res) => {
+      await props.getData();
      success($q, `ลบไฟล์สำเร็จ`);
-      props.getData();
    })
    .catch((e) => {
      messageError($q, e);
@ -184,18 +182,19 @@ function upLoadFileDoc() {
  showLoader();
  http
    .put(config.API.complaintFileUpload(formData.id), Data)
-    .then((res) => {
+    .then(async (res) => {
+      await props.getData();
      countNum.value = 2;
      formData.documentFile = null;
-      hideLoader();
+
      success($q, "อัพโหลดไฟล์สำเร็จ");
-      props.getData();
    })
    .catch((e) => {
      messageError($q, e);
-      hideLoader();
    })
-    .finally(async () => {});
+    .finally(async () => {
+      hideLoader();
+    });
 }

 /**
@ -216,8 +215,8 @@ async function getActive() {
      .get(config.API.activeOrganization)
      .then(async (res) => {
        const data = await res.data.result;
+        await getOc(data.activeId);
        formData.activeId = data.activeId;
-        getOc(data.activeId);
      })
      .catch((err) => {
        messageError($q, err);
@ -226,7 +225,7 @@ async function getActive() {
        hideLoader();
      });
  } else {
-    getOc(formData.activeId);
+    await getOc(formData.activeId);
  }
 }

@ -382,9 +381,9 @@ watch(props.data, async () => {
 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
 onMounted(() => {
  mainStore.rowsAdd = [];
-  getListChannel();

  getActive();
+  getListChannel();
 });
 </script>

--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@ -9,13 +9,13 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";

-import type { ArrayPersonAdd } from "../../interface/response/Investigate";
-import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { ArrayPersonAdd } from "../../interface/response/investigate";
+import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type {
  FormData as FormDataComplaint,
  ArrayPerson,
  ArrayFileList,
-} from "@/modules/11_discipline/interface/request/Complaint";
+} from "@/modules/11_discipline/interface/request/complaint";

 import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
@ -153,9 +153,9 @@ async function getDataComplaint() {
 }

 /** ดึงข้อมูลรายละเอียด */
-function getData() {
+async function getData() {
  showLoader();
-  http
+  await http
    .get(
      config.API.investigateByGetId(
        id.value,
@ -206,14 +206,12 @@ function getData() {
 * @param id ระบุ บุคคล
 */
 async function onSubmit(data: any) {
-  // put
  showLoader();
  http
    .put(config.API.investigateById(id.value), data)
-    .then(async (res) => {
+    .then(async () => {
      await getData();
      await success($q, "บันทึกข้อมูลสำเร็จ");
-      // router.push(`/discipline/complaints`);
    })
    .catch((e) => {
      messageError($q, e);
@ -245,7 +243,7 @@ function sentConfirmNoPerson() {
    .put(config.API.investigateApprove(id.value), {
      persons: [],
    })
-    .then((res) => {
+    .then(() => {
      getData();
      router.push(`/discipline/investigatefacts`);
    })
@ -344,10 +342,11 @@ watch(
 );

 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
-onMounted(() => {
-  getData();
+onMounted(async () => {
  if (store.tabMenu == "complaints") {
-    getDataComplaint();
+    await Promise.all([getData(), getDataComplaint()]);
+  } else {
+    getData();
  }
 });
 </script>
@ -424,18 +423,19 @@ onMounted(() => {
        </q-tab-panel>
      </q-tab-panels>
    </q-card>
-
-    <PopupSendToNext
-      :modal="modalPopup"
-      :close="closePopup"
-      title="ส่งไปสอบสวน"
-      :rows="mainStore.rowsSend.filter((item: ArrayPersonAdd)=> item.isSend == 'NEW')"
-      :columns="mainStore.columnsDirector"
-      :visible-columns="mainStore.visibleColumnsDirector"
-      @return-person="emitPerson"
-    />
  </div>
+
+  <PopupSendToNext
+    :modal="modalPopup"
+    :close="closePopup"
+    title="ส่งไปสอบสวน"
+    :rows="mainStore.rowsSend.filter((item: ArrayPersonAdd)=> item.isSend == 'NEW')"
+    :columns="mainStore.columnsDirector"
+    :visible-columns="mainStore.visibleColumnsDirector"
+    @return-person="emitPerson"
+  />
 </template>
+
 <style scoped>
 .q-tab-panel {
  padding: 0;
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";

-import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";

 import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";
@ -327,8 +327,8 @@ async function getActive() {
  showLoader();
  await http
    .get(config.API.activeOrganization)
-    .then((res) => {
-      getOc(res.data.result.activeId);
+    .then(async (res) => {
+      await getOc(res.data.result.activeId);
    })
    .catch((err) => {
      messageError($q, err);
@ -677,6 +677,7 @@ watch(props.data, async () => {
        posTypeName: person.posTypeName,
        posLevelId: person.posLevelId,
        posLevelName: person.posLevelName,
+        citizenId: person.idcard,
      }));
      mainStore.rowsCheck = mainStore.rowsAdd.filter(
        (item: any) => item.isDisciplinary === false && item.isSend === "NEW"
@ -1723,7 +1724,6 @@ onMounted(async () => {
  </div>

  <!-- อัพโหลดไฟล์ -->
-
  <DialogDuty
    :modal="modalEditDirector"
    :close-popup="closeEditDirector"
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@ -12,7 +12,6 @@ const mixin = useCounterMixin();
 const $q = useQuasar();
 const { dialogConfirm, dialogMessageNotify } = mixin;

-const rows = ref<any[]>([]);
 const props = defineProps({
  title: {
    type: String,
@ -50,7 +49,7 @@ const props = defineProps({

 const modalCommand = ref<boolean>(false);
 const emit = defineEmits(["returnPerson"]);
-const selected = ref<any>([]);
+const selected = ref<any[]>([]);
 const inspectionResults = ref<string>("");
 const filter = ref<string>("");
 const initialPagination = ref<any>({
@ -208,7 +207,7 @@ watch(
  <DialogCreateCommand
    v-model:modal="modalCommand"
    :command-type-code="'C-PM-32'"
-  :persons="selected"
+    :persons="selected"
  />
 </template>

--- a/src/modules/11_discipline/interface/response/investigate.ts
+++ b/src/modules/11_discipline/interface/response/investigate.ts
@ -28,6 +28,7 @@ interface ArrayPerson {
 interface ArrayPersonAdd {
  personId: string; //id อ้างอิง profile
  idcard: string; //เลขประจำตัวประชาชน
+  citizenId: string;
  isSend: string; //สถานะการส่งคนไป
  prefix: string; //คำนำหน้า
  firstName: string; //ชื่อ
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@ -394,7 +394,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
   * จัดเก็บข้อมูลไว้ เพื่อใช้ใน POPUP
   * @param data ข้อมูลรายการบุคคล
   */
-  function fetchData(data: ArrayPersonAdd[]) {
+  async function fetchData(data: ArrayPersonAdd[]) {
    const dataList: any = data.map((item: any) => ({
      id: item.id,
      idcard: item.idcard,
@ -436,7 +436,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
   * จัดเก็บข้อมูลไว้ เพื่อใช้ใน POPUP
   * @param data ข้อมูลรายการบุคคล
   */
-  function fetchDataRowsSend(data: ArrayPersonAdd[]) {
+  async function fetchDataRowsSend(data: ArrayPersonAdd[]) {
    const dataList: any = data.map((item: any) => ({
      id: item.id,
      idcard: item.idcard,
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@ -144,6 +144,7 @@ function createCommand(isRedirect: boolean) {
      commandTypeId: commandType.value,
      persons: data,
    };
+
    showLoader();
    await http
      .post(config.API.command + `/person`, body)