车辆对接

This commit is contained in:
wangshiming
2022-01-12 17:50:16 +08:00
parent 77b04db858
commit 3a0b624f03
4 changed files with 25 additions and 22 deletions

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-05 16:36:39 * @LastEditTime: 2022-01-12 17:46:09
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -174,19 +174,17 @@
<nz-card nzTitle="补充信息"> <nz-card nzTitle="补充信息">
<sv-container> <sv-container>
<sv label="是否回单"> <sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}} {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
</sv> </sv>
<sv label="回单类型"> <sv label="回单类型">
{{i?.goodsResource?.receiptTypeLabel}} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
</sv>
<sv label="联系人">
{{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
</sv> </sv>
<sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
<sv label="所在地区"> <sv label="所在地区">
{{i?.goodsResource?.receiptAddress}} {{ i?.supplementaryInformationVO?.area }}
</sv> </sv>
<sv label="详细地址"> <sv label="详细地址">
{{i?.goodsResource?.receiptAddress}} {{ i?.supplementaryInformationVO?.address }}
</sv> </sv>
</sv-container> </sv-container>

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-12 17:33:24 * @LastEditTime: 2022-01-12 17:45:57
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -165,17 +165,17 @@
<nz-card nzTitle="补充信息"> <nz-card nzTitle="补充信息">
<sv-container> <sv-container>
<sv label="是否回单"> <sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}} {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
</sv> </sv>
<sv label="回单类型"> <sv label="回单类型">
{{ i?.goodsResource?.receiptType === '1' ? '电子回单' : '纸质回单' }} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
</sv> </sv>
<sv label="联系人"> {{ i?.goodsResource?.receiptUserName }} / {{ i?.goodsResource?.phon }} </sv> <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
<sv label="所在地区"> <sv label="所在地区">
{{ i?.goodsResource?.area }} {{ i?.supplementaryInformationVO?.area }}
</sv> </sv>
<sv label="详细地址"> <sv label="详细地址">
{{ i?.goodsResource?.address }} {{ i?.supplementaryInformationVO?.address }}
</sv> </sv>
</sv-container> </sv-container>

View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-12 13:30:48 * @LastEditTime: 2022-01-12 17:47:17
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -73,14 +73,14 @@
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span> <span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div> </div>
</ng-template> </ng-template>
<!-- 运费明细 --> <!-- 我的出价 -->
<!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index"> <ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
<div *ngFor="let i of item?.mybidDetailInfo"> <div *ngIf="item.mybidInfo?.length > 0">
<div></div> <p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}:¥{{ data?.price | number:'0.2-2' }} </p>
</div> </div>
</ng-template> --> </ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index"> <ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0"> <div *ngIf="item.mybidDetailInfo?.length > 0">
<p *ngFor="let data of item.mybidDetailInfo"> <p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}{{ data.price }} {{ data.expenseName }}{{ data.price }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span> <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>

View File

@ -342,6 +342,11 @@ resourceStatus: any;
className: 'text-center', className: 'text-center',
render: 'billCode' render: 'billCode'
}, },
{
title: '我的出价',
width: '150px',
render: 'mybidInfo'
},
{ {
title: '运费明细', title: '运费明细',
width: '200px', width: '200px',