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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-15 16:22:19 +08:00
parent 8ccfb9e813
commit 69f9cb9377
2 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,34 +44,37 @@
</ng-container> </ng-container>
<ng-template #editButton> <ng-template #editButton>
<ng-container *ngIf="detailData?.approvalStatus===10"> <ng-container *ngIf="detailData?.approvalStatus===10">
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']"> <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditPass()" acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
通过 通过
</button> </button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']"> <button [disabled]="service.http.loading" nz-button nzDanger (click)="auditNo()" acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-audit']">
驳回 驳回
</button> </button>
</ng-container> </ng-container>
<ng-container *ngIf="detailData?.approvalStatus!=10"> <ng-container *ngIf="detailData?.approvalStatus!=10">
<button [disabled]="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" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"> (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
启用 启用
</button> </button>
<button [disabled]="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" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']"> (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
冻结 冻结
</button> </button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
[nzPopconfirmTitle]="Payfrozen" (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight" (nzOnConfirm)="PayOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 1">
*ngIf="detailData?.createPay === 1">
开通支付权限 开通支付权限
</button> </button>
<button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payenable"
[nzPopconfirmTitle]="Payenable" (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight" (nzOnConfirm)="PayOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.createPay === 0">
*ngIf="detailData?.createPay === 0">
关闭支付权限 关闭支付权限
</button> </button>
</ng-container> </ng-container>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']"> <button [disabled]="service.http.loading" nz-button nzDanger (click)="ratify()" acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-save']">
修改 修改
</button> </button>
</ng-template> </ng-template>
@ -173,7 +176,7 @@
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker> [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="营业期限" col="1"> <sv label="营业期限" col="3">
<nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" " <nz-date-picker [(ngModel)]="detailData.operatingStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar"> [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''" style="width: 100px;" class="calendar">
</nz-date-picker> </nz-date-picker>
@ -188,7 +191,19 @@
<label nz-checkbox [ngModel]="!!!detailData.operatingEndTime" <label nz-checkbox [ngModel]="!!!detailData.operatingEndTime"
(ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label> (ngModelChange)="$event?detailData.operatingEndTime='':''" class="ml-sm">长期</label>
</ng-container> </ng-container>
</sv>
<sv label="常用服务" col="3">
<ng-container *ngIf="isEdit; else oftenUsedServiceselseTemplate">
<nz-select [(ngModel)]="detailData.oftenUsedServices">
<nz-option [nzValue]="10" nzLabel="整车发货"></nz-option>
<nz-option [nzValue]="20" nzLabel="大宗发货"></nz-option>
</nz-select>
</ng-container>
<ng-template #oftenUsedServiceselseTemplate>
<input nz-input type="text"
[ngModel]="detailData.oftenUsedServices?detailData.oftenUsedServices===10?'整车发货':'大宗发货':'-'"
[readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</ng-template>
</sv> </sv>
<sv label="公司所在地" col="3"> <sv label="公司所在地" col="3">
<ng-container *ngIf="isEdit; else cascaderelseTemplate"> <ng-container *ngIf="isEdit; else cascaderelseTemplate">

31
src/app/routes/usercenter/components/freight/list/detail/detail.component.spec.ts
View File

@ -1,31 +0,0 @@
/*
* @Author: your name
* @Date: 2021-11-29 20:19:08
* @LastEditTime: 2021-11-29 20:31:00
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FreightComponentsListDetailComponent } from './detail.component';
describe('FreightComponentsListDetailComponent', () => {
let component: FreightComponentsListDetailComponent;
let fixture: ComponentFixture<FreightComponentsListDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [FreightComponentsListDetailComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FreightComponentsListDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});