hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice_dev' into develop

Browse source 
# Conflicts:
#	src/modules/05_placement/components/PersonalList/Table.vue
#	src/modules/06_retirement/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-24 15:27:45 +07:00
commit 4d369dbad7
13 changed files with 2752 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/06_retirement/router.ts
View file

@ -4,10 +4,16 @@
const Main = () => import("@/modules/06_retirement/views/Main.vue");
const Listretirement = () => import("@/modules/06_retirement/components/ListRetirement/TableList.vue")
<<<<<<< HEAD
const resignOrder = () => import("@/modules/06_retirement/components/resign/ResignOrder.vue");
const resign = () => import("@/modules/06_retirement/components/resign/Resign.vue");
const resignByid = () => import("@/modules/06_retirement/components/resign/ResignByid.vue")
const deceased = () => import("@/modules/06_retirement/components/resign/Deceased.vue")
=======
const DismissOrder = () => import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue")
const AddOrder = () => import("@/modules/06_retirement/components/DismissOrder/AddOrder.vue")
>>>>>>> nice_dev
export default [
{
path: "/retirement",
@ -30,26 +36,45 @@ export default [
},
},
{
<<<<<<< HEAD
path: "/retirement/resign",
name: "resign",
component: resign,
meta: {
Auth: true,
Key: [7.2],
=======
path: "/retirement/list/:id",
name: "retirement/list/id",
component: Listretirement,
meta: {
Auth: true,
Key: [7.1],
>>>>>>> nice_dev
Role: "retirement",
},
},
{
<<<<<<< HEAD
path: "/retirement/resign/:id",
name: "resignbyid",
component: resignByid,
meta: {
Auth: true,
Key: [7.3],
=======
path: "/retirement/dismiss-order",
name: "dismiss-order",
component: DismissOrder,
meta: {
Auth: true,
Key: [7.6],
>>>>>>> nice_dev
Role: "retirement",
},
},
{
<<<<<<< HEAD
path: "/retirement/resign-order",
name: "resign-order",
component: resignOrder,
@ -70,4 +95,15 @@ export default [
},
},
=======
path: "/retirement/dismiss-order/add",
name: "dismiss-order-add",
component: AddOrder,
meta: {
Auth: true,
Key: [7.6],
Role: "retirement",
},
},
>>>>>>> nice_dev
];