diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts index 6db7bd50..ec62a552 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -20,7 +20,7 @@ const alainConfig: AlainConfig = { sf: { button: { search: '查询' } }, pageHeader: { homeI18n: 'home', recursiveBreadcrumb: true }, auth: { login_url: '/passport/login' }, - acl: { guard_url: '/' } + acl: { guard_url: '/exception/403' } }; const alainModules = [AlainThemeModule.forRoot(), DelonACLModule.forRoot()]; diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts index 806e2da6..5e6210b2 100644 --- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts +++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts @@ -37,6 +37,9 @@ export class SettingMenuComponent implements OnInit, OnChanges { this.authority = this.isAuthorityIdDTOList || []; } } + if (changes.authorityAssistId) { + this.defaultCheckedKeys = [...this.authorityAssistId]; + } } ngOnInit() {} @@ -51,7 +54,6 @@ export class SettingMenuComponent implements OnInit, OnChanges { // } this.functionList = res; this.defaultCheckedKeys = this.authorityAssistId; - this.cdr.detectChanges(); }); } addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) { @@ -166,6 +168,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { } this.checkTreeNode(node, origin); } + checkTreeNode(node: any, origin: { id: any }) { const checkedNode: any = this.nzTreeComponent.getCheckedNodeList(); const allCheckedArr: any[] = []; @@ -192,12 +195,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { }); this.defaultCheckedKeys = allCheckedArr; } - addAuthorityAll(origin: any, node: { checked: any; buttonInfoList: any[] }) { - if (node.checked) { - node.buttonInfoList.forEach((item: any) => {}); - } else { - } - } + overTree(children: any[], a: any[]) { children.forEach(item => { a.push(item.key); @@ -209,16 +207,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { } }); } - // 获取角色模板权限 - getRoleTpl(id: any) { - const params = { - id - }; - this.service.request(this.service.$api_getRoleTemplateInfo, params).subscribe(res => { - this.authority = res.authority; - this.defaultCheckedKeys = res.authorityAssistId; - }); - } + addDisabledTree(arr: any[]) { arr.forEach((item: any) => { item.disableCheckbox = true; @@ -294,6 +283,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { } }); } + initButtonList(id: any, origin: any) { const params = { id @@ -329,6 +319,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { } }); } + initDictList(id: any, origin: any) { const params = { id diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index d8fa8e42..267ffbc8 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -43,7 +43,7 @@ - + [loading]="service.http.loading" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index cbe66870..c6a5964e 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -26,7 +26,7 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }"> + [loading]="service.http.loading" [scroll]="{ x:'1200px' }"> {{item.driverName}}
{{item.driverTelephone}} diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html index 3db97ad6..5029b4bf 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html @@ -27,7 +27,7 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"> + [loading]="service.http.loading" [scroll]="{ x:'1200px' }"> {{item.driverName}}
{{item.driverCellphone}} diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index 3c35b449..c274b52f 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -36,7 +36,7 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> + [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"> {{item.driverName}}
{{item.driverTelephone}} diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html index b4f699ef..5d02c313 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.html +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html @@ -23,5 +23,5 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process:beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)"> + [loading]="service.http.loading" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html index ee74bc12..2e7e9058 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -8,7 +8,8 @@ [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true" [button]="'none'"> -
+
@@ -35,6 +36,6 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> + [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index e468bdd9..e6fea07b 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -14,13 +14,8 @@
- +
@@ -57,17 +52,11 @@
- + [loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)"> {{ item.vatappcode }}
@@ -83,4 +72,4 @@
- + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 21f12ba7..a4a18af0 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -13,15 +13,11 @@
- +
-
+
@@ -45,24 +41,18 @@
-->
- + [loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)"> {{ item.no }} 预览发票 0.09 - + {{ item.expresscompany }}
{{ item.expressno }} @@ -76,4 +66,4 @@ 已签收

- + \ No newline at end of file