Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

src/modules/08_registryEmployee/router.ts

@@ -1,10 +1,16 @@
 /**
  * Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee)
  */
+import { defineAsyncComponent } from "vue";
 
-const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
-// const Detail = () =>
-//   import("@/modules/08_registryEmployee/components/Profile.vue");
+// const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
+// const Detail = () => import("@/modules/08_registryEmployee/views/Detail.vue");
+const Main = defineAsyncComponent(
+  () => import("@/modules/08_registryEmployee/views/Main.vue")
+);
+const Detail = defineAsyncComponent(
+  () => import("@/modules/08_registryEmployee/views/Detail.vue")
+);
 
 export default [
   {
@@ -23,8 +29,18 @@ export default [
   //     component: Detail,
   //     meta: {
   //       Auth: true,
-  //       Key: [9],
+  //       Key: [10],
   //       Role: "registryEmployeeDetails",
   //     },
   //   },
+  {
+    path: "/registryEmployee/add",
+    name: "registryEmployeeAdd",
+    component: Detail,
+    meta: {
+      Auth: true,
+      Key: [11],
+      Role: "registryEmployee",
+    },
+  },
 ];

src/modules/08_registryEmployee/views/Main.vue

@@ -162,10 +162,10 @@
 </template>
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
-import router from "@/router";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QInput, QForm } from "quasar";
+import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -184,6 +184,7 @@ const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
 const { dialogMessage, messageError, showLoader, hideLoader } = mixin;
 
+const router = useRouter();
 const myForm = ref<QForm>();
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
@@ -545,6 +546,10 @@ onMounted(async () => {
   await nodeTree();
 });
 
+const next = (id: string) => {
+  router.push(`/registryEmployee/${id}`);
+};
+
 const paginationLabel = (start: number, end: number, total: number) => {
   //   if (props.paging == true)
   //     return " " + start + " ใน " + end + " จากจำนวน " + total + " รายการ";
@@ -585,7 +590,10 @@ const clickClose = async () => {
 };
 
 const clickAdd = () => {
-  router.push({ name: "" });
+  //   modal.value = true;
+
+  router.push(`/registryEmployee/add`);
+  //   router.push(`/placement/detail`);
 };
 
 const editDetail = () => {