fix salary

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",

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>

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)
             "

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>

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 {

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();
     });
 }