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-11 15:35:33 +08:00
parent bbd47bd2b7
commit fc661bd697
21 changed files with 581 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,11 @@
</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">
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-lock']">
启用
</button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-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()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-DETAIL-save']">
修改
</button>
</ng-template>

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-09 15:28:00
* @LastEditTime : 2022-02-11 15:08:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -18,9 +18,9 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" (click)="creat()">新增企业</button>
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()">导出</button>
<button nz-button nzType="primary" (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">新增企业</button>
<button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -50,7 +50,7 @@
{{ item.contacter }}/{{item.mobile}}
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone || '添加' }}</a>
</ng-template>
<ng-template st-row="stateCol" let-item let-index="index">
<nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>

3
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

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