ปรับเเก้

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -19,12 +19,16 @@ import type {
   MyObjectInvestigateRef,
 } from "@/modules/11_discipline/interface/request/investigateFact";
 
+import type {
+  ArrayPersonAdd
+} from '@/modules/11_discipline/interface/response/investigate'
 import config from "@/app.config";
 import http from "@/plugins/http";
 
 const $q = useQuasar();
 const route = useRoute();
 const router = useRouter();
+const id = ref<string>(route.params.id as string);
 const modalPerson = ref<boolean>(false);
 const toggleModal = () => (modalPerson.value = !modalPerson.value);
 /**เรียกใช้ store */
@@ -271,7 +275,8 @@ watch(props.data, async () => {
     formData.investigationExtendHistory = props.data.investigationExtendHistory;
 
     mainStore.rowsAdd = props.data.persons;
-
+    mainStore.rowsCheck = mainStore.rowsAdd.filter((item:any)=> item.isSend === false )
+    console.log(mainStore.rowsCheck)
     const dataMap = props.data.directors.map((item: any) => ({
       id: item.id,
       name: `${item.prefix}${item.firstName} ${item.lastName}`,
@@ -523,21 +528,21 @@ function closePopup() {
 function emitPerson(data: FormData[]) {
   const dataMapId = data.map((item: FormData) => item.id);
   console.log(dataMapId);
-  // showLoader();
-  // http
-  //   .put(config.API.investigateApprove(id.value), {
-  //     persons: dataMapId,
-  //   })
-  //   .then((res) => {
-  //     // router.push(`/discipline/investigatefacts`);
-  //   })
-  //   .catch((e) => {
-  //     messageError($q, e);
-  //   })
-  //   .finally(() => {
-  //     hideLoader();
-  //     getData();
-  //   });
+  showLoader();
+  http
+    .post(config.API.investigateReport(), {
+      Id: dataMapId,
+    })
+    .then((res) => {
+      // router.push(`/discipline/investigatefacts`);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+      getOc();
+    });
 }
 
 onMounted(async () => {
@@ -1504,7 +1509,7 @@ onMounted(async () => {
     :modal="modalPopup"
     :close="closePopup"
     title="ส่งรายชื่อไปออกคำสั่งยุติเรื่อง"
-    :rows="mainStore.rowsAdd"
+    :rows="mainStore.rowsCheck"
     :columns="mainStore.columnsDirector"
     :visibleColumns="mainStore.visibleColumnsDirector"
     @return-person="emitPerson"

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -302,7 +302,7 @@ async function fetchDatadetail() {
     formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory;
 
     mainStore.rowsAdd = props.data.persons;
-
+    mainStore.rowsCheck = mainStore.rowsAdd.filter((item:any)=> item.isSend === false )
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     const dataMap = props.data.director.map((item: any) => ({
       id: item.directorId,
@@ -500,22 +500,21 @@ function closePopup() {
 
 function emitPerson(data: PersonsArray[]) {
   const dataMapId = data.map((item: PersonsArray) => item.id);
-  console.log(dataMapId);
-  // showLoader();
-  // http
-  //   .put(config.API.investigateApprove(id.value), {
-  //     persons: dataMapId,
-  //   })
-  //   .then((res) => {
-  //     // router.push(`/discipline/investigatefacts`);
-  //   })
-  //   .catch((e) => {
-  //     messageError($q, e);
-  //   })
-  //   .finally(() => {
-  //     hideLoader();
-  //     getData();
-  //   });
+  showLoader();
+  http
+    .post(config.API.disciplinaryReport(), {
+      Id: dataMapId,
+    })
+    .then((res) => {
+      // router.push(`/discipline/investigatefacts`);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+      fetchOrganization();
+    });
 }
 
 /** Hook */
@@ -1664,7 +1663,7 @@ onMounted(async () => {
     :modal="modalPopup"
     :close="closePopup"
     title="ส่งรายชื่อไปออกคำสั่งยุติเรื่อง"
-    :rows="mainStore.rowsAdd"
+    :rows="mainStore.rowsCheck"
     :columns="mainStore.columnsDirector"
     :visibleColumns="mainStore.visibleColumnsDirector"
     @return-person="emitPerson"

src/modules/11_discipline/components/4_Result/Form.vue

@@ -168,6 +168,10 @@ watch(
   () => props.data,
   async () => {
     respondentType.value = props.data.respondentType;
+    formData.oc = props.data.resultOc;
+    formData.disciplineType = props.data.resultDisciplineType;
+    formData.titleType = props.data.resultTitleType;
+    formData.year = props.data.resultYear;
     mainStore.rowsAdd = props.data.persons;
     await fetchDatadetail();
     await fetchOrganization();
@@ -451,6 +455,7 @@ onMounted(async () => {});
                     <q-input
                       v-model="formData.disciplineType"
                       dense
+                      :class="inputEdit(isReadonly)"
                       outlined
                       label="ประเภทวินัย"
                     />
@@ -460,6 +465,7 @@ onMounted(async () => {});
                       v-model="formData.titleType"
                       dense
                       outlined
+                      :class="inputEdit(isReadonly)"
                       label="ประเภทของเรื่อง"
                     />
                   </div>
@@ -468,6 +474,7 @@ onMounted(async () => {});
                       v-model="formData.oc"
                       dense
                       outlined
+                      :class="inputEdit(isReadonly)"
                       label="หน่วยงาน/ส่วนราชการ"
                     />
                   </div>
@@ -489,6 +496,7 @@ onMounted(async () => {});
                         <q-input
                           dense
                           lazy-rules
+                          :class="inputEdit(isReadonly)"
                           outlined
                           :model-value="
                             formData.year === 0

src/modules/11_discipline/interface/response/investigate.ts

@@ -28,6 +28,7 @@ interface ArrayPerson {
 interface ArrayPersonAdd {
   personId: string; //id อ้างอิง profile
   idcard: string; //รหัสบัตรประชาชน
+  isSend: string; //รหัสบัตรประชาชน
   prefix: string; //คำนำหน้า
   firstName: string; //ชื่อ
   lastName: string; //นามสกุล

src/modules/11_discipline/store/main.ts

@@ -274,6 +274,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
   ]);
 
   const rowsAdd = ref<ArrayPersonAdd[]>([]);
+  const rowsCheck = ref<ArrayPersonAdd[]>([]);
   function fetchData(data: ArrayPersonAdd[]) {
     rowsAdd.value = data;
   }
@@ -295,7 +296,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     fetchData,
     statusResultOptions,
     convertStatusResult,
-
+    rowsCheck,
     causeTextOptions
   };
 });