Merge branch 'develop' into warunee-dev
# Conflicts: # src/modules/11_discipline/router.ts
This commit is contained in:
commit
8113b723ad
26 changed files with 1080 additions and 631 deletions
|
|
@ -3,9 +3,7 @@ const complaintMain = () =>
|
|||
const factsMain = () =>
|
||||
import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue");
|
||||
const investigatefactsAdd = () =>
|
||||
import(
|
||||
"@/modules/11_discipline/components/2_InvestigateFacts/investigatefactsAdd.vue"
|
||||
);
|
||||
import("@/modules/11_discipline/components/2_InvestigateFacts/AddPage.vue");
|
||||
const disciplinaryMain = () =>
|
||||
import(
|
||||
"@/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue"
|
||||
|
|
@ -32,16 +30,16 @@ const channelMain = () =>
|
|||
);
|
||||
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 = () =>
|
||||
import("@/modules/11_discipline/components/5_Report/reportDetail.vue");
|
||||
import("@/modules/11_discipline/components/5_Report/DetailPage.vue");
|
||||
|
||||
const InvestigateDisciplinaryAdd = () =>
|
||||
import(
|
||||
"@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue"
|
||||
"@/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue"
|
||||
);
|
||||
const orderPage = () =>
|
||||
import("@/modules/11_discipline/components/4_Order/OrderPage.vue");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue