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

Merge branch 'develop' into dev-tee

Browse source 
# Conflicts:
#	src/api/index.ts
#	src/modules/05_placement/router.ts
This commit is contained in:
setthawutttty 2023-08-15 14:01:59 +07:00
commit 314d7113bf
22 changed files with 1341 additions and 1472 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/05_placement/router.ts
View file

@ -45,9 +45,14 @@ const receiveMain = () =>
const receiveDetail = () =>
import("@/modules/05_placement/components/Receive/receiveDetail.vue");
const receiveDetail2 = () =>
import("@/modules/05_placement/components/Receive/receiveDetail2.vue");
const ReceiveAdd = () =>
import("@/modules/05_placement/components/Receive/FormAdd.vue");
const FormSaveResultAdd = () => import("/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue")
const FormSaveResultAdd = () =>
import(
"@/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue"
);
export default [
{
@ -213,7 +218,7 @@ export default [
{
path: "/receive/:id",
name: "receiveDetail",
component: receiveDetail,
component: receiveDetail2,
meta: {
Auth: true,
Key: [6.3],