Merge branch 'develop' into dev-tee
# Conflicts: # src/modules/11_discipline/stroes/InvestigateFactStore.ts
This commit is contained in:
commit
03f017e04b
11 changed files with 309 additions and 49 deletions
|
|
@ -22,10 +22,10 @@ const channelMain = () =>
|
|||
import(
|
||||
"@/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue"
|
||||
);
|
||||
const channelAdd = () =>
|
||||
const channelAdd = () =>
|
||||
import(
|
||||
"@/modules/11_discipline/components/6_BasicInformation/Channel/addChannel.vue"
|
||||
);
|
||||
"@/modules/11_discipline/components/6_BasicInformation/Channel/AddPage.vue"
|
||||
);
|
||||
const complaintAdd = () =>
|
||||
import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue");
|
||||
const reportType = () =>
|
||||
|
|
@ -35,7 +35,8 @@ const InvestigateDisciplinaryAdd = () =>
|
|||
import(
|
||||
"@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue"
|
||||
);
|
||||
const orderPage = () => import("@/modules/11_discipline/components/4_Order/OrderPage.vue")
|
||||
const orderPage = () =>
|
||||
import("@/modules/11_discipline/components/4_Order/OrderPage.vue");
|
||||
export default [
|
||||
{
|
||||
path: "/discipline/complaints",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue