diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 5d92af1f..6f683bd3 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -177,15 +177,6 @@ export class WithdrawalsRecordComponent { placeholder: '请输入' } }, - // refundStatus: { - // type: 'string', - // title: '提现状态', - // ui: { - // widget: 'dict-select', - // params: { dictKey: 'refund:apply:status' }, - // placeholder: '请选择' - // } - // }, createTime: { title: '提现时间', type: 'string', diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 54c686a7..d97495d1 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-04-25 15:52:41 + * @LastEditTime : 2022-04-25 16:19:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -88,6 +88,8 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { + console.log(this.ar.snapshot); + this.addStatus = false; this.initSF(); } diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index ee9b5b9d..5e7828bc 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -125,7 +125,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { buttons: [ { text: '查看', - click: _record => this.viewEvaluate(_record), + click: _record => this.configAction(_record), }, { text: '禁用', @@ -187,9 +187,9 @@ export class ParterRebateManageMentSettingComponent implements OnInit { } }); } - configAction() { - this.router.navigate(['/partner/rebate/setting/add/', 1]) - } + configAction(value?: any) { + this.router.navigate(['/partner/rebate/setting/add/', '0'], {queryParams: value}) + } /** * 重置表单 */ diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 50b3e8db..b91344a8 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -62,6 +62,7 @@ export class SettingRoleEditComponent implements OnInit { } getRoleInfo() { + this.roleInfoData = [] const params = { id: this.params.id }; 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 e5d0309a..8b031d24 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 @@ -19,6 +19,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { defaultCheckedKeys: any[] = []; functionList: any[] = []; allChecked = false; + changeIFT = false; indeterminate = true; @Input() type = 'edit'; @Input() source = ''; @@ -58,7 +59,7 @@ export class SettingMenuComponent implements OnInit, OnChanges { }); } addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) { - console.log(origin,node); + console.log(origin); if (this.authority?.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) { // 判断此菜单权限是否已经存在权限列表中 @@ -69,6 +70,23 @@ export class SettingMenuComponent implements OnInit, OnChanges { menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在,给属性指定数据类型 if (item) { this.changeIF.emit(true); + this.changeIFT = true + // 判断此菜单下是否已有此按钮权限 + // this.againGetBtn(id, origin); + const params = { + id: origin.id + }; + this.service.request(this.service.$api_getFunctionButtonInfo, params).subscribe(res => { + if (res) { + let origins: any = {}; + origins.buttonInfoList = res; + origins.all = false; + console.log(origins); + + // 判断此菜单下是否已有此按钮权限 + this.againGetBtn(origin.id, origins); + } + }); // 单选 if (item.checked) { if (menuItem.buttonAuthorityIds.indexOf(item.functionButtonId) === -1) { @@ -329,7 +347,12 @@ export class SettingMenuComponent implements OnInit, OnChanges { } // 再次请求,需要判断暂存权限数组是否已有此权限 againGetBtn(id: any, origin: any) { - if (this.authority && this.authority.length !== 0) { + console.log(id,origin); + + console.log(this.authority); + console.log(this.authority.length); + + if ((this.authority && this.authority.length !== 0)) { console.log('1111'); const buttonAuthorityIds: any = [];