Merge branch 'develop' into devTee

src/modules/13_salary/components/DialogInfoMain.vue

@@ -86,7 +86,11 @@ async function fetchProfile(id: string, avatarName: string) {
  * function rediract ไปทะเบียนประวัติ
  */
 function redirecToRegistry() {
-  router.push(`/registry-officer${props.employeeClass}/${profileId.value}`);
+  router.push(
+    `/registry${props.employeeClass ? props.employeeClass : "-officer"}/${
+      profileId.value
+    }`
+  );
   modal.value = false;
 }
 
@@ -228,5 +232,4 @@ watch(
   </q-dialog>
 </template>
 
-<style scoped>
-</style>
+<style scoped></style>