no message
This commit is contained in:
parent
6dd84473b6
commit
b6fd446e73
1 changed files with 0 additions and 33 deletions
|
|
@ -33,24 +33,8 @@ const probationFormEvaluation = () =>
|
||||||
|
|
||||||
const probationWorkAdd = () =>
|
const probationWorkAdd = () =>
|
||||||
import("@/modules/05_placement/components/probation/MainDetail.vue");
|
import("@/modules/05_placement/components/probation/MainDetail.vue");
|
||||||
<<<<<<< HEAD
|
|
||||||
const probationWorkAdd2 = () =>
|
|
||||||
import("@/modules/05_placement/components/probation/AddWork.vue");
|
|
||||||
|
|
||||||
export default [
|
|
||||||
{
|
|
||||||
path: "/placement",
|
|
||||||
name: "placement",
|
|
||||||
component: PlacementMain,
|
|
||||||
meta: {
|
|
||||||
Auth: true,
|
|
||||||
Key: [6.1],
|
|
||||||
Role: "placement",
|
|
||||||
=======
|
|
||||||
const probationFormAssign = () =>
|
const probationFormAssign = () =>
|
||||||
import("@/modules/05_placement/components/probation/FormAssign.vue");
|
import("@/modules/05_placement/components/probation/FormAssign.vue");
|
||||||
const resignOrder = () =>
|
|
||||||
import("@/modules/05_placement/components/OrderPlacement/ResignOrder.vue");
|
|
||||||
export default [
|
export default [
|
||||||
{
|
{
|
||||||
path: "/placement",
|
path: "/placement",
|
||||||
|
|
@ -61,7 +45,6 @@ export default [
|
||||||
Key: [6.1],
|
Key: [6.1],
|
||||||
Role: "placement",
|
Role: "placement",
|
||||||
},
|
},
|
||||||
>>>>>>> develop
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/placement/personal-list/:examId",
|
path: "/placement/personal-list/:examId",
|
||||||
|
|
@ -173,20 +156,4 @@ export default [
|
||||||
Role: "placement",
|
Role: "placement",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
},
|
|
||||||
|
|
||||||
];
|
];
|
||||||
=======
|
|
||||||
{
|
|
||||||
path: "/placement/resign-order",
|
|
||||||
name: "ResignOrderplacement",
|
|
||||||
component: resignOrder,
|
|
||||||
meta: {
|
|
||||||
Auth: true,
|
|
||||||
Key: [6.2],
|
|
||||||
Role: "placement",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
>>>>>>> develop
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue