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

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

@@ -5,20 +5,18 @@ import { useRouter, useRoute } from "vue-router";
 import type { QTableProps } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import Popup from "@/modules/11_discipline/components/1_Complaint/Popup.vue";
+import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
 /**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 {
-  FormData,
-  PersonsArray,
-} from "@/modules/11_discipline/interface/request/disciplinary";
+import type { PersonsArray } from "@/modules/11_discipline/interface/request/disciplinary";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,
   ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
+import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 
 import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
 
@@ -38,6 +36,8 @@ const id = ref<string>(route.params.id as string);
 const data = ref<object>();
 const status = ref<string>("");
 
+const idInvestigate = ref<string>("");
+const idComplaint = ref<string>("");
 /** function fetchData สอบสวนความผิดทางวินัย*/
 async function fetchDetailDisciplinary() {
   showLoader();
@@ -46,6 +46,8 @@ async function fetchDetailDisciplinary() {
     .then((res) => {
       data.value = res.data.result;
       status.value = res.data.result.status;
+      idComplaint.value = res.data.result.idComplaint;
+      idInvestigate.value = res.data.result.idInvestigate;
     })
     .catch((err) => {
       messageError($q, err);
@@ -59,7 +61,7 @@ async function fetchDetailDisciplinary() {
 async function fetchDetailInvestigate() {
   showLoader();
   await http
-    .get(config.API.disciplineInvestigateById(id.value))
+    .get(config.API.investigateById(idInvestigate.value))
     .then((res) => {
       const dataList = res.data.result;
       dataInvestigatefacts.id = dataList.id;
@@ -85,6 +87,9 @@ async function fetchDetailInvestigate() {
         dataList.disciplineInvestigateRelevantDocs;
       dataInvestigatefacts.investigationStatusResult =
         dataList.investigationStatusResult;
+      dataInvestigatefacts.investigationExtendStatus = dataList.investigationExtendStatus;
+      dataInvestigatefacts.investigationDaysExtend =
+        dataList.investigationDaysExtend;
     })
     .catch((err) => {
       messageError($q, err);
@@ -98,7 +103,7 @@ async function fetchDetailInvestigate() {
 async function fetchDetailComplaints() {
   showLoader();
   await http
-    .get(config.API.disciplineComplaintsById(id.value))
+    .get(config.API.complaintbyId(idComplaint.value))
     .then((res) => {
       const dataList = res.data.result;
       dataComplaints.id = dataList.id;
@@ -169,11 +174,16 @@ function sentIssue() {
 }
 
 function sentIssueGate() {
-  dialogConfirm($q, () => confirmSentIssueGate(),'ยืนยันส่งไปสรุปผลการพิจารณา','ต้องการยืนยันส่งไปสรุปผลการพิจารณาใช่หรือไม่?');
+  dialogConfirm(
+    $q,
+    () => confirmSentIssueGate(),
+    "ยืนยันส่งไปสรุปผลการพิจารณา",
+    "ต้องการยืนยันส่งไปสรุปผลการพิจารณาใช่หรือไม่?"
+  );
 }
 
 function confirmSentIssueGate() {
-  showLoader()
+  showLoader();
   http
     .get(config.API.disciplinaryApprove(id.value))
     .then((res) => {})
@@ -271,6 +281,7 @@ watch(
 
 /** ข้อมูล v-model ของฟอร์มเรื่องร้องเรียน */
 const personObjComplaint = reactive<ArrayPerson>({
+  id: "",
   personId: "",
   idcard: "",
   name: "",
@@ -442,10 +453,10 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
   investigationDetailOther: "",
   evidenceFiles: null,
   fileComplaint: null,
-  clickTime: false,
+  investigationExtendStatus: false,
   investigationDateStart: null,
   investigationDateEnd: null,
-  daysExtend: null,
+  investigationDaysExtend: null,
   investigationStatusResult: "",
   investigationCauseText: "",
   complaintStatus: "",
@@ -541,7 +552,7 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
     </q-card>
   </div>
 
-  <Popup
+  <PopupSendToNext
     :modal="modalPopup"
     :close="closePopup"
     title="ส่งไปพักราชการ"