ต่อ api แก้ไข meeting

src/api/12_evaluatePersonal/api.evaluate.ts

@@ -4,8 +4,10 @@ const evaluation = `${env.API_URI}/evaluation`;
 
 export default {
   evaluateDirectorMain: () => `${evaluateDirectorMain}`,
-  evaluateDirectorById: (id:string) => `${evaluateDirectorMain}/${id}`,
+  evaluateDirectorById: (id: string) => `${evaluateDirectorMain}/${id}`,
 
+  evaluationMain: (page: number, pageSize: number, keyword: string) =>
+    `${evaluation}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
   meeting: () => `${evaluation}/meeting`,
   meetingById: (id: string) => `${evaluation}/meeting/${id}`,
 };

src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue

@@ -26,7 +26,8 @@ function addData(formData: any) {
     .post(config.API.meeting(), {
       Round: formData.rounded ?? "",
       Tittle: formData.title,
-      Date: formData.dateMeetingStart,
+      DateEnd: formData.dateMeetingEnd,
+      DateStart: formData.dateMeetingStart,
       Result: formData.consider,
       Duration: formData.period,
     })

src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue

@@ -33,10 +33,10 @@ onMounted(() => {
 /**
  * get ข้อมูลเก่ากรณีแก้ไขข้อมูล
  */
-const data = reactive<FormData>({
+const data = reactive<any>({
   rounded: "",
   dateMeeting: "",
-  dateMeetingStart: null,
+  dateMeetingStart: Date,
   dateMeetingEnd: new Date(),
   consider: "",
   period: "",
@@ -58,8 +58,10 @@ const fetchData = async () => {
       data.rounded = dataApi.Round;
       data.consider = dataApi.Result;
       data.period = dataApi.Duration;
-      data.dateMeetingStart = dataApi.Date;
+      data.dateMeetingStart = dataApi.DateStart;
+      data.dateMeetingEnd = date2Thai(dataApi.DateEnd, false, true);
       data.file = dataApi.file;
+
       console.log(data.dateMeetingStart);
     })
     .catch((e) => {
@@ -84,7 +86,8 @@ function putData(formData: FormData) {
     .put(config.API.meetingById(personalId.value), {
       Round: formData.rounded ?? "",
       Tittle: formData.title,
-      Date: formData.dateMeetingStart,
+      DateStart: formData.dateMeetingStart,
+      DateEnd: formData.dateMeetingEnd,
       Result: formData.consider,
       Duration: formData.period,
     })

src/modules/12_evaluatePersonal/components/Meeting/Form.vue

@@ -42,7 +42,6 @@ const emit = defineEmits(["formDataReturn"]);
  */
 //
 const idCard = ref<string>("");
-const idCardRef = ref<any>(null);
 
 const fileOj = reactive<FileOj[]>([]);
 
@@ -65,63 +64,66 @@ const formData = reactive<FormData>({
 watch(props.data, async () => {
   // console.log("data==>", props.data)
   formData.rounded = props.data.rounded;
-  formData.dateMeeting = props.data.dateMeeting;
+  formData.dateMeetingStart = props.data.dateMeetingStart;
+  formData.dateMeetingEnd = props.data.dateMeetingEnd;
   formData.consider = props.data.consider;
   formData.period = props.data.period;
   formData.title = props.data.title;
 });
 
-/**
+// /**
- * เพิ่มบุคลากร
+//  * เพิ่มบุคลากร
- */
+//  */
-function addEmployee() {
+// function addEmployee() {
-  if (idCard.value.length === 13) {
+//   if (idCard.value.length === 13) {
-    console.log("idCard===>", idCard.value);
+//     console.log("idCard===>", idCard.value);
-    showLoader();
+//     showLoader();
-    http
+//     http
-      .post(config.API.profileSearchPersonal(), {
+//       .post(config.API.profileSearchPersonal(), {
-        fieldName: "idcard",
+//         fieldName: "idcard",
-        keyword: idCard.value,
+//         keyword: idCard.value,
-      })
+//       })
-      .then((res) => {
+//       .then((res) => {
-        const dataApi = res.data.result;
+//         const dataApi = res.data.result;
-        if (dataApi.length > 0) {
+//         if (dataApi.length > 0) {
-          const dataList = dataApi[0];
+//           const dataList = dataApi[0];
-          formData.rounded = dataList.rounded;
+//           formData.rounded = dataList.rounded;
-          formData.dateMeeting = dataList.dateMeeting;
+//           formData.dateMeeting = dataList.dateMeeting;
-          formData.consider = dataList.consider;
+//           formData.consider = dataList.consider;
-          formData.period = dataList.period;
+//           formData.period = dataList.period;
-        } else {
+//         } else {
-          dialogMessageNotify($q, "ไม่มีข้อมูลบุคคลากรที่ต้องการค้นหา");
+//           dialogMessageNotify($q, "ไม่มีข้อมูลบุคคลากรที่ต้องการค้นหา");
-        }
+//         }
-      })
+//       })
-      .catch((e) => {
+//       .catch((e) => {
-        messageError($q, e);
+//         messageError($q, e);
-      })
+//       })
-      .finally(async () => {
+//       .finally(async () => {
-        hideLoader();
+//         hideLoader();
-      });
+//       });
-  }
+//   }
-  if (idCard.value.length !== 13) {
+//   if (idCard.value.length !== 13) {
-    hideLoader();
+//     hideLoader();
-    dialogMessageNotify($q, "กรุณากรอกเลขบัตรประชาชนให้ครบ 13 หลัก");
+//     dialogMessageNotify($q, "กรุณากรอกเลขบัตรประชาชนให้ครบ 13 หลัก");
-  } else {
+//   } else {
-    console.log("nodata");
+//     console.log("nodata");
-  }
+//   }
-}
+// }
 
 /**
  * ตรวจสอบข้อมูลก่อนส่งไปยัง api
  */
 const roundedRef = ref<object | null>(null);
-const dateMeetingRef = ref<object | null>(null);
+const dateMeetingStartRef = ref<object | null>(null);
+const dateMeetingEndRef = ref<object | null>(null);
 const considerRef = ref<object | null>(null);
 const periodRef = ref<object | null>(null);
 const titleRef = ref<object | null>(null);
 
 const formRef: FormRef = {
   rounded: roundedRef,
-  dateMeeting: dateMeetingRef,
+  dateMeetingStartRef: dateMeetingStartRef,
+  dateMeetingEndRef: dateMeetingEndRef,
   consider: considerRef,
   period: periodRef,
   title: titleRef,
@@ -228,17 +230,6 @@ function inputEdit(val: boolean) {
           />
         </div>
         <div class="col-3">
-          <!-- <q-input
-            :class="inputEdit(isReadonly)"
-            dense
-            outlined
-            v-model="formData.dateMeeting"
-            label="วันเวลาในการประชุม"
-            ref="dateMeetingRef"
-            for="dateMeetingRef"
-            hide-bottom-space
-            :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกวันเวลาในการประชุม'}`]"
-          /> -->
           <datepicker
             menu-class-name="modalfix"
             v-model="formData.dateMeetingStart"

src/modules/12_evaluatePersonal/interface/index/meeting.ts

@@ -32,7 +32,8 @@ interface FileOj {
 
 interface FormRef {
   rounded: object | null;
-  dateMeeting: object | null;
+  dateMeetingEndRef: object | null;
+  dateMeetingStartRef: object | null;
   consider: object | null;
   period: object | null;
   [key: string]: any;

src/modules/12_evaluatePersonal/store/Evaluate.ts

@@ -53,15 +53,16 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
   ]);
   const rows = ref<any[]>([]);
   function fetchData(data: any[]) {
+    console.log(data);
     const dataList: any[] = data.map((data: any) => ({
       id: data.id,
-      citizanId: data.citizanId,
+      citizanId: data.CitizenId,
-      fullName: data.fullName,
+      fullName: data.FullName,
-      position: data.position,
+      position: data.Position,
-      level: data.level,
+      level: data.Type,
-      positionNumber: data.positionNumber,
+      positionNumber: data.PosNo,
-      agency: data.agency,
+      agency: data.Oc,
-      status: convertStatus(data.status),
+      status: convertStatus(data.Step),
     }));
     rows.value = dataList;
     console.log(dataList);

src/modules/12_evaluatePersonal/views/MainPage.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
 import http from "@/plugins/http";
@@ -20,101 +20,70 @@ const { showLoader, hideLoader, messageError } = mixin;
 const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
 });
