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

This commit is contained in:
Thanit Konmek 2023-07-04 11:43:43 +07:00
commit 9919c8bc1e
3 changed files with 16 additions and 16 deletions

View file

@ -213,8 +213,8 @@ const menuList = readonly<any[]>([
},
{
key: 9,
icon: "mdi-medal-outline",
activeIcon: "mdi-medal",
icon: "o_contact_page",
activeIcon: "contact_page",
label: "ทะเบียนประวัติลูกจ้าง",
path: "registryEmployee",
role: "registryEmployee",

View file

@ -527,8 +527,8 @@ const OriginalDataFetch = async () => {
//
const redirectToPage = (id?: number) => {
// router.push({ name: 'placementDetail'});
// router.push(`/placement/order/detail`);
router.push({ name: "placementDetail" });
router.push(`/placement/order/detail`);
};
const clickDelete = (id: string) => {

View file

@ -3,8 +3,8 @@
*/
const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
const Detail = () =>
import("@/modules/08_registryEmployee/components/Profile.vue");
// const Detail = () =>
// import("@/modules/08_registryEmployee/components/Profile.vue");
export default [
{
@ -17,14 +17,14 @@ export default [
Role: "registryEmployee",
},
},
{
path: "/registryEmployee/:id",
name: "registryEmployeeDetail",
component: Detail,
meta: {
Auth: true,
Key: [9],
Role: "registryEmployee",
},
},
// {
// path: "/registryEmployee/:id",
// name: "registryEmployeeDetail",
// component: Detail,
// meta: {
// Auth: true,
// Key: [9],
// Role: "registryEmployeeDetails",
// },
// },
];