Merge branch 'develop' into dev

src/modules/09_leave/components/02_WorkList/Tab1.vue

@@ -177,6 +177,8 @@ async function fetchListTimeRecord() {
             ? workStore.convertSatatus(e.checkOutStatus)
             : "-",
         }));
+      } else {
+        rows.value = [];
       }
     })
     .catch((err) => {

src/modules/09_leave/components/02_WorkList/Tab2.vue

@@ -143,6 +143,8 @@ async function fetchListLogRecord() {
           checkOutLat: e.checkOutLat ? e.checkOutLat : "",
           checkOutLon: e.checkOutLon ? e.checkOutLon : "",
         }));
+      } else {
+        rows.value = [];
       }
     })
     .catch((err) => {

src/modules/09_leave/views/06_ReportMain.vue

@@ -112,6 +112,7 @@ const nodeId = ref<string>("");
 const nodeLevel = ref<number>(0);
 const node = ref<DataStructureTree[]>([]);
 const expanded = ref<string[]>([]);
+const orgTreeDnaId = ref<string>("");
 
 /** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
 async function fetchDataTree() {
@@ -135,6 +136,7 @@ function onSelectedNode(data: any) {
   nodeId.value = data.orgTreeId;
   nodeLevel.value = data.orgLevel;
   expandedModal.value = false;
+  orgTreeDnaId.value = data.orgTreeDnaId;
   updateLeaveday();
 }
 
@@ -219,6 +221,7 @@ async function fetchLeaveday(
   startDate: Date,
   endDate: Date
 ) {
+  const nodeIdVal = typeReport.value === 3 ? orgTreeDnaId.value : nodeId.value;
   const body = {
     type:
       year === "FULL"
@@ -232,7 +235,7 @@ async function fetchLeaveday(
         : "WEEKLY",
     startDate: dateToISO(startDate),
     endDate: dateToISO(endDate),
-    nodeId: nodeId.value,
+    nodeId: nodeIdVal,
     node: nodeLevel.value,
   };
 
@@ -334,6 +337,7 @@ function filterOption(val: string, update: any, typeOp: string) {
 function clearData() {
   nodeId.value = "";
   nodeLevel.value = 0;
+  orgTreeDnaId.value = "";
   org.value = "";
   typeReport.value = null;
   yearType.value = "FULL";
@@ -410,7 +414,7 @@ function getReport() {
         : "WEEKLY",
     startDate: dateToISO(dateStart.value),
     endDate: dateToISO(dateEnd.value),
-    nodeId: nodeId.value,
+    nodeId: orgTreeDnaId.value,
     node: nodeLevel.value,
   };
   http
@@ -843,7 +847,7 @@ onMounted(() => {
                           </template>
                         </datepicker>
                       </div>
-                      <div class="col-12" v-if="yearType == 'MONTH'">
+                      <div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'">
                         <datepicker
                           v-model="dateMonth"
                           :locale="'th'"

src/modules/12_evaluatePersonal/components/Detail/step/step4.vue

@@ -644,7 +644,7 @@ onMounted(async () => {
         </div>
         <div class="col-12"><q-separator /></div>
         <div class="row">
-          <div class="col-12 q-pa-sm">
+          <div class="col-12 q-pa-sm" v-if="checkPermission($route)?.attrIsUpdate">
             <div class="row q-col-gutter-md col-12">
               <q-file
                 ref="fileEvaluatioRef"
@@ -691,6 +691,7 @@ onMounted(async () => {
           <div>ประกาศผลการคัดเลือกบุคคล (เอกสารหมายเลข 10)</div>
 
           <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
             flat
             dense
             round