แก้ไขฟอร์มสืบสวน และผู้ถูกร้องเรียนของวินัย

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

@@ -2,14 +2,16 @@
 import { onMounted, reactive, ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import { useRouter, useRoute } from "vue-router";
-import type { QTableProps } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 /**import component*/
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
 import FormInvestigatefacts from "@/modules/11_discipline/components/2_InvestigateFacts/Form.vue"; //สืบสวนข้อเท็จจริง
 import FormDisciplinary from "@/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue"; // สอบสวนความผิดทางวินัย
-import type { PersonsArray } from "@/modules/11_discipline/interface/request/disciplinary";
+import type {
+  PersonsArray,
+  Persons,
+} from "@/modules/11_discipline/interface/request/disciplinary";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,
@@ -22,6 +24,9 @@ import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/in
 /**import store*/
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+
+const mainStore = useDisciplineMainStore();
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
@@ -86,7 +91,8 @@ async function fetchDetailInvestigate() {
         dataList.disciplineInvestigateRelevantDocs;
       dataInvestigatefacts.investigationStatusResult =
         dataList.investigationStatusResult;
-      dataInvestigatefacts.investigationExtendStatus = dataList.investigationExtendStatus;
+      dataInvestigatefacts.investigationExtendStatus =
+        dataList.investigationExtendStatus;
       dataInvestigatefacts.investigationDaysExtend =
         dataList.investigationDaysExtend;
     })
@@ -167,8 +173,9 @@ const onSubmit = async (id: string) => {
 };
 
 /** ยืนยัน ส่งไปออกคำสั่ง */
-function sentIssue() {
-  console.log("sent");
+const respondentRows = ref<Persons[]>();
+async function sentIssue() {
+  respondentRows.value = await store.rowSent.filter((x) => !x.report); //x.report === false
   modalPopup.value = true;
 }
 
@@ -214,12 +221,6 @@ function cancelInvestigate() {
   );
 }
 
-/** ฟังชั่น ส่งไปออกคำสั่ง*/
-function confirmSentIssue() {
-  console.log("sent");
-  modalPopup.value = true;
-}
-
 /** ฟังชั่น ยุติเรื่อง*/
 function confirmEndInvestigate() {
   console.log("sent");
@@ -303,7 +304,6 @@ const fileListObjComplaint = reactive<ArrayFileList>({
 function emitPerson(data: PersonsArray[]) {
   console.log(data);
   const dataMapId = data.map((item: PersonsArray) => item.id);
-  console.log(dataMapId);
   showLoader();
   http
     .put(config.API.disciplinarySuspend(id.value), {
@@ -321,104 +321,6 @@ function emitPerson(data: PersonsArray[]) {
     });
 }
 
-/** หัวตาราง */
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "info",
-    align: "left",
-    label: "",
-    sortable: false,
-    field: "info",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "idcard",
-    align: "left",
-    label: "เลขบัตรประชาชน",
-    sortable: true,
-    field: "idcard",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "name",
-    align: "left",
-    label: "ชื่อ - นามสกุล",
-    sortable: true,
-    field: "name",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่ง",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "positionLevel",
-    align: "left",
-    label: "ระดับ",
-    sortable: true,
-    field: "positionLevel",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "salary",
-    align: "left",
-    label: "เงินเดือน",
-    sortable: true,
-    field: "salary",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "organization",
-    align: "left",
-    label: "หน่วยงาน",
-    sortable: true,
-    field: "organization",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-/** หัวข้อที่เเสดงในตาราง */
-const visibleColumns = ref<string[]>([
-  "info",
-  "no",
-  "idcard",
-  "name",
-  "posNo",
-  "position",
-  "positionLevel",
-  "salary",
-  "organization",
-]);
-
 const dataComplaints = reactive<FormDataComplaint>({
   id: "",
   respondentType: "",
@@ -555,9 +457,10 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
     :modal="modalPopup"
     :close="closePopup"
     title="ส่งไปพักราชการ"
-    :rows="store.rowSent"
-    :columns="columns"
-    :visibleColumns="visibleColumns"
+    :rows="respondentRows"
+    :columns="mainStore.columnsRespondent"
+    :visibleColumns="mainStore.visibleColumnsRespondent"
+    :checked-val="false"
     @return-person="emitPerson"
   />
 </template>