Merge branch 'develop' into nice

# Conflicts:
#	src/modules/14_KPI/store.ts

src/modules/13_salary/views/salaryRate.vue

@@ -34,6 +34,8 @@ const {
 } = useCounterMixin();
 
 const isActive = ref<boolean>(false);
+const posType = ref<string>("");
+
 const salaryId = ref<string>(route.params.id.toString());
 
 /** modalDialog*/
@@ -209,9 +211,11 @@ function fetchList() {
     .get(config.API.salaryChartByid(salaryId.value))
     .then((res) => {
       isActive.value = res.data.result.isActive;
+      posType.value = `${res.data.result.posTypeName}(${res.data.result.posLevelName})`;
     })
-    .catch((e) => {})
-    .finally(() => {});
+    .catch((e) => {
+      messageError($q, e);
+    });
 }
 onMounted(async () => {
   await fetchList();
@@ -236,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน
+      อัตราเงินเดือน ของ{{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">