Merge branch 'nice_dev' into develop

# Conflicts:
#	src/api/05_placement/api.probation.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-08-11 16:57:02 +07:00
commit 115f24b75e
13 changed files with 2423 additions and 191 deletions

View file

@ -38,10 +38,11 @@ const RepatriationOrderAdd = () =>
const receiveMain = () =>
import("@/modules/05_placement/components/Receive/receiveMain.vue");
const receiveDetail = () =>
const receiveDetail = () =>
import("@/modules/05_placement/components/Receive/receiveDetail.vue");
const ReceiveAdd = () =>
const ReceiveAdd = () =>
import("@/modules/05_placement/components/Receive/FormAdd.vue");
const FormSaveResultAdd = () => import("/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue")
export default [
{
@ -104,6 +105,16 @@ export default [
Role: "placement",
},
},
{
path: "/probation/detail/add/:id/:form",
name: "probationFormAdd",
component: FormSaveResultAdd,
meta: {
Auth: true,
Key: [6.3],
Role: "placement",
},
},
{
path: "/probation/work/add",
name: "probationWorkAdd",