Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/09_leave/components/2_Leave/DetailLeave.vue

src/modules/09_leave/components/2_Leave/DetailLeave.vue

@@ -30,7 +30,7 @@ function saveData() {
         class="q-mr-sm"
         @click="router.push(`/leave-list`)"
       />
-      รายละเอียดการลาของ {{ paramsId }}
+      รายละเอียดการลาของ นายปิยรมย์ ศิริธาราฟ
     </div>
     <div>
       <q-btn

src/modules/09_leave/components/2_Leave/TableList.vue

@@ -118,7 +118,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
           v-for="col in props.cols"
           :key="col.name"
           :props="props"
-          @click.prevent="router.push(`/leave/detail/${props.row.name}`)"
+          @click.prevent="router.push(`/leave/detail/${props.row.id}`)"
         >
           <div v-if="col.name == 'no'">
             {{ props.rowIndex + 1 }}

src/modules/09_leave/components/2_Leave/ToolBar.vue

@@ -53,7 +53,6 @@ const { searchDataFn, filterOption } = leaveStore;
     <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="selectStatus"
-        v-if="leaveStore.tab == '2'"
         emit-value
         map-options
         outlined
@@ -100,6 +99,4 @@ const { searchDataFn, filterOption } = leaveStore;
       />
     </div>
   </div>
-</template>
-
-<style scoped></style>
+</template>