Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-15 14:19:43 +08:00
parent 3d06073501
commit 1d23af8af6
7 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/usercenter/components/driver/detail/detail.component.html
View File

@ -17,11 +17,11 @@
</p>
<div style="margin-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)">
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)">
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
冻结
</button>
</div>
@ -79,9 +79,9 @@
</ng-container>
<ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="approveUser()"
*ngIf="userIdentityDetail?.certificationStatus===0">审核通过</button>
*ngIf="userIdentityDetail?.certificationStatus===0" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="rejectedUser()"
*ngIf="userIdentityDetail?.certificationStatus===0">驳回审核</button>
*ngIf="userIdentityDetail?.certificationStatus===0" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify(0)">修改</button>
</ng-template>
</div>

6
src/app/routes/usercenter/components/driver/driver.component.html
View File

@ -18,8 +18,8 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" (click)="exportList()" [disabled]="service.http.loading">导出</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-list']">查询</button>
<button nz-button nzType="primary" (click)="exportList()" [disabled]="service.http.loading" acl [acl-ability]="['USERCENTER-DRIVER-LIST-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -42,7 +42,7 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading">
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
</ng-template>
</st>
</nz-card>

10
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -307,16 +307,18 @@ export class UserCenterComponentsDriverComponent implements OnInit {
text: '查看<br/>',
click: item => {
this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
},
acl: { ability: ['USERCENTER-DRIVER-LIST-view'] },
},
{
text: '基础设置',
click: item => this.settingAction(item)
click: item => this.settingAction(item),
acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] },
},
{
text: '资金账户',
click: item => this.showAccountDetail(item)
click: item => this.showAccountDetail(item),
acl: { ability: ['USERCENTER-DRIVER-LIST-account'] },
}
]
}

10
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -44,20 +44,20 @@
</ng-container>
<ng-template #editButton>
<ng-container *ngIf="detailData?.approvalStatus===10">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
通过
</button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
驳回
</button>
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus!=10">
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
冻结
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
@ -71,7 +71,7 @@
关闭支付权限
</button>
</ng-container>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
修改
</button>
</ng-template>

11
src/app/routes/usercenter/components/freight/user/detail/detail.component.html
View File

@ -30,11 +30,11 @@
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex"
style="justify-content: flex-end;padding-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)">
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)">
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
冻结
</button>
</div>
@ -65,11 +65,10 @@
</button>
</ng-container>
<ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="auditPass()"
*ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="auditPass()" *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="auditNo()"
*ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify()">修改</button>
*ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-edit']" >修改</button>
</ng-template>
</div>
</sv-title>

10
src/app/routes/usercenter/components/freight/user/user.component.html
View File

@ -1,10 +1,10 @@
<!--
* @Author: your name
* @Date: 2021-12-13 10:47:28
* @LastEditTime: 2022-01-12 09:58:12
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-02-15 13:59:52
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\user\user.component.html
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\user\\user.component.html
-->
<!-- 页头 -->
<page-header-wrapper [title]="'员工列表'"></page-header-wrapper>
@ -16,7 +16,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-list']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="st?.load(1)">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -51,7 +51,7 @@
</div>
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)">
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-promoter']">
{{ item.promotersTelephone || '添加' }}
</a>
</ng-template>

9
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -223,17 +223,20 @@ export class FreightComponentsUserComponent implements OnInit {
text: '查看',
click: (item: any) => {
this.router.navigate(['./view', item.appUserId], { relativeTo: this.ar });
}
},
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
},
{
text: '冻结',
iif: item => item.stateLocked === 0,
click: (item: any) => this.userAction(0, [item.appUserId])
click: (item: any) => this.userAction(0, [item.appUserId]),
acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
},
{
text: '启用',
iif: item => item.stateLocked === 1,
click: (item: any) => this.userAction(1, [item.appUserId])
click: (item: any) => this.userAction(1, [item.appUserId]),
acl: { ability: ['USERCENTER-FREIGHT-USER-lock'] },
}
]
}