Merge branch 'develop' into devTee

2025-04-09 18:08:12 +07:00 · 2025-04-09 18:08:12 +07:00 · b0e523f576
commit b0e523f576
parent 355030fb19 2b0998c1fe
11 changed files with 129 additions and 32 deletions
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
@ -48,7 +48,8 @@ async function fetchSigner() {
      }
    })
    .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
+      console.log(e);
    })
    .finally(() => {
      setTimeout(() => {
--- a/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue
@ -47,7 +47,7 @@ const columns = ref<QTableProps["columns"]>([
    name: "citizenId",
    align: "left",
    label: "เลขประจำตัวประชาชน",
-   sortable: false,
+    sortable: false,
    field: "citizenId",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
@ -57,15 +57,29 @@ const columns = ref<QTableProps["columns"]>([
    align: "left",
    label: "ชื่อ-นามสกุล",
    field: "fullName",
-   sortable: false,
+    sortable: false,
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "เลขที่ตำแหน่ง",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
+  },
  {
    name: "position",
    align: "left",
    label: "ตำแหน่งในสายงาน",
-   sortable: false,
+    sortable: false,
    field: "position",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
@ -74,7 +88,7 @@ const columns = ref<QTableProps["columns"]>([
    name: "posType",
    align: "left",
    label: "ประเภทตำเเหน่ง",
-   sortable: false,
+    sortable: false,
    field: "posType",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
@ -83,7 +97,7 @@ const columns = ref<QTableProps["columns"]>([
    name: "posLevel",
    align: "left",
    label: "ระดับตำเเหน่ง",
-   sortable: false,
+    sortable: false,
    field: "posLevel",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@ -637,6 +637,7 @@ const updateIsShowRetire = async () => {
                  :fetchDataTable="fetchDataPeriodNew"
                  :total="total"
                  :snap-shot="props?.snapShot"
+                  :is-close="props.periodLatest?.group1IsClose ?? false"
                />
                <TableTabType2
                  v-else
@ -647,6 +648,7 @@ const updateIsShowRetire = async () => {
                  :total="total"
                  :type="item.type"
                  :snap-shot="props?.snapShot"
+                  :is-close="props.periodLatest?.group2IsClose ?? false"
                />
              </q-tab-panel>
            </q-tab-panels>
--- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
@ -30,6 +30,7 @@ const { dialogRemove, messageError, showLoader, hideLoader, success } =
 const formFilter = defineModel<DataFilter>("formFilter", { required: true });
 const maxPage = defineModel<Number>("maxPage", { required: true });
 const snapShot = defineModel<string>("snapShot");
+const isClose = defineModel<boolean>("isClose", { required: true });

 const props = defineProps({
  rows: { type: Array },
@ -56,15 +57,7 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
-  {
-    name: "posNo",
-    align: "left",
-    label: "เลขที่ตำแหน่ง",
-    sortable: false,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
  {
    name: "fullName",
    align: "left",
@ -74,6 +67,20 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "เลขที่ตำแหน่ง",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
+  },
  {
    name: "position",
    align: "left",
@ -298,7 +305,11 @@ watch(
  <q-toolbar class="text-primary" style="padding: 0px">
    <!-- && snapShot === 'SNAP1' -->
    <q-btn
-      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
+      v-if="
+        !store.isClosedRound &&
+        !isClose &&
+        checkPermission($route)?.attrIsCreate
+      "
      flat
      round
      dense
@ -377,6 +388,7 @@ watch(
          <q-btn
            v-if="
              !store.isClosedRound &&
+              !isClose &&
              (checkPermission($route)?.attrIsUpdate ||
                checkPermission($route)?.attrIsDelete)
            "
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@ -38,6 +38,7 @@ const {
 const formFilter = defineModel<DataFilter>("formFilter", { required: true });
 const maxPage = defineModel<Number>("maxPage", { required: true });
 const snapShot = defineModel<string>("snapShot");
+const isClose = defineModel<boolean>("isClose", { required: true });
 const props = defineProps({
  rows: { type: Array },
  fetchDataTable: {
@ -62,6 +63,7 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+
  {
    name: "fullName",
    align: "left",
@ -71,6 +73,20 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "เลขที่ตำแหน่ง",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
+  },
  {
    name: "posType",
    align: "left",
@ -174,6 +190,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
  "no",
  "fullName",
+  "posNo",
  "posType",
  "posExecutive",
  "position",
@ -330,7 +347,11 @@ function onClickViewInfo(type: string, id: string) {
    <!-- &&
    snapShot === 'SNAP1' -->
    <q-btn
-      v-if="!store.isClosedRound && checkPermission($route)?.attrIsCreate"
+      v-if="
+        !store.isClosedRound &&
+        checkPermission($route)?.attrIsCreate &&
+        !isClose
+      "
      flat
      round
      dense
@ -396,6 +417,7 @@ function onClickViewInfo(type: string, id: string) {
          <q-btn
            v-if="
              !store.isClosedRound &&
+              !isClose &&
              (checkPermission($route)?.attrIsUpdate ||
                checkPermission($route)?.attrIsDelete)
            "
@ -490,7 +512,9 @@ function onClickViewInfo(type: string, id: string) {
              flat
              dense
              icon="info"
-              color="info"
+              :color="
+                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
+              "
              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
            >
            </q-btn>
--- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue
@ -61,6 +61,20 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
+  },
  {
    name: "position",
    align: "left",
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@ -54,15 +54,7 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
-  {
-    name: "posNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: false,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
  {
    name: "fullName",
    align: "left",
@ -72,6 +64,15 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
  {
    name: "position",
    align: "left",
@ -441,6 +442,7 @@ watch(
            </q-menu>
          </q-btn>
        </q-td>
+
        <q-td
          v-for="col in props.cols"
          :key="col.name"
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@ -72,14 +72,20 @@ const columns = ref<QTableProps["columns"]>([
    style: "font-size: 14px",
  },
  {
-    name: "posType",
+    name: "posNo",
    align: "left",
-    label: "กลุ่มงาน",
+    label: "ตำแหน่งเลขที่",
    sortable: false,
-    field: "posType",
+    field: "posNo",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
  },
+
  {
    name: "position",
    align: "left",
@ -89,6 +95,15 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
  },
+  {
+    name: "posType",
+    align: "left",
+    label: "กลุ่มงาน",
+    sortable: false,
+    field: "posType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
  {
    name: "posLevel",
    align: "left",
@ -107,7 +122,7 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    format(val, row) {
-      return val ? "กลุ่ม" + val : "-";
+      return val ? `กลุ่ม${val}` : "-";
    },
  },
  {
@ -186,6 +201,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
  "no",
  "fullName",
+  "posNo",
  "posType",
  "position",
  "posLevel",
@ -512,7 +528,9 @@ watch(
              dense
              icon="info"
              class="q-pa-none q-ml-xs"
-              color="info"
+              :color="
+                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
+              "
              size="12px"
              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
            >
--- a/src/modules/13_salary/interface/response/SalaryList.ts
+++ b/src/modules/13_salary/interface/response/SalaryList.ts
@ -3,6 +3,8 @@ interface DataPeriodLatest {
  group2id: string; // Id กลุ่ม2
  effectiveDate: string; // วันที่มีผลบังคับใช้
  period: string; // ประเภทผัง (SPECIAL->รอบพิเศษ,APR->รอบเมษายน,OCT->รอบตุลาคม)
+  group1IsClose: boolean;
+  group2IsClose: boolean;
 }

 interface DataPeriodQuota {
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@ -201,6 +201,7 @@ async function getAgency(id: string) {
      })
      .catch((err) => {
        messageError($q, err);
+        hideLoader();
      });
  } else {
    agencyOptionsMain.value = [];
@ -239,6 +240,7 @@ async function getAgencyPosition(id: string) {
      })
      .catch((err) => {
        messageError($q, err);
+        hideLoader();
      });
  } else agencyFilter.value = "";
 }
@ -352,6 +354,7 @@ function getQuota() {
    })
    .catch((e) => {
      messageError($q, e);
+      hideLoader();
    });
 }

@ -385,6 +388,7 @@ async function fetchCheckisOfficer() {
    })
    .catch((e) => {
      messageError($q, e);
+      hideLoader();
    });
 }

--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@ -196,6 +196,7 @@ async function getAgency(id: string) {
      })
      .catch((err) => {
        messageError($q, err);
+        hideLoader();
      }));
 }

@ -227,6 +228,7 @@ async function getAgencyPosition(id: string) {
      })
      .catch((err) => {
        messageError($q, err);
+        hideLoader();
      });
  } else agencyFilter.value = "";
 }
@ -263,6 +265,7 @@ async function fetchSalalyPeriod(
      })
      .catch((err) => {
        messageError($q, err);
+        hideLoader();
      });
  }
 }
@ -380,6 +383,7 @@ async function fetchCheckisOfficer() {
    })
    .catch((e) => {
      messageError($q, e);
+      hideLoader();
    });
 }