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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-07 10:12:14 +08:00
parent 2ed180822c
commit 35e80620b2
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 10:07:36
* @LastEditTime : 2022-04-07 10:11:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -72,8 +72,9 @@
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }} </div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
<ng-template st-row="longitude" let-item let-index="index">
<div> {{ item?.longitude }}
{{ item?.latitude ? "," + item?.latitude : '' }} </div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<!-- <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>

10
src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
View File

@ -41,12 +41,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
columnsFloat: STColumn[] = [];
columnsFloatView: STColumn[] = [];
ViewCause: any; // 变更运费查看数据
tabs = {
totalCount: 0,
qualifiedtity: 0,
spotQuantity: 0,
unstayQuantity: 0
};
constructor(
public service: OrderManagementService,
private modal: NzModalService,
@ -105,7 +99,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
ui: {
}
},
wayBillCode: {
wayCode: {
type: 'string',
title: '运单号',
ui: {
@ -250,7 +244,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
title: '位置描述',
className: 'text-left',
width: '250px',
render: 'goodsName'
render: 'longitude'
},
{
title: '提醒内容',