Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/12_evaluatePersonal/views/MainPage.vue

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

@@ -24,12 +24,12 @@ function addData(formData: any) {
   showLoader();
   http
     .post(config.API.meeting(), {
-      Round: formData.rounded ?? "",
-      Tittle: formData.title,
-      DateEnd: formData.dateMeetingEnd,
-      DateStart: formData.dateMeetingStart,
-      Result: formData.consider,
-      Duration: formData.period,
+      round: formData.rounded ?? "",
+      tittle: formData.title,
+      dateEnd: formData.dateMeetingEnd,
+      dateStart: formData.dateMeetingStart,
+      result: formData.consider,
+      duration: formData.period,
     })
     .then((res) => {
       success($q, "บันทึกข้อมูลสำเร็จ");

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

@@ -11,7 +11,9 @@ import config from "@/app.config";
 import type { formData } from "@/modules/09_leave/interface/request/workTime";
 
 const route = useRoute();
-const personalId = ref<string>(route.params.id.toString());
+const personalId = ref<string>(route.params.id as string);
+console.log(personalId.value);
+
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const {
@@ -21,6 +23,7 @@ const {
   dialogConfirm,
   success,
   date2Thai,
+  dateToISO,
 } = mixin;
 
 /**เมื่อเริ่มโหลดหน้า
@@ -53,16 +56,13 @@ const fetchData = async () => {
     .get(config.API.meetingById(personalId.value))
     .then((res) => {
       const dataApi = res.data.result;
-      personalId.value = dataApi.id;
-      data.title = dataApi.Tittle;
-      data.rounded = dataApi.Round;
-      data.consider = dataApi.Result;
-      data.period = dataApi.Duration;
-      data.dateMeetingStart = dataApi.DateStart;
-      data.dateMeetingEnd = date2Thai(dataApi.DateEnd, false, true);
+      data.title = dataApi.tittle;
+      data.rounded = dataApi.round;
+      data.consider = dataApi.result;
+      data.period = dataApi.duration;
+      data.dateMeetingStart = dataApi.dateStart;
+      data.dateMeetingEnd = dataApi.dateEnd;
       data.file = dataApi.file;
-
-      console.log(data.dateMeetingStart);
     })
     .catch((e) => {
       messageError($q, e);
@@ -78,18 +78,19 @@ const fetchData = async () => {
  */
 function onSubmit(formData: FormData) {
   dialogConfirm($q, () => putData(formData));
+  console.log(personalId.value);
 }
 
-function putData(formData: FormData) {
+function putData(formData: any) {
   showLoader();
   http
     .put(config.API.meetingById(personalId.value), {
-      Round: formData.rounded ?? "",
-      Tittle: formData.title,
-      DateStart: formData.dateMeetingStart,
-      DateEnd: formData.dateMeetingEnd,
-      Result: formData.consider,
-      Duration: formData.period,
+      round: formData.rounded ?? "",
+      tittle: formData.title,
+      dateStart: dateToISO(formData.dateMeetingStart),
+      dateEnd: dateToISO(formData.dateMeetingEnd),
+      result: formData.consider,
+      duration: formData.period,
     })
     .then((res) => {
       success($q, "บันทึกข้อมูลสำเร็จ");
@@ -98,7 +99,8 @@ function putData(formData: FormData) {
       messageError($q, e);
     })
     .finally(async () => {
-      router.push(`/discipline/meeting`);
+      hideLoader();
+      router.push(`/evaluate/meeting`);
     });
 }
 </script>

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

@@ -54,15 +54,16 @@ async function getList() {
   showLoader();
   await http
     .get(
-      config.API.meeting(
+      config.API
+        .meeting
         // currentPage.value,
         // rowsPerPage.value,
         // filterKeyword.value
-      )
+        ()
     )
     .then((res) => {
       // maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
-      const data = res.data.result
+      const data = res.data.result;
       dataStore.fetchData(data);
     })
     .catch((e) => {
@@ -71,8 +72,6 @@ async function getList() {
     .finally(() => {
       hideLoader();
     });
-
-
 }
 
 /**
@@ -88,6 +87,7 @@ function clickDelete(id: string) {
  * @param id type
  */
 async function deleteData(id: string) {
+  console.log(id);
   showLoader();
   await http
     .delete(config.API.meetingById(id))

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

@@ -60,22 +60,22 @@ export const useEvaluateMeetingDataStore = defineStore(
     const rows = ref<any[]>([]);
     function fetchData(data: any[]) {
       const dataList: any[] = data.map((item: any) => ({
-        id: item.Id,
-        createdAt: item.CreatedAt,
-        createdUserId: item.CreatedUserId,
-        lastUpdatedAt: item.LastUpdatedAt,
-        lastUpdateUserId: item.LastUpdateUserId,
-        createdFullName: item.CreatedFullName,
-        lastUpdateFullName: item.LastUpdateFullName,
-        title: item.Tittle,
-        round: item.Round,
-        date: `${date2Thai(item.DateStart as Date, false, true)} - ${date2Thai(
-          item.DateEnd as Date,
+        id: item.id,
+        createdAt: item.createdAt,
+        createdUserId: item.createdUserId,
+        lastUpdatedAt: item.lastUpdatedAt,
+        lastUpdateUserId: item.lastUpdateUserId,
+        createdFullName: item.createdFullName,
+        lastUpdateFullName: item.lastUpdateFullName,
+        title: item.tittle,
+        round: item.round,
+        date: `${date2Thai(item.dateStart as Date, false, true)} - ${date2Thai(
+          item.dateEnd as Date,
           false,
           true
         )}`,
-        result: item.Result,
-        duration: item.Duration,
+        result: item.result,
+        duration: item.duration,
       }));
       rows.value = dataList;
     }

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

@@ -56,6 +56,10 @@ watch(
   }
 );
 
+function filterFn() {
+  getList();
+  console.log("enter", filter.value);
+}
 function getList() {
   showLoader();
   http
@@ -92,6 +96,41 @@ onMounted(async () => {
     รายการคำขอประเมิน
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <q-space />
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        id="filterTable"
+        for="filterTable"
+        dense
+        outlined
+        v-model="filter"
+        label="ค้นหา"
+        debounce="300"
+        @keydown.enter.prevent="filterFn"
+      >
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+
+      <q-select
+        id="visibleColumns"
+        for="visibleColumns"
+        v-model="store.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="store.columns"
+        option-value="name"
+        options-cover
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
+    </div>
     <div>
       <d-table
         ref="table"