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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-01-13 10:14:53 +08:00
parent f216c25f7c 6d8cf857fb
commit 91ab995e44
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,11 @@
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"></nz-badge>
</p>
<div style="margin-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
<button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
<button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)">
冻结
</button>
@ -51,10 +51,10 @@
</label>
<div style="float: right;">
<ng-container *ngIf="isEditUser; else elseTemplate">
<button [nzLoading]="service.http.loading" nz-button (click)="reset(0)">
<button [disabled]="service.http.loading" nz-button (click)="reset(0)">
取消
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="saveUser()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="saveUser()">
保存
</button>
</ng-container>
@ -100,10 +100,10 @@
</label>
<div style="float: right;">
<ng-container *ngIf="isEditDriver;else editDriverButton">
<button [nzLoading]="service.http.loading" nz-button (click)="reset(1)">
<button [disabled]="service.http.loading" nz-button (click)="reset(1)">
取消
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="saveDriver()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="saveDriver()">
保存
</button>
</ng-container>
@ -287,7 +287,7 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="120">
<se [col]="1" label="姓名">
{{ detailData?.enterpriseName }}
{{ userIdentityDetail?.name }}
</se>
<se [col]="1" label="备注" required>
<textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" [(ngModel)]="approvalOpinion"></textarea>

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

@ -35,43 +35,43 @@
</div>
<div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
<ng-container *ngIf="isEdit;else editButton">
<button [nzLoading]="service.http.loading" nz-button (click)="reset()">
<button [disabled]="service.http.loading" nz-button (click)="reset()">
取消
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="save()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="save()">
保存
</button>
</ng-container>
<ng-template #editButton>
<ng-container *ngIf="detailData?.approvalStatus===10">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditPass()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()">
通过
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditNo()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()">
驳回
</button>
</ng-container>
<ng-container *ngIf="detailData?.approvalStatus!=10">
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
启用
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
冻结
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
[nzPopconfirmTitle]="Payfrozen" (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight"
*ngIf="detailData?.createPay === 1">
开通支付权限
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm
[nzPopconfirmTitle]="Payenable" (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight"
*ngIf="detailData?.createPay === 0">
关闭支付权限
</button>
</ng-container>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="ratify()">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()">
修改
</button>
</ng-template>