Merge branch 'develop' into devTee

src/api/11_discipline/api.discipline.ts

@@ -78,15 +78,26 @@ export default {
 
   suspendReport: () => `${suspend}/report`,
 
-  reportresult: (id: string) => `${disciplineMain}/result/report/${id}`,
-  discardResult:(id:string,commandType:string) => `${discipline}/discard/${id}/${commandType}`,
-  upLoadFileResult:(id:string) => `${disciplineMain}/result/file/${id}`,
-  deleteFileResult:(id:string,docId:string) => `${disciplineMain}/result/file/${id}/${docId}`,
+  reportresult: (id: string, type: string) =>
+    `${discipline}/suspend/${id}/${type}`,
+  discardResult: (id: string, commandType: string) =>
+    `${discipline}/discard/${id}/${commandType}`,
+  upLoadFileResult: (id: string) => `${disciplineMain}/result/file/${id}`,
+  deleteFileResult: (id: string, docId: string) =>
+    `${disciplineMain}/result/file/${id}/${docId}`,
 
-  appealMainList: (status: string, type: string, year: number, page: number, pageSize: number, keyword: string) => `${appeal}/admin?status=${status}&type=${type}&year=${year}&page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
+  appealMainList: (
+    status: string,
+    type: string,
+    year: number,
+    page: number,
+    pageSize: number,
+    keyword: string
+  ) =>
+    `${appeal}/admin?status=${status}&type=${type}&year=${year}&page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
   appealAdd: () => `${appeal}`,
-  appealByID: (id:string) => `${appeal}/${id}`,
-  appealUpLoadFile: (id:string) => `${appeal}/file/${id}`,
-  appealDeleteFile: (id:string,docId:string) => `${appeal}/file/${id}/${docId}`
-
+  appealByID: (id: string) => `${appeal}/${id}`,
+  appealUpLoadFile: (id: string) => `${appeal}/file/${id}`,
+  appealDeleteFile: (id: string, docId: string) =>
+    `${appeal}/file/${id}/${docId}`,
 };

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

@@ -17,6 +17,7 @@ import type {
 
 import config from "@/app.config";
 import http from "@/plugins/http";
+import type { ArrayPersonAdd } from "../../interface/response/investigate";
 
 const mainStore = useDisciplineMainStore();
 
@@ -398,7 +399,7 @@ watch(
       :modal="modalPopup"
       :close="closePopup"
       title="ส่งไปสอบสวน"
-      :rows="mainStore.rowsAdd.filter((item:any)=> item.isSend === false )"
+      :rows="mainStore.rowsAdd.filter((item: ArrayPersonAdd)=> item.isSend == 'NEW')"
       :columns="mainStore.columnsDirector"
       :visibleColumns="mainStore.visibleColumnsDirector"
       @return-person="emitPerson"

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

@@ -274,7 +274,7 @@ watch(props.data, async () => {
 
     mainStore.rowsAdd = props.data.persons;
     mainStore.rowsCheck = mainStore.rowsAdd.filter(
-      (item: any) => item.isSend === false
+      (item: any) => item.isSend === 'NEW'
     );
 
     const dataMap = props.data.directors.map((item: any) => ({

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

@@ -251,7 +251,7 @@ async function onSubmit(id: string) {
 
 /** ยืนยัน ส่งไปออกคำสั่ง */
 async function sentIssue() {
-  respondentRows.value = await store.rowSent.filter((x) => x.report === false && x.isSend === false); //x.report === false
+  respondentRows.value = await store.rowSent.filter((x) => x.report === false && x.isSuspend === 'NEW' && x.isSend === 'NEW');
   modalPopup.value = true;
 }
 

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

@@ -303,7 +303,7 @@ async function fetchDatadetail() {
 
     mainStore.rowsAdd = props.data.persons;
     mainStore.rowsCheck = mainStore.rowsAdd.filter(
-      (item: any) => item.isSend === false
+      (item: any) => item.report === false && item.isSuspend === 'NEW' && item.isSend === 'NEW'
     );
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     const dataMap = props.data.director.map((item: any) => ({

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

@@ -80,16 +80,16 @@ const saveOrder = () => {
 };
 //ส่งไปออกคำสั่ง
 const Ordersave = async () => {
-  const id = selected.value.map((r) => r.id);
+  // const id = selected.value.map((r) => r.id);
   const persons = selected.value.map((r) => r.id);
 
   if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
     const body = {
-      id,
+      persons,
     };
     showLoader();
     await http
-      .put(config.API.reportresult(type.value as string), body)
+      .put(config.API.reportresult(idPath.value, type.value as string), body)
       .then((res: any) => {
         success($q, `${props.title}สำเร็จ`);
         props.closeModal?.();

src/modules/11_discipline/components/8_AppealComplain/EditPage.vue

@@ -130,7 +130,7 @@ onMounted(() => {
         flat
         color="primary"
         class="q-mr-sm"
-        @click="router.go(-1)"
+        @click="router.push('/discipline-appealcomplain')"
       />
       แก้ไขการอุทธรณ์/ร้องทุกข์
     </div>

src/modules/11_discipline/components/8_AppealComplain/MainPage.vue

@@ -227,7 +227,6 @@ function editStatusReturn(data: any) {
     console.log("saveStatus");
     modalStatusEdit.value = false;
   });
-  console.log(data);
 }
 
 function getData() {

src/modules/11_discipline/interface/request/disciplinary.ts

@@ -10,8 +10,10 @@ interface Persons {
   salary: number; //เงินเดือน
   organization: string; //สังกัด
   name: string;
-  report?: boolean;
-  isSend?: boolean;
+  report?: boolean; // ส่งไปสรุปผลแล้ว
+  isSend?: string; // ส่งไปยุติแล้ว
+  isSuspend?: string; //ส่งไปพักแล้ว
+  statusDiscard?: string; //ส่งไปงดโทษ/เพิ่มโทษแล้ว
 }
 interface PersonsArray {
   id: string; //id อ้างอิง profile

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

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