Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

src/modules/09_leave/components/05_Leave/DetailLeavePage.vue

@@ -361,7 +361,7 @@ async function fetchDetailLeave(paramsId: string) {
         data.coupleDayEndDateHistory && date2Thai(data.coupleDayEndDateHistory);
       formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
         ? data.coupleDaySumTotalHistory
-        : "-";
+        : "";
       formData.approveStep = data.approveStep ? data.approveStep : "-";
       formData.dear = data.dear ? data.dear : "-";
       formData.profileType = data.profileType;

src/modules/13_salary/components/04_salaryLists/TableTypePending.vue

@@ -525,25 +525,30 @@ function onClickViewInfo(type: string, id: string) {
               {{ props.row.isSuspension == null ? "-" : "" }}
             </div>
           </div>
-          <div
+          <div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
-            v-else-if="
-              col.name == 'posSalary' ||
-              col.name == 'discipline' ||
-              col.name == 'leave'
-            "
-          >
             <q-btn
               v-if="checkPermission($route)?.attrIsGet"
               flat
               dense
               icon="info"
-              :color="
+              color="info"
-                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
-              "
               @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
             >
             </q-btn>
           </div>
+          <div v-else-if="col.name == 'discipline'">
+            <q-btn
+              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              flat
+              dense
+              icon="info"
+              color="red"
+              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
+            >
+            </q-btn>
+
+            <div v-else>-</div>
+          </div>
 
           <div v-else>
             {{ col.value ? col.value : "-" }}

src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue

@@ -539,28 +539,35 @@ watch(
             {{ Number(props.row.amount).toLocaleString() }}
           </div>
 
-          <div
+          <div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
-            v-else-if="
-              col.name == 'posSalary' ||
-              col.name == 'discipline' ||
-              col.name == 'leave'
-            "
-          >
             <q-btn
               v-if="checkPermission($route)?.attrIsGet"
               flat
               dense
               icon="info"
               class="q-pa-none q-ml-xs"
-              :color="
+              color="info"
-                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
-              "
               size="12px"
               @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
             >
             </q-btn>
           </div>
 
+          <div v-else-if="col.name == 'discipline'">
+            <q-btn
+              v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
+              flat
+              dense
+              icon="info"
+              class="q-pa-none q-ml-xs"
+              color="red"
+              size="12px"
+              @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
+            >
+            </q-btn>
+            <div v-else>-</div>
+          </div>
+
           <div v-else>
             {{ col.value ? col.value : "-" }}
           </div>