diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index ed607da7..a47a616b 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -29,7 +29,6 @@ import format from 'date-fns/format'; providers: [DatePipe] }) export class orderManagementVoucherViewComponent implements OnInit { - record: any = {}; i: any; loadPDF: string = ''; formData: any; @@ -45,7 +44,7 @@ export class orderManagementVoucherViewComponent implements OnInit { constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { } ngOnInit(): void { - // console.log(this.i) + console.log(this.i) this.initData() this.i.time = this.i.loadingTime; this.initSF(); @@ -72,8 +71,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -117,8 +116,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -170,8 +169,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -215,8 +214,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -274,8 +273,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -320,8 +319,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -382,8 +381,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -428,8 +427,8 @@ export class orderManagementVoucherViewComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.unloadingAddressArr[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', 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 95aba48d..a390161f 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 @@ -64,6 +64,7 @@ export class SettingRoleEditComponent implements OnInit { const params = { id: this.params.id }; +console.log(this.params.infoUrl) this.service.request(this.params.infoUrl, params).subscribe(res => { if (res) { this.roleInfoData = res; 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 f867aee9..34a9ba11 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 @@ -57,10 +57,15 @@ export class SettingMenuComponent implements OnInit, OnChanges { }); } addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) { + console.log(origin,node); + if (this.authority?.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) { // 判断此菜单权限是否已经存在权限列表中 // 当前操作菜单id存在权限列表里 this.authority.forEach(menuItem => { + console.log(menuItem); + console.log(item); + if (menuItem.authorityId === origin.id) { menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在,给属性指定数据类型 if (item) { @@ -312,6 +317,8 @@ export class SettingMenuComponent implements OnInit, OnChanges { if (res) { origin.buttonInfoList = res; origin.all = false; + console.log(origin); + // 判断此菜单下是否已有此按钮权限 this.againGetBtn(id, origin); } diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 056ca944..cfd71b20 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -153,7 +153,7 @@ - +