+
+
+
-
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less
index 14049ec8..ae775710 100644
--- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less
+++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less
@@ -1,10 +1,10 @@
:host {
::ng-deep {
- .mapBox {
- iframe, canvas {
- width: 400px !important;
- }
- }
+ // .mapBox {
+ // iframe, canvas {
+ // width: 400px !important;
+ // }
+ // }
}
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
index 4916bc04..5bb83e8a 100644
--- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-02 15:58:57
+ * @LastEditTime : 2022-03-02 16:02:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -37,24 +37,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
trajectory = 'car';
addressItems: any[] = []; //打点地址数据组
logColumns: STColumn[] = [
- { title: '款项', index: 'expenseCodeLabel' },
- { title: '小计（元）', render: 'price' },
- { title: '运输费（元）', render: 'price' },
- { title: '附加费（元）', render: 'surcharge' },
- { title: '支付时间', index: 'paymentTime' },
- {
- title: '支付状态',
- className: 'text-center',
- index: 'paymentStatus',
- type: 'badge',
- width: '120px',
- badge: {
- '1': { text: '待申请', color: 'warning' },
- '2': { text: '已支付', color: 'success' },
- '3': { text: '已拒绝', color: 'warning' },
- '4': { text: '申请中', color: 'warning' }
- }
- }
+ { title: '时间', index: 'vinOutTime' },
+ { title: '地点', index: 'cityName' },
];
constructor(
private modalRef: NzModalRef,
@@ -81,11 +65,11 @@ export class OneCarOrderViewtrackComponent implements OnInit {
});
});
this.MapList = list;
- this.addressItems = res.parkArray;
- if (this.addressItems && this.addressItems.length > 0) {
+ // this.addressItems = res.parkArray;
+ this.addressItems = res.cityArray;
+ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => {
- item.parkBte = this.getLocalTime(item.parkBte);
- item.parkEte = this.getLocalTime(item.parkEte);
+ item.vinOutTime = this.getLocalTime(item.vinOutTime);
});
}
}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index ece1f856..8d79823d 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -13,29 +13,40 @@
网络货运人：{{ i?.enterpriseInfoName }}
- <<<<<<< HEAD
-
-
-
- =======
-
-
-
-
- >>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
+
+
+
+
- 总费用：{{ i?.totalAmount | currency: '￥' }}
+ 总费用：{{ i?.totalAmount | currency: '￥' }}
@@ -52,13 +63,27 @@
@@ -87,8 +112,10 @@
-
装货卸货信息
- (
+ 装货卸货信息
+ (
)
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
index 63df1d8c..2deb983e 100644
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
@@ -148,12 +148,12 @@ export class NetworkFreightNewComponent implements OnInit {
});
}
submitForm() {
- // if (!this.sf1.valid || !this.sf.valid) {
- // this.sf.validator({ emitError: true });
- // this.sf1.validator({ emitError: true });
- // this.service.msgSrv.warning('请修改填写错误信息');
- // return;
- // }
+ if (!this.sf1.valid || !this.sf.valid) {
+ this.sf.validator({ emitError: true });
+ this.sf1.validator({ emitError: true });
+ this.service.msgSrv.warning('请修改填写错误信息');
+ return;
+ }
const enterpriseRegistrationTime = new Date(this.sf1.value.enterpriseRegistrationTime);
const operatingStartTime = new Date(this.sf1.value.operatingStartTime);
if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) {
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 49d99d29..87af10ed 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -205,17 +205,23 @@
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+