API การสืบสวนข้อเท็จจริง

2023-11-27 11:30:23 +07:00 · 2023-11-27 11:30:23 +07:00 · cc2e45666e
commit cc2e45666e
parent d3ec604478
6 changed files with 249 additions and 107 deletions
--- a/src/api/11_discipline/api.discipline.ts
+++ b/src/api/11_discipline/api.discipline.ts
@ -40,7 +40,7 @@ export default {

  investigateReject:(id:string) => `${investigate}/reject/${id}`,
  investigateResume:(id:string) => `${investigate}/resume/${id}`,
-  
+  investigateApprove:(id:string) => `${investigate}/approve/${id}`,

  /** ระบบวินัยเรื่องสอบสวน */
  disciplineDisciplinary: () => `${discipline}/disciplinary`,
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@ -4,7 +4,7 @@ import Form from "@/modules/11_discipline/components/1_Complaint/Form.vue";
 import Popup from "@/modules/11_discipline/components/1_Complaint/Popup.vue";
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar } from "quasar";
-
+import type { QTableProps } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";

@ -14,7 +14,8 @@ import type {
  ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
 import { useCounterMixin } from "@/stores/mixin";
-
+import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
+const complainstStore = useComplainstDataStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const {
@ -134,6 +135,92 @@ const data = reactive<FormData>({
 //     ]);
 // };

+const columns = ref<QTableProps["columns"]>([
+  {
+    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: "positionNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "positionNo",
+    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[]>([
+  "no",
+  "idcard",
+  "name",
+  "positionNo",
+  "position",
+  "positionLevel",
+  "salary",
+  "organization",
+]);
+
 async function getData() {
  showLoader();
  await http
@ -314,6 +401,9 @@ onMounted(() => {
      :modal="modalPopup"
      :close="closePopup"
      @return-person="emitPerson"
+      :rows="complainstStore.rowsAdd"
+      :columns="columns"
+      :visibleColumns="visibleColumns"
    />
  </div>
 </template>
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@ -911,8 +911,7 @@ onMounted(() => {
      </form>
    </q-card>
  </div>
-
-  <div class="col-12 q-mt-sm q-mb-lg" v-if="props.data && fileList.length > 0">
+  <div class="col-12 q-mt-sm q-mb-lg" v-if="props.data">
    <q-card flat bordered>
      <div
        class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
--- a/src/modules/11_discipline/components/1_Complaint/Popup.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Popup.vue
@ -3,7 +3,7 @@ import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import DialogHeader from "@/components/DialogHeader.vue";

-import type { QTableProps } from "quasar";
+

 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
@ -31,97 +31,23 @@ const props = defineProps({
    type: Function,
    default: () => "",
  },
+  rows: {
+    type: Array,
+    default: [],
+  },
+  columns: {
+    type: Array,
+    default: [],
+  },
+  visibleColumns: {
+    type: Array,
+    default: [],
+  },
 });

-const emit = defineEmits([
-  "returnPerson"
-])
+const emit = defineEmits(["returnPerson"]);
 /** หัวตาราง */
-const columns = ref<QTableProps["columns"]>([
-  {
-    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: "positionNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: true,
-    field: "positionNo",
-    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[]>([
-  "no",
-  "idcard",
-  "name",
-  "positionNo",
-  "position",
-  "positionLevel",
-  "salary",
-  "organization",
-]);
+

 const selected = ref<any>([]);
 const inspectionResults = ref<string>("");
@ -143,7 +69,7 @@ function onclickSend() {
      async () => {
        success($q, `ส่งข้อมูล${props.title}สำเร็จ`);
        console.log(selected.value);
-        emit('returnPerson',selected.value)
+        emit("returnPerson", selected.value);
        props.close?.();
      },
      `ยืนยันการส่ง${props.title}`,
@ -161,10 +87,9 @@ function onClickClose() {
 watch([() => props.modal], () => {
  inspectionResults.value = props.modal ? "" : "";
  selected.value = props.modal ? [] : [];
-  if(props.modal === true){
-    selected.value = complainstStore.rowsAdd;
+  if (props.modal === true) {
+    selected.value = props.rows;
  }
-  
 });
 </script>
 <template>
@ -202,12 +127,12 @@ watch([() => props.modal], () => {
            <!-- แสดงคอลัมน์ใน table -->
            <q-select
              for="selectVisibleColumns"
-              v-model="visibleColumns"
+              v-model="props.visibleColumns"
              :display-value="$q.lang.table.columns"
              multiple
              outlined
              dense
-              :options="columns"
+              :options="props.columns"
              options-dense
              option-value="name"
              map-options
@ -219,8 +144,8 @@ watch([() => props.modal], () => {
        </div>
        <d-table
          ref="table"
-          :columns="columns"
-          :rows="complainstStore.rowsAdd"
+          :columns="props.columns"
+          :rows="props.rows"
          :filter="filter"
          row-key="personId"
          flat
@ -228,7 +153,7 @@ watch([() => props.modal], () => {
          :paging="false"
          dense
          class="custom-header-table"
-          :visible-columns="visibleColumns"
+          :visible-columns="props.visibleColumns"
          selection="multiple"
          v-model:selected="selected"
          :pagination="initialPagination"
--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@ -8,9 +8,13 @@ import { useInvestigateFactStore } from "@/modules/11_discipline/store/Investiga
 import { useQuasar } from "quasar";
 import Popup from "@/modules/11_discipline/components/1_Complaint/Popup.vue";
 import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { QTableProps } from "quasar";
+
 import config from "@/app.config";
 import http from "@/plugins/http";

+const investigateFactStore = useInvestigateFactStore();
+
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const store = useInvestigateFactStore();
@ -46,9 +50,107 @@ const data = reactive<FormData>({
  documentFile: null,
  respondentType: "",
  organizationId: "",
-  persons:[]
+  persons: [],
 });

+/** หัวตาราง */
+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
@ -58,8 +160,8 @@ function getData() {
      const dataList = res.data.result;
      data.id = dataList.id;
      data.idComplaint = dataList.idComplaint;
-      data.respondentType = dataList.respondentType
-      data.persons = dataList.persons
+      data.respondentType = dataList.respondentType;
+      data.persons = dataList.persons;
      data.investigationDetail = dataList.investigationDetail;
      data.investigationDetailOther = dataList.investigationDetailOther;
      data.investigationDateStart = dataList.investigationDateStart;
@ -178,6 +280,23 @@ function confirmCancelInvestigate() {
    });
 }

+function emitPerson(data: FormData[]) {
+  const dataMapId = data.map((item: FormData) => item.id);
+  showLoader();
+  http
+    .put(config.API.investigateApprove(id.value), {
+      persons: dataMapId,
+    })
+    .then((res) => {
+      // router.push(`/discipline/investigatefacts`);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}

 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
 onMounted(() => {
@ -251,7 +370,15 @@ onMounted(() => {
      </q-tab-panels>
    </q-card>

-    <Popup :modal="modalPopup" :close="closePopup" title="ส่งไปสอบสวน" />
+    <Popup
+      :modal="modalPopup"
+      :close="closePopup"
+      title="ส่งไปสอบสวน"
+      :rows="investigateFactStore.rowsAdd"
+      :columns="columns"
+      :visibleColumns="visibleColumns"
+      @return-person="emitPerson"
+    />
  </div>
 </template>
 <style scoped>
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@ -23,6 +23,7 @@ export const useComplainstDataStore = defineStore(
    const visibleColumns = ref<string[]>([]);
    const columns = ref<QTableProps["columns"]>([]);

+    
    function fetchComplainstAdd(data: ArrayPerson[]) {
      rowsAdd.value = data;
    }