-function Detailpage(id:string) {
+function Detailpage(id: string) {
   router.push(`/evaluate/detail/${id}`);
 }
 
-const page = ref<number>(1);
+const currentPage = ref<number>(1);
 const pageSize = ref<number>(10);
 const maxPage = ref<number>(1);
+const page = ref<number>(1);
 const filter = ref<string>("");
+const rowsPerPage = ref<number>(10);
+/**
+ *pagination ของตาราง
+ */
+const pagination = ref({
+  descending: false,
+  page: page.value,
+  rowsPerPage: rowsPerPage.value,
+});
+
+watch(
+  () => currentPage.value,
+  () => {
+    rowsPerPage.value = pagination.value.rowsPerPage;
+    getList();
+  }
+);
+
+watch(
+  () => pagination.value.rowsPerPage,
+  () => {
+    rowsPerPage.value = pagination.value.rowsPerPage;
+    currentPage.value = 1;
+    getList();
+  }
+);
+
+function getList() {
+  showLoader();
+  http
+    .get(
+      config.API.evaluationMain(
+        currentPage.value,
+        rowsPerPage.value,
+        filter.value
+      )
+    )
+    .then((res) => {
+      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      const data = res.data.result;
+      store.fetchData(data);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
 
 /**เมื่อเริ่มโหลดหน้า
  * ส่งข้อมูลจำลองไปยัง store
  */
 onMounted(async () => {
-  store.fetchData([
+  getList();
-    {
-      id:'xxx1',
-      citizanId: "1230030004001",
-      fullName: "นางวัศยา ศรีสร้อย",
-      position: "ผู้อำนวยการสถาบัน",
-      level: "ปฏิบัติการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานกฎหมาย",
-      status: "WAIT_CHECK_DOC_V1",
-    },
-    {
-      id:'xxx2',
-      citizanId: "122222000401",
-      fullName: "นายสิริศักดิ์ พรมบุตร",
-      position: "นักบริหาร",
-      level: "ชำนาญการพิเศษ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานกฎหมายอาคาร",
-      status: "WAIT_CHECK_DOC_V2",
-    },
-    {
-      id:'xxx3',
-      citizanId: "111111100401",
-      fullName: "นายเอกฉัท วีระโชติ ",
-      position: "นักบริหาร",
-      level: "อำนวยการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานการคลัง",
-      status: "DONE",
-    },
-    {
-      id:'xxx4',
-      citizanId: "122203000401",
-      fullName: "นางธนิดา มั่นคงประสิทธิ์",
-      position: "ผู้อำนวยการกอง",
-      level: "อาวุโส",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มกิจการสภา",
-      status: "WAIT_CHECK_DOC_V1",
-    },
-    {
-      id:'xxx5',
-      citizanId: "123003111401",
-      fullName: "นางณิชมน ลือขำ ",
-      position: "ผู้อำนวยการสถาบัน",
-      level: "ชำนาญงาน",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มกิจการสภา",
-      status: "WAIT_CHECK_DOC_V2",
-    },
-    {
-      id:'xxx6',
-      citizanId: "111111100401",
-      fullName: "นายเอกฉัท วีระโชติ ",
-      position: "นักบริหาร",
-      level: "อำนวยการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานการคลัง",
-      status: "ANNOUNCE_WEB",
-    },
-    {
-      id:'xxx7',
-      citizanId: "111111100401",
-      fullName: "นายเอกฉัท วีระโชติ ",
-      position: "นักบริหาร",
-      level: "อำนวยการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานการคลัง",
-      status: "PREPARE_DOC_V2",
-    },
-    {
-      id:'xxx8',
-      citizanId: "111111100401",
-      fullName: "นายเอกฉัท วีระโชติ ",
-      position: "นักบริหาร",
-      level: "อำนวยการ",
-      positionNumber: "สก.ก412",
-      agency: "กลุ่มงานการคลัง",
-      status: "CHECK_DOC_V2",
-    },
-  ]);
 });
 </script>
 
@@ -141,7 +110,12 @@ onMounted(async () => {
       >
         <template #columns="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props" @click="Detailpage(props.row.id)">
+            <q-td
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+              @click="Detailpage(props.row.id)"
+            >
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}
               </div>