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
2021-12-15 13:19:12 +08:00
parent 5f7df7339a 3485744f47
commit 3ff0fef50e
4 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -42,7 +42,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
flag: this.tabType flag: this.tabType
}); });
delete params._$expand; delete params._$expand;
return { ...params, listSource: 1 }; return { ...params, listSource: 2 };
} }
/** /**

137
src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
View File

@ -6,57 +6,54 @@
</button> </button>
</ng-template> </ng-template>
<ng-template #content> <ng-template #content>
<nz-skeleton [nzLoading]="service.http.loading"> <div class="user-info" nz-row>
<div class="user-info" nz-row> <div nz-col nzSpan="24" class="d-flex">
<div nz-col nzSpan="24" class="d-flex"> <img [src]="detailData?.enterpriseLogo" />
<img [src]="detailData?.enterpriseLogo" /> <div style="flex: 1;">
<div style="flex: 1;"> <div nz-row>
<div nz-row> <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
<p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
</div>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24" class="text-right mb-sm">
<label style="font-size: 18px;font-weight: 600;">{{statusE[detailData?.approvalStatus] }}</label>
</div>
</div> </div>
<div nz-row> <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24" class="text-right mb-sm">
<div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24"> <label style="font-size: 18px;font-weight: 600;">{{statusE[detailData?.approvalStatus] }}</label>
<p>{{ detailData?.unifiedSocialCreditCode }}</p> </div>
</div> </div>
<div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24"> <div nz-row>
申请时间：{{detailData?.createTime}} <div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24">
</div> <p>{{ detailData?.unifiedSocialCreditCode }}</p>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex" </div>
style="justify-content: flex-end;"> <div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24">
<ng-container *ngIf="isEdit;else editButton"> 申请时间：{{detailData?.createTime}}
<button [nzLoading]="service.http.loading" nz-button (click)="reset()"> </div>
取消 <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex" style="justify-content: flex-end;">
</button> <ng-container *ngIf="isEdit;else editButton">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="save()"> <button [nzLoading]="service.http.loading" nz-button (click)="reset()">
保存 取消
</button> </button>
</ng-container> <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="save()">
<ng-template #editButton> 保存
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditPass()"> </button>
通过 </ng-container>
</button> <ng-template #editButton>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditNo()"> <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditPass()">
驳回 通过
</button> </button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="ratify()"> <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditNo()">
修改 驳回
</button> </button>
</ng-template> <button [nzLoading]="service.http.loading" nz-button nzDanger (click)="ratify()">
</div> 修改
</button>
</ng-template>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</nz-skeleton> </div>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card [nzLoading]="service.http.loading" [class]="isEdit?'edit-box':'readOnly-box'"> <nz-card [class]="isEdit?'edit-box':'readOnly-box'">
<sv-container col="3"> <sv-container col="3">
<sv-title>企业管理员信息</sv-title> <sv-title>企业管理员信息</sv-title>
<sv label="姓名"> <sv label="姓名">
@ -74,16 +71,16 @@
<sv label="身份证照" col="2"> <sv label="身份证照" col="2">
<div class="d-flex"> <div class="d-flex">
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark',hover:'adminFront'}">
</ng-container> </ng-container>
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark',hover:'adminBack'}">
</ng-container> </ng-container>
</div> </div>
</sv> </sv>
<sv label="企业授权函" col="2"> <sv label="企业授权函" col="2">
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.adminUserInfo?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark',hover:'adminPhoto'}">
</ng-container> </ng-container>
</sv> </sv>
</sv-container> </sv-container>
@ -129,11 +126,11 @@
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker> [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="营业期限"> <sv label="营业期限">
<ng-container *ngIf="isEdit; else elseTemplate"> <ng-container *ngIf="isEdit; else operatingelseTemplate">
<nz-range-picker [ngModel]="[detailData?.operatingStartTime,detailData?.operatingEndTime]" <nz-range-picker [ngModel]="[detailData?.operatingStartTime,detailData?.operatingEndTime]"
(ngModelChange)="changeTime($event)"></nz-range-picker> (ngModelChange)="changeTime($event)"></nz-range-picker>
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #operatingelseTemplate>
<div *ngIf="!!detailData?.operatingStartTime && !!detailData?.operatingEndTime"> <div *ngIf="!!detailData?.operatingStartTime && !!detailData?.operatingEndTime">
{{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }} {{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }}
</div> </div>
@ -143,10 +140,11 @@
</ng-template> </ng-template>
</sv> </sv>
<sv label="公司所在地" col="3"> <sv label="公司所在地" col="3">
<ng-container *ngIf="!isEdit; else elseTemplate"> <ng-container *ngIf="isEdit; else cascaderelseTemplate">
<nz-cascader [nzLoadData]="loadData" (ngModelChange)="changeCascader($event)"></nz-cascader> <nz-cascader [(ngModel)]="values" [nzLoadData]="loadData" (ngModelChange)="changeCascader($event)">
</nz-cascader>
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #cascaderelseTemplate>
{{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
detailData?.fullRegionVO?.areaName }} detailData?.fullRegionVO?.areaName }}
</ng-template> </ng-template>
@ -159,44 +157,57 @@
<sv label="经营范围"> <sv label="经营范围">
{{ detailData?.businessScope }} {{ detailData?.businessScope }}
</sv> </sv>
</sv-container> <sv label="税务机关" col="2">
<sv-container col="2" class="mt16"> <input nz-input type="text" [(ngModel)]="detailData.taxAuthority" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<sv label="税务机关"> [placeholder]="isEdit?'':'-'">
{{ detailData?.taxAuthority }}
</sv> </sv>
<sv label="营业执照"> <sv label="营业执照" col="2">
<app-imagelist [imgList]="[detailData?.licensePhotoWatermark]"></app-imagelist> <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.licensePhotoWatermark,key:'licensePhotoWatermark',hover:'detailPhoto'}">
</ng-container>
</sv> </sv>
</sv-container> </sv-container>
<nz-divider></nz-divider> <nz-divider></nz-divider>
<sv-container col="3" class="mt16"> <sv-container col="3" class="mt16">
<sv-title>企业法人信息</sv-title> <sv-title>企业法人信息</sv-title>
<sv label="法定代表人"> <sv label="法定代表人">
{{ detailData?.legalPersonIdentityVO?.name }} <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="身份证号码"> <sv label="身份证号码">
{{ detailData?.legalPersonIdentityVO?.certificateNumber }} <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="身份证有效期"> <sv label="身份证有效期">
{{ detailData?.legalPersonIdentityVO?.validStartTime }} - {{ detailData?.legalPersonIdentityVO?.validStartTime }} -
{{ detailData?.legalPersonIdentityVO?.validEndTime || '长期' }} {{ detailData?.legalPersonIdentityVO?.validEndTime || '长期' }}
</sv> </sv>
<sv label="身份证照" col="1"> <sv label="身份证照" col="1">
<app-imagelist <div class="d-flex">
[imgList]="[detailData?.legalPersonIdentityVO?.certificatePhotoFrontWatermark,detailData?.legalPersonIdentityVO?.certificatePhotoBackWatermark]"> <ng-container
</app-imagelist> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.legalPersonIdentityVO?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark',hover:'legalFront'}">
</ng-container>
<ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.legalPersonIdentityVO?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark',hover:'legalBack'}">
</ng-container>
</div>
</sv> </sv>
</sv-container> </sv-container>
<nz-divider></nz-divider> <nz-divider></nz-divider>
<sv-container col="3" class="mt16"> <sv-container col="3" class="mt16">
<sv-title>企业开票信息</sv-title> <sv-title>企业开票信息</sv-title>
<sv label="开户银行"> <sv label="开户银行">
{{ detailData?.createBank }} <input nz-input type="text" [(ngModel)]="detailData.createBank" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="银行账户"> <sv label="银行账户">
<input nz-input type="text" [(ngModel)]="detailData.bankAccount" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
{{ detailData?.bankAccount }} {{ detailData?.bankAccount }}
</sv> </sv>
<sv label="注册电话"> <sv label="注册电话">
<input nz-input type="text" [(ngModel)]="detailData.registerPhone" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
{{ detailData?.registerPhone }} {{ detailData?.registerPhone }}
</sv> </sv>
<sv label="注册地址"> <sv label="注册地址">

13
src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
View File

@ -46,11 +46,12 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
uploadURl = apiConf.waterFileUpload; uploadURl = apiConf.waterFileUpload;
disabledUpload = false; disabledUpload = false;
values: string[] | null = null;
constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {} constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {}
ngOnInit() { ngOnInit() {
this.initData(); this.initData();
this.loadData({}, 0).then(res => console.log(res));
// this.launchSign(); // this.launchSign();
} }
@ -159,21 +160,19 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
return this.service.request(this.service.$api_get_region_by_code, { regionCode }); return this.service.request(this.service.$api_get_region_by_code, { regionCode });
} }
loadData(node: any, index: number): PromiseLike<void> { loadData = (node: any, index: number) => {
return new Promise(resolve => { return new Promise(resolve => {
this.getRegionDetailByCode(node?.regionCode || '').subscribe( this.getRegionDetailByCode(node?.regionCode || '').subscribe(
res => { res => {
console.log(1); node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 }));
}, },
_ => {}, _ => {},
() => { () => {
resolve(); resolve(node);
} }
); );
}); });
} };
reset() { reset() {
this.detailData = { ...this.tempalateData }; this.detailData = { ...this.tempalateData };

2
src/assets/mocks/menu-data.json
View File

@ -32,7 +32,7 @@
"link": "/demo/zorro", "link": "/demo/zorro",
"children": [ "children": [
{ {
"text": "货主列表", "text": "企业列表",
"icon": "anticon anticon-dashboard", "icon": "anticon anticon-dashboard",
"link": "/usercenter/freight/list" "link": "/usercenter/freight/list"
}, },