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:
Taric Xin
2022-01-12 13:14:18 +08:00
parent 673b27a935 eaef5be8ff
commit e6724d3557
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -29,8 +29,8 @@
<div sv-container *ngIf="i"> <div sv-container *ngIf="i">
<sv label="项目">{{i?.enterpriseProjectId}}</sv> <sv label="项目">{{i?.enterpriseProjectId}}</sv>
<sv label="截止时间">{{i?.deadlineTime}}</sv> <sv label="截止时间">{{i?.deadlineTime}}</sv>
<sv label="录单员">{{i?.createUserId}}</sv> <sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
<sv label="调度员">{{i?.dispatchName}} 18100000000 </sv> <sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv> <sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
</div> </div>
</ng-template> </ng-template>
@ -122,7 +122,7 @@
<div nz-row> <div nz-row>
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24"> <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
<div> <div>
<p class="text-warning-light mb-xs text-right">到货后15天内支付运费</p> <p class="text-warning-light mb-xs text-right">到货后{{i?.paymentDays}}天内支付运费</p>
<p class="mb-xs text-right"> <p class="mb-xs text-right">
{{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p> {{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p>
</div> </div>

4
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -29,8 +29,8 @@
<div sv-container *ngIf="i"> <div sv-container *ngIf="i">
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv> <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
<sv label="项目">{{i?.enterpriseProjectId}}</sv> <sv label="项目">{{i?.enterpriseProjectId}}</sv>
<sv label="录单员">{{i?.createUserId}}</sv> <sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
<sv label="调度员">{{i?.dispatchName}} 18100000000 </sv> <sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv> <sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
</div> </div>
</ng-template> </ng-template>