Merge branch 'develop' into devTee

src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue

@@ -25,7 +25,7 @@ const dataMapToSend = computed(() => {
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,
-    remarkVertical: i.reason,
+    remarkVertical: i.reasonResign,
     remarkHorizontal: i.remarkHorizontal,
   }));
 });
@@ -158,6 +158,8 @@ const modalCommand = ref<boolean>(false);
 
 /** popup ยืนยันส่งัว */
 function saveOrder() {
+  console.log(selected.value);
+  
   dialogConfirm(
     $q,
     () => {

src/modules/06_retirement/components/02_resign/ResignByid.vue

@@ -73,6 +73,7 @@ const dataDetail = ref<any>({
   statusMain: "",
   cancelReason: "",
   remark: "",
+  reasonResign: "",
 });
 
 const workflowRef = ref<any>(null);
@@ -201,7 +202,7 @@ async function fetchData(id: string) {
       salary.value = data.salary ? data.salary : 0;
       date.value = data.sendDate ? new Date(data.sendDate) : null;
       dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
-      reason.value = data.reason ?? "";
+      reason.value = data.reasonResign ?? "";
       location.value = data.location ?? "";
       status.value = data.status ?? "";
       remarkHorizontal.value = data.remarkHorizontal ?? "-";
@@ -306,7 +307,7 @@ async function clickCancel() {
     salary.value = data.salary ? data.salary : 0;
     date.value = data.sendDate ? new Date(data.sendDate) : null;
     dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
-    reason.value = data.reason ?? "";
+    reason.value = data.reasonResign ?? "";
     location.value = data.location ?? "";
     status.value = data.status ?? "";
     remarkHorizontal.value = data.remarkHorizontal ?? "-";

src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue

@@ -25,7 +25,7 @@ const dataMapToSend = computed(() => {
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,
-    remarkVertical: i.reason,
+    remarkVertical: i.reasonResign,
     remarkHorizontal: i.remarkHorizontal,
   }));
 });

src/modules/06_retirement/components/03_resignEmp/ResignByid.vue

@@ -72,6 +72,7 @@ const dataDetail = ref<any>({
   statusMain: "",
   cancelReason: "",
   remark: "",
+  reasonResign: "",
 });
 
 const workflowRef = ref<any>(null);
@@ -200,7 +201,7 @@ async function fetchData(id: string) {
       salary.value = data.salary ? data.salary : 0;
       date.value = data.sendDate ? new Date(data.sendDate) : null;
       dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
-      reason.value = data.reason ?? "";
+      reason.value = data.reasonResign ?? "";
       location.value = data.location ?? "";
       status.value = data.status ?? "";
       remarkHorizontal.value = data.remarkHorizontal ?? "-";
@@ -305,7 +306,7 @@ async function clickCancel() {
     salary.value = data.salary ? data.salary : 0;
     date.value = data.sendDate ? new Date(data.sendDate) : null;
     dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
-    reason.value = data.reason ?? "";
+    reason.value = data.reasonResign ?? "";
     location.value = data.location ?? "";
     status.value = data.status ?? "";
     remarkHorizontal.value = data.remarkHorizontal ?? "-";

src/modules/06_retirement/interface/response/Main.ts

@@ -29,6 +29,7 @@ interface ResponseItems {
   fullname: string;
   datetext: string | null;
   citizenId: string;
+  reasonResign: string;
 }
 
 interface TypeFile {

src/modules/13_salary/views/04_salaryLists.vue

@@ -404,7 +404,12 @@ onMounted(async () => {
   <div class="row items-center">
     <q-space />
     <div class="row q-col-gutter-sm items-center q-py-xs">
-      <div v-if="isOfficer || isStaff">
+      <div
+        v-if="
+          ((isOfficer || isStaff) && snapFilter === 'SNAP2') ||
+          roundFilter?.shortCode === 'SPECIAL'
+        "
+      >
         <q-btn
           flat
           round

src/modules/13_salary/views/05_salaryListsEmployee.vue

@@ -395,7 +395,12 @@ onMounted(async () => {
   <div class="row items-center">
     <q-space />
     <div class="row q-col-gutter-sm items-center q-py-xs">
-      <div v-if="isOfficer || isStaff">
+      <div
+        v-if="
+          ((isOfficer || isStaff) && snapFilter === 'SNAP2') ||
+          roundFilter?.shortCode === 'SPECIAL'
+        "
+      >
         <q-btn
           flat
           round

src/modules/18_command/components/Step/Dialog2_Salary.vue

@@ -48,29 +48,29 @@ function checkCommandSysId() {
   }
 }
 
-const chechCommandCode = computed(() => {
+// const chechCommandCode = computed(() => {
-  const listCommandCode = [
+//   const listCommandCode = [
-    "C-PM-01",
+//     "C-PM-01",
-    "C-PM-02",
+//     "C-PM-02",
-    "C-PM-03",
+//     "C-PM-03",
-    "C-PM-04",
+//     "C-PM-04",
-    "C-PM-05",
+//     "C-PM-05",
-    "C-PM-07",
+//     "C-PM-07",
-    "C-PM-08",
+//     "C-PM-08",
-    "C-PM-09",
+//     "C-PM-09",
-    "C-PM-21",
+//     "C-PM-21",
-    "C-PM-22",
+//     "C-PM-22",
-    "C-PM-24",
+//     "C-PM-24",
-    "C-PM-29",
+//     "C-PM-29",
-    "C-PM-38",
+//     "C-PM-38",
-    "C-PM-39",
+//     "C-PM-39",
-  ];
+//   ];
-  if (listCommandCode.includes(props.commandCode)) {
+//   if (listCommandCode.includes(props.commandCode)) {
-    return true;
+//     return true;
-  } else {
+//   } else {
-    return false;
+//     return false;
-  }
+//   }
-});
+// });
 
 function onSubmit() {
   dialogConfirm($q, () => {
@@ -159,7 +159,7 @@ watch(
           <div class="row col-12 q-col-gutter-sm">
             <div
               class="row col-12 q-col-gutter-sm"
-              v-if="chechCommandCode || readonly"
+              v-if="storeDetail.isSalary || readonly"
             >
               <div
                 v-if="store.isShowSalary(type)"