Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/order-management/components/risk-detail/risk-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-16 10:19:08 * @Date : 2021-12-16 10:19:08
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:25 * @LastEditTime : 2022-02-25 11:38:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -32,7 +32,9 @@
<sv label="卸货地">{{datailList?.dischargePlace}}</sv> <sv label="卸货地">{{datailList?.dischargePlace}}</sv>
<sv label="异常原因" col="1"> <sv label="异常原因" col="1">
<div class="bg-grey-lighter p-sm"> <div class="bg-grey-lighter p-sm">
{{datailList?.abnormalCause}} <div *ngFor="let items of datailList?.billComplianceVOS">
<div>{{items.complianceName}}</div>
</div>
</div> </div>
</sv> </sv>
</sv-container> </sv-container>

7
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -72,6 +72,11 @@
<p>装货时间：{{ item?.loadTime }}</p> <p>装货时间：{{ item?.loadTime }}</p>
<p>卸货时间：{{ item?.unloadTime }}</p> <p>卸货时间：{{ item?.unloadTime }}</p>
</ng-template> </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"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverPhoneNumber }} </div> <div> {{ item?.driverName }}/{{ item?.driverPhoneNumber }} </div>
</ng-template> </ng-template>

2
src/app/routes/order-management/components/risk/risk.component.ts
View File

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

10
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -32,7 +32,10 @@
/> />
</nz-input-group> </nz-input-group>
<span style="padding: 0 10px" <span *ngIf="idx !== 0" [ngClass]="idx == 0 ? 'hides' : ''" style="padding: 0 10px"
><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span>
<span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span> ></span>
</div> </div>
@ -93,7 +96,10 @@
placeholder="请输入卸货地" placeholder="请输入卸货地"
/> />
</nz-input-group> </nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span> <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
<span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span>
</div> </div>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

4
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
View File

@ -50,3 +50,7 @@ input[type='number']::-webkit-outer-spin-button {
margin: 0; margin: 0;
-webkit-appearance: none; -webkit-appearance: none;
} }
.hides {
margin-left: 10px;
color: aqua;
}