Merge branch 'develop' into devTee

# Conflicts: # src/modules/14_KPI/views/02_kpiLists.vue
2024-12-02 15:13:40 +07:00 · 2024-12-02 15:13:40 +07:00 · 33b9051f78
commit 33b9051f78
parent 97879802b1 d043396010
18 changed files with 210 additions and 252 deletions
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@ -108,6 +108,7 @@ function fetchListPlan() {
  formFilter.nodeId = store.dataProfile.nodeId;
  formFilter.node = store.dataProfile.node;
  formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
+  formFilter.keyword = formFilter.keyword.trim();
  // const kpiPeriodId = store.dataEvaluation.kpiPeriodId;

  showLoader();
@ -164,6 +165,8 @@ function fetchListRole() {
  formFilter.node = store.dataProfile.node;
  formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
  formFilter.position = store.dataProfile.position;
+  formFilter.keyword = formFilter.keyword.trim();
+  showLoader();

  http
    .post(config.API.kpiRole + `/search-kpi-role`, formFilter)
@ -218,8 +221,10 @@ function fetchListSpecial() {
  formFilter.node = store.dataProfile.node;
  formFilter.year = formFilter?.year ? formFilter.year.toString() : "";

+  showLoader();
+
  const body = {
-    keyword: formFilter.keyword,
+    keyword: formFilter.keyword.trim(),
    period: formFilter.period,
    year: formFilter.year,
    pageSize: formFilter.pageSize,
@ -575,13 +580,7 @@ watch(
                    @keydown.enter.prevent="fetchNewList()"
                  >
                    <template v-slot:append>
-                      <q-icon v-if="formFilter.keyword == ''" name="search" />
-                      <q-icon
-                        v-if="formFilter.keyword !== ''"
-                        name="clear"
-                        class="cursor-pointer"
-                        @click="(formFilter.keyword = ''), fetchNewList()"
-                      />
+                      <q-icon name="search" />
                    </template>
                  </q-input>
                </div>
--- a/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
@ -212,7 +212,7 @@ function getData() {
 }

 /** ฟิลเตอร์ */
-function filterTxt(val: any) {
+function filterTxt(val: string) {
  listTarget.value = listTargetMain.value.filter(
    (v: any) => v.name.indexOf(val) > -1
  );
@ -320,13 +320,7 @@ watch(
                    @update:model-value="filterTxt"
                  >
                    <template v-slot:append>
-                      <q-icon v-if="search == ''" name="search" />
-                      <q-icon
-                        v-if="search !== ''"
-                        name="clear"
-                        class="cursor-pointer"
-                        @click="(search = ''), (listTarget = listTargetMain)"
-                      />
+                      <q-icon name="search" />
                    </template>
                  </q-input>
                </div>
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@ -36,14 +36,12 @@ const searchRules = ref<boolean>(false);
 const selected = ref<any[]>([]);
 const personId = ref<string>("");
 const modalPersonal = ref<boolean>(false);
-const searchRef = ref<any>(null);
 const rows = ref<tableType[]>([]);
 const type = ref<string>("citizenId");
 const search = ref<string>("");
 const typeOps = ref<typeOp[]>([
  { id: "citizenId", name: "เลขประจำตัวประชาชน" },
-  { id: "firstname", name: "ชื่อ" },
-  { id: "lastname", name: "นามสกุล" },
+  { id: "fullName", name: "ชื่อ-นามสกุล" },
 ]);

 const modalDialog = defineModel<boolean>("modal", { required: true });
@ -152,6 +150,11 @@ function onCloseDialog() {
  selected.value = [];
  search.value = "";
  type.value = "citizenId";
+  roundDialgOp.value = [];
+  evaluatorIdMainOp.value = [];
+  commanderIdMainOp.value = [];
+  commanderHighMainOp.value = [];
+  isRoundClose.value = false;
 }

 /** ดึงข้อมูลตามรอบการประเมิน */
@ -192,26 +195,26 @@ function fetchRoundOption() {
 * @param update function Quasar
 * @param refData เเยกประเภท
 */
-function filterOption(val: any, update: Function, refData: string) {
+function filterOption(val: string, update: Function, refData: string) {
  switch (refData) {
    case "evaluatorIdOp":
      update(() => {
        evaluatorIdOp.value = evaluatorIdMainOp.value.filter(
-          (v: any) => v.name.indexOf(val) > -1
+          (v: DataOption) => v.name.indexOf(val) > -1
        );
      });
      break;
    case "commanderIdOp":
      update(() => {
        commanderIdOp.value = commanderIdMainOp.value.filter(
-          (v: any) => v.name.indexOf(val) > -1
+          (v: DataOption) => v.name.indexOf(val) > -1
        );
      });
      break;
    case "commanderHighOp":
      update(() => {
        commanderHighOp.value = commanderHighMainOp.value.filter(
-          (v: any) => v.name.indexOf(val) > -1
+          (v: DataOption) => v.name.indexOf(val) > -1
        );
      });
      break;
@ -229,37 +232,35 @@ function checkClosed() {
 async function searchInput(check: boolean) {
  if (check) {
    searchRules.value = check;
-    searchRef.value.validate();
-    if (!searchRef.value.hasError) {
-      showLoader();
-      const body = {
-        fieldName: type.value,
-        keyword: search.value,
-      };
-      await http
-        .post(
-          config.API.orgSearchPersonal() +
-            `?page=${query.page}&pageSize=${query.pageSize}`,
-          body
-        )
-        .then((res) => {
-          const data = res.data.result;
-          maxPage.value = Math.ceil(data.total / query.pageSize);
-          total.value = data.total;

-          rows.value = data.data;
-        })
-        .catch((err) => {
-          messageError($q, err);
-        })
-        .finally(() => {
-          hideLoader();
-        });
-    }
-    setTimeout(() => {
-      searchRules.value = false;
-    }, 100);
+    showLoader();
+    const body = {
+      fieldName: type.value,
+      keyword: search.value.trim(),
+    };
+    await http
+      .post(
+        config.API.orgSearchPersonal() +
+          `?page=${query.page}&pageSize=${query.pageSize}`,
+        body
+      )
+      .then((res) => {
+        const data = res.data.result;
+        maxPage.value = Math.ceil(data.total / query.pageSize);
+        total.value = data.total;
+
+        rows.value = data.data;
+      })
+      .catch((err) => {
+        messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
+      });
  }
+  setTimeout(() => {
+    searchRules.value = false;
+  }, 100);
 }

 /** update เมื่อเปลี่ยน option */
@ -356,6 +357,17 @@ async function updatePagination(initialPagination: NewPagination) {
  query.pageSize = initialPagination.rowsPerPage;
 }

+/**
+ * class input
+ * @param val
+ */
+function classInput(val: boolean) {
+  return {
+    "full-width cursor-pointer ": val,
+    "full-width cursor-pointer inputgreen": !val,
+  };
+}
+
 watch(
  () => modalDialog.value,
  (n) => {
@ -380,6 +392,7 @@ watch(
        <q-separator />
        <q-card-section class="q-pa-none scroll" style="max-height: 80vh">
          <div class="row q-col-gutter-sm">
+            <!-- รายชื่อ -->
            <div class="col-12 col-md-9">
              <div class="row q-pa-md q-col-gutter-sm">
                <div class="col-12 col-sm-6 col-md-3">
@ -399,19 +412,16 @@ watch(

                <div class="col-12 col-sm-6 col-md-9">
                  <q-input
-                    ref="searchRef"
                    v-model="search"
                    outlined
-                    clearable
                    hide-bottom-space
                    dense
                    label="คำค้น"
-                    :rules="[
-                      (val:string) => !!val || !searchRules || `กรุณากรอกคำค้น`,
-                    ]"
+                    @keydown.enter.pervent="(query.page = 1), searchInput(true)"
                  >
                    <template v-slot:after>
                      <q-btn
+                        outline
                        color="primary"
                        icon="search"
                        label="ค้นหา"
@ -477,7 +487,7 @@ watch(
                            }}{{
                              props.row.positionLevelName
                                ? ` (${props.row.positionLevelName})`
-                                : ""
+                                : "-"
                            }}
                          </div>
                          <div
@ -487,7 +497,7 @@ watch(
                            {{ findOrgName(props.row) }}
                          </div>
                          <div v-else>
-                            {{ col.value }}
+                            {{ col.value ?? "-" }}
                          </div>
                        </q-td>
                      </q-tr>
@ -510,10 +520,13 @@ watch(
                </div>
              </div>
            </div>
+
+            <!-- form  -->
            <div class="col-12 col-md-3 bg-grey-2">
              <div class="row q-pa-md q-col-gutter-sm">
                <div class="col-12">
                  <datepicker
+                    :disable="selected.length === 0"
                    menu-class-name="modalfix"
                    v-model="yearDialog"
                    :locale="'th'"
@ -521,6 +534,7 @@ watch(
                    year-picker
                    :enableTimePicker="false"
                    @update:model-value="fetchRoundOption()"
+                    :class="classInput(false)"
                  >
                    <template #year="{ year }">{{ year + 543 }}</template>
                    <template #year-overlay-value="{ value }">{{
@ -528,6 +542,7 @@ watch(
                    }}</template>
                    <template #trigger>
                      <q-input
+                        :disable="selected.length === 0"
                        dense
                        lazy-rules
                        outlined
@ -555,6 +570,8 @@ watch(

                <div class="col-12">
                  <q-select
+                    :disable="selected.length === 0"
+                    :class="classInput(false)"
                    :readonly="yearDialog === null"
                    v-model="formRound.kpiPeriodId"
                    outlined
@ -575,6 +592,8 @@ watch(

                <div class="col-12">
                  <q-select
+                    :disable="selected.length === 0"
+                    :class="classInput(false)"
                    v-model="formRound.evaluatorId"
                    outlined
                    label="ผู้ประเมิน"
@ -592,7 +611,9 @@ watch(
                    !!val || `${'กรุณาเลือกผู้ประเมิน'}`,
                ]"
                    use-input
-                    @filter="(inputValue:any,
+                    hide-selected
+                    fill-input
+                    @filter="(inputValue:string,
                    doneFn:Function) => filterOption(inputValue, doneFn,'evaluatorIdOp'
                    ) "
                  >
@ -605,8 +626,11 @@ watch(
                    </template>
                  </q-select>
                </div>
+
                <div class="col-12">
                  <q-select
+                    :disable="selected.length === 0"
+                    :class="classInput(false)"
                    v-model="formRound.commanderId"
                    outlined
                    label="ผู้บังคับบัญชาเหนือขึ้นไป"
@ -618,7 +642,9 @@ watch(
                    emit-value
                    map-options
                    use-input
-                    @filter="(inputValue:any,
+                    hide-selected
+                    fill-input
+                    @filter="(inputValue:string,
                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderIdOp'
                    ) "
                  >
@ -638,8 +664,11 @@ watch(
                    </template>
                  </q-select>
                </div>
+
                <div class="col-12">
                  <q-select
+                    :disable="selected.length === 0"
+                    :class="classInput(false)"
                    v-model="formRound.commanderHighId"
                    outlined
                    label="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง"
@ -651,7 +680,9 @@ watch(
                    emit-value
                    map-options
                    use-input
-                    @filter="(inputValue:any,
+                    hide-selected
+                    fill-input
+                    @filter="(inputValue:string,
                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderHighOp'
                    ) "
                  >
@ -683,7 +714,7 @@ watch(
            รอบการประเมินนี้ปิดแล้ว
          </div>
          <q-btn
-            :disable="isRoundClose"
+            :disable="isRoundClose || selected.length === 0"
            label="บันทึก"
            color="secondary"
            type="submit"
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue
@ -223,7 +223,7 @@ watch(
  (n) => {
    if (n == true) {
      getData();
-    }
+    } else rows.value = [];
  }
 );
 </script>
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@ -387,6 +387,8 @@ onMounted(async () => {
              outlined
              @clear="(result = ''), (resultOp = store.resultsOptions)"
              use-input
+              hide-selected
+              fill-input
              :clearable="result !== ''"
              @update:model-value="onSearchData()"
              input-debounce="0"
--- a/src/modules/14_KPI/views/01_kpiRound.vue
+++ b/src/modules/14_KPI/views/01_kpiRound.vue
@ -356,9 +356,9 @@ onMounted(async () => {
  <div class="toptitle text-dark col-12 row items-center">
    รายการรอบการประเมินผลการปฏิบัติหน้าที่ราชการ
  </div>
-  <q-card flat bordered class="q-pa-md">
-    <q-toolbar style="padding: 0px">
-      <div class="row q-gutter-sm">
+  <q-card flat bordered class="col-12 q-pa-md">
+    <div class="row q-col-gutter-sm">
+      <div class="row col-12">
        <datepicker
          menu-class-name="modalfix"
          v-model="formQuery.year"
@ -401,21 +401,20 @@ onMounted(async () => {
            </q-input>
          </template>
        </datepicker>
+
        <q-btn
          v-if="checkPermission($route)?.attrIsCreate"
          flat
          round
-          dense
          icon="add"
          color="primary"
          @click="onClickAddOrView()"
        >
          <q-tooltip>เพิ่ม</q-tooltip>
        </q-btn>
-      </div>

-      <q-space />
-      <div class="row q-gutter-sm">
+        <q-space />
+
        <q-select
          v-model="visibleColumns"
          multiple
@ -430,82 +429,82 @@ onMounted(async () => {
          style="min-width: 140px"
        />
      </div>
-    </q-toolbar>

-    <div class="col-12">
-      <d-table
-        for="table"
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        row-key="subject"
-        flat
-        bordered
-        dense
-        class="custom-header-table"
-        :visible-columns="visibleColumns"
-        :rows-per-page-options="[10, 25, 50, 100]"
-        @update:pagination="updatePagination"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th auto-width />
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props">
-            <q-td>
-              <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate !== false"
-                flat
-                round
-                dense
-                :disable="!props.row.isActive"
-                :color="props.row.isActive ? 'orange' : 'grey'"
-                icon="mdi-close"
-                @click="onClickAction('close', props.row.id)"
-              >
-                <q-tooltip>ปิดรอบ</q-tooltip>
-              </q-btn>
-              <q-btn
-                v-if="checkPermission($route)?.attrIsDelete !== false"
-                clickable
-                v-close-popup
-                @click="onClickAction('delete', props.row.id)"
-                flat
-                round
-                dense
-                color="red"
-                icon="mdi-delete"
-              >
-                <q-tooltip>ลบรอบ</q-tooltip>
-              </q-btn>
-            </q-td>
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div class="table_ellipsis">
-                {{ col.value ? col.value : "-" }}
-              </div>
-            </q-td>
-          </q-tr>
-        </template>
-        <template v-slot:pagination="scope">
-          ทั้งหมด {{ total }} รายการ
-          <q-pagination
-            v-model="formQuery.page"
-            active-color="primary"
-            color="dark"
-            :max="Number(totalList)"
-            size="sm"
-            boundary-links
-            direction-links
-            :max-pages="5"
-            @update:model-value="fetchList"
-          ></q-pagination>
-        </template>
-      </d-table>
+      <div class="col-12">
+        <d-table
+          for="table"
+          ref="table"
+          :columns="columns"
+          :rows="rows"
+          row-key="subject"
+          flat
+          bordered
+          dense
+          class="custom-header-table"
+          :visible-columns="visibleColumns"
+          :rows-per-page-options="[10, 25, 50, 100]"
+          @update:pagination="updatePagination"
+        >
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th auto-width />
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                <span class="text-weight-medium">{{ col.label }}</span>
+              </q-th>
+            </q-tr>
+          </template>
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td>
+                <q-btn
+                  v-if="checkPermission($route)?.attrIsUpdate !== false"
+                  flat
+                  round
+                  dense
+                  :disable="!props.row.isActive"
+                  :color="props.row.isActive ? 'orange' : 'grey'"
+                  icon="mdi-close"
+                  @click="onClickAction('close', props.row.id)"
+                >
+                  <q-tooltip>ปิดรอบ</q-tooltip>
+                </q-btn>
+                <q-btn
+                  v-if="checkPermission($route)?.attrIsDelete !== false"
+                  clickable
+                  v-close-popup
+                  @click="onClickAction('delete', props.row.id)"
+                  flat
+                  round
+                  dense
+                  color="red"
+                  icon="mdi-delete"
+                >
+                  <q-tooltip>ลบรอบ</q-tooltip>
+                </q-btn>
+              </q-td>
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <div class="table_ellipsis">
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+          <template v-slot:pagination="scope">
+            ทั้งหมด {{ total }} รายการ
+            <q-pagination
+              v-model="formQuery.page"
+              active-color="primary"
+              color="dark"
+              :max="Number(totalList)"
+              size="sm"
+              boundary-links
+              direction-links
+              :max-pages="5"
+              @update:model-value="fetchList"
+            ></q-pagination>
+          </template>
+        </d-table>
+      </div>
    </div>
  </q-card>

--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@ -409,7 +409,6 @@ async function fetchProfileEvaluator(id: string) {
  http
    .get(config.API.profilePosition + `/${id}`)
    .then((res) => {
-      console.log(res.data.result);
      const data = res.data.result;
      evaluator.value.fullName =
        data.prefix + data.firstName + " " + data.lastName;
@ -892,7 +891,9 @@ onUnmounted(() => {
                  :rules="[ (val:string) => !!val ||
            `${'กรุณาเลือกผู้ประเมิน'}`, ]"
                  use-input
-                  @filter="(inputValue:any,
+                  hide-selected
+                  fill-input
+                  @filter="(inputValue:string,
            doneFn:Function) => filterOption(inputValue, doneFn,'evaluatorIdOp'
            ) "
                />
@ -930,7 +931,9 @@ onUnmounted(() => {
                  map-options
                  class="inputgreen"
                  use-input
-                  @filter="(inputValue:any,
+                  hide-selected
+                  fill-input
+                  @filter="(inputValue:string,
                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderIdOp'
                    ) "
                >
@ -983,7 +986,9 @@ onUnmounted(() => {
                  map-options
                  use-input
                  class="inputgreen"
-                  @filter="(inputValue:any,
+                  hide-selected
+                  fill-input
+                  @filter="(inputValue:string,
                    doneFn:Function) => filterOption(inputValue, doneFn,'commanderHighOp'
                    ) "
                >
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@ -429,6 +429,7 @@ function onCloseModal() {
 * function fetch รายชื่อข้อมูลทะเบียนประวัติ
 */
 function fetchListPerson() {
+  rowsPerson.value = []
  showLoader();
  let queryParams = {
    page: formFilter.page,
@ -796,13 +797,13 @@ onMounted(() => {
              class="bg-white"
              v-model="formFilter.searchKeyword"
              outlined
-              clearable
              hide-bottom-space
              dense
              label="คำค้น"
            >
              <template v-slot:after>
                <q-btn
+                  outline
                  color="primary"
                  icon="search"
                  label="ค้นหา"
@ -811,6 +812,9 @@ onMounted(() => {
                >
                </q-btn>
              </template>
+              <template v-slot:append>
+                <q-icon name="search" color="grey-5" />
+              </template>
            </q-input>
          </div>
        </div>