แก้ไขเรื่องร้องเรียน, สืบสวน, สอบสวน

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

@@ -2,11 +2,12 @@
 import { onMounted, reactive, ref, watch } from "vue";
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
 import FormInvestigatefacts from "@/modules/11_discipline/components/2_InvestigateFacts/Form.vue"; //สืบสวนข้อเท็จจริง
-import { useRouter, useRoute } from "vue-router";
+import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store";
 import { useQuasar } from "quasar";
-import Popup from "@/modules/11_discipline/components/1_Complaint/Popup.vue";
+import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type {
   FormData as FormDataComplaint,
@@ -18,13 +19,12 @@ import type { QTableProps } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
-const investigateFactStore = useInvestigateFactStore();
+const mainStore = useDisciplineMainStore();
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const store = useInvestigateFactStore();
 const { dialogConfirm, showLoader, success, hideLoader, messageError } = mixin;
-const router = useRouter();
 const route = useRoute();
 const id = ref<string>(route.params.id as string);
 
@@ -40,10 +40,10 @@ const data = reactive<FormData>({
   investigationDetailOther: "",
   evidenceFiles: null,
   fileComplaint: null,
-  clickTime: false,
+  investigationExtendStatus: false,
   investigationDateStart: null,
   investigationDateEnd: null,
-  daysExtend: null,
+  investigationDaysExtend: null,
   investigationStatusResult: "",
   investigationCauseText: "",
   complaintStatus: "",
@@ -60,6 +60,7 @@ const data = reactive<FormData>({
 
 /** ข้อมูล v-model ของฟอร์มเรื่องร้องเรียน */
 const personObjComplaint = reactive<ArrayPerson>({
+  id: "",
   personId: "",
   idcard: "",
   name: "",
@@ -132,104 +133,6 @@ async function getDataComplaint() {
     });
 }
 
-/** หัวตาราง */
-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",
-]);
-
 function getData() {
   showLoader();
   http
@@ -250,8 +153,11 @@ function getData() {
       data.result = dataList.result;
       data.directors = dataList.director;
       data.disciplineInvestigateDocs = dataList.disciplineInvestigateDocs;
-      data.disciplineInvestigateRelevantDocs = dataList.disciplineInvestigateRelevantDocs;
+      data.disciplineInvestigateRelevantDocs =
+        dataList.disciplineInvestigateRelevantDocs;
       data.investigationStatusResult = dataList.investigationStatusResult;
+      data.investigationExtendStatus = dataList.investigationExtendStatus;
+      data.investigationDaysExtend = dataList.investigationDaysExtend;
     })
     .catch((e) => {
       messageError($q, e);
@@ -378,7 +284,6 @@ function emitPerson(data: FormData[]) {
     });
 }
 
-
 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
 onMounted(() => {
   getData();
@@ -461,13 +366,13 @@ watch(
       </q-tab-panels>
     </q-card>
 
-    <Popup
+    <PopupSendToNext
       :modal="modalPopup"
       :close="closePopup"
       title="ส่งไปสอบสวน"
-      :rows="investigateFactStore.rowsAdd"
-      :columns="columns"
-      :visibleColumns="visibleColumns"
+      :rows="mainStore.rowsAdd"
+      :columns="mainStore.columnsDirector"
+      :visibleColumns="mainStore.visibleColumnsDirector"
       @return-person="emitPerson"
     />
   </div>