Merge branch 'develop' into dev-tee

# Conflicts:
#	src/modules/11_discipline/router.ts
This commit is contained in:
setthawutttty 2023-10-17 14:27:26 +07:00
commit 2f645bb4e3
10 changed files with 1942 additions and 268 deletions

View file

@ -1,4 +1,3 @@
const complaintMain = () => import("@/modules/11_discipline/components/1_Complaint/MainPage.vue")
const factsMain = () => import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue")
const investigatefactsAdd = () => import("@/modules/11_discipline/components/2_InvestigateFacts/investigatefactsAdd.vue")
@ -10,67 +9,71 @@ const channelMain = () => import("@/modules/11_discipline/components/ุ6_Inform
const complaintAdd = () => import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue")
const reportType = () => import('@/modules/11_discipline/components/5_Report/reportDetail.vue')
const InvestigateDisciplinaryAdd = () =>
import(
"@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue"
);
export default [
{
path: "/discipline/complaints",
name: "/discipline-complaints",
component: complaintMain,
meta: {
Auth: true,
Key: [11.1],
Role: "coin",
},
{
path: "/discipline/complaints",
name: "/discipline-complaints",
component: complaintMain,
meta: {
Auth: true,
Key: [11.1],
Role: "coin",
},
{
path: "/discipline/complaints/add",
name: "/discipline-complaints-add",
component: complaintAdd,
meta: {
Auth: true,
Key: [11.1],
Role: "coin",
},
},
{
path: "/discipline/complaints/add",
name: "/discipline-complaints-add",
component: complaintAdd,
meta: {
Auth: true,
Key: [11.1],
Role: "coin",
},
{
path: "/discipline/investigatefacts",
name: "/discipline-investigatefacts",
component: factsMain,
meta: {
Auth: true,
Key: [11.2],
Role: "coin",
},
},
{
path: "/discipline/investigatefacts",
name: "/discipline-investigatefacts",
component: factsMain,
meta: {
Auth: true,
Key: [11.2],
Role: "coin",
},
{
path: "/discipline/disciplinary",
name: "/discipline-disciplinary",
component: disciplinaryMain,
meta: {
Auth: true,
Key: [11.3],
Role: "coin",
},
},
{
path: "/discipline/disciplinary",
name: "/discipline-disciplinary",
component: disciplinaryMain,
meta: {
Auth: true,
Key: [11.3],
Role: "coin",
},
{
path: "/discipline/order",
name: "/discipline-order",
component: oredrMain,
meta: {
Auth: true,
Key: [11.4],
Role: "coin",
},
},
{
path: "/discipline/order",
name: "/discipline-order",
component: oredrMain,
meta: {
Auth: true,
Key: [11.4],
Role: "coin",
},
{
path: "/discipline/report",
name: "/discipline-report",
component: report,
meta: {
Auth: true,
Key: [11.5],
Role: "coin",
},
},
{
path: "/discipline/report",
name: "/discipline-report",
component: report,
meta: {
Auth: true,
Key: [11.5],
Role: "coin",
},
},
{
path: "/discipline/report/:type",
name: "/discipline-reportType",
@ -90,25 +93,45 @@ export default [
Key: [11.6],
Role: "coin",
},
},
{
path: "/discipline/director",
name: "/discipline-director",
component: directorMain,
meta: {
Auth: true,
Key: [11.6],
Role: "coin",
},
{
path: "/discipline/channel",
name: "/discipline-channel",
component: channelMain,
meta: {
Auth: true,
Key: [11.6],
Role: "coin",
},
},
{
path: "/discipline/channel",
name: "/discipline-channel",
component: channelMain,
meta: {
Auth: true,
Key: [11.6],
Role: "coin",
},
{
path: "/discipline/investigatefacts/add",
name: "/discipline-investigatefactsAdd",
component: investigatefactsAdd,
meta: {
Auth: true,
Key: [11.2],
Role: "coin",
},
},
{
path: "/discipline/investigatefacts/add",
name: "/discipline-investigatefactsAdd",
component: investigatefactsAdd,
meta: {
Auth: true,
Key: [11.2],
Role: "coin",
},
]
},
{
path: "/discipline/InvestigateDisciplinary/add",
name: "/discipline-InvestigateDisciplinaryAdd",
component: InvestigateDisciplinaryAdd,
meta: {
Auth: true,
Key: [11.3],
Role: "coin",
},
},
];