解决冲突

This commit is contained in:
wangshiming
2022-02-25 13:28:59 +08:00
parent 762cdc41e5
commit 891d346ad1
5 changed files with 23 additions and 6 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 19:49:23
* @LastEditTime : 2022-02-25 11:30:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -72,6 +72,11 @@
<p>装货时间:{{ item?.loadTime }}</p>
<p>卸货时间:{{ item?.unloadTime }}</p>
</ng-template>
<ng-template st-row="billComplianceVOS" let-item let-index="index">
<div *ngFor="let items of item?.billComplianceVOS">
<div>{{items.complianceName}}</div>
</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverPhoneNumber }} </div>
</ng-template>

View File

@ -246,7 +246,7 @@ export class OrderManagementRiskComponent implements OnInit {
title: '异常信息',
width: '200px',
className: 'text-left',
index: 'billComplianceVOS'
render: 'billComplianceVOS'
},
{ title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },