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-13 19:35:12 +08:00
parent 2afbde6281 6ca38f4623
commit 274af8abd9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -26,12 +26,12 @@
<nz-divider></nz-divider> <nz-divider></nz-divider>
<div> <div>
<div sv-container> <div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv> <sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv> <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv> <sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv> <sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.createUserNameLabel}} </sv> <sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
<sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv> <sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
</div> </div>
<nz-tabset style="margin-top: 15px;"> <nz-tabset style="margin-top: 15px;">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">

4
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -103,7 +103,7 @@ export class SupplyManagementBulkComponent implements OnInit {
}, },
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema,
}, },
releaseTime: { createTime: {
title: '发布时间', title: '发布时间',
type: 'string', type: 'string',
ui: { ui: {
@ -254,7 +254,7 @@ export class SupplyManagementBulkComponent implements OnInit {
title: '发布时间', title: '发布时间',
width: '170px', width: '170px',
className: 'text-left', className: 'text-left',
index: 'releaseTime', index: 'createTime',
}, },
{ {
title: '审核状态', title: '审核状态',