From 1155b23859b04eb843293831af4338a92a8c5a2e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 16:30:19 +0800 Subject: [PATCH 1/5] fix bug --- .../components/vehicle/vehicle.component.ts | 2 +- .../view-track/view-track.component.html | 16 +++++----- .../view-track/view-track.component.less | 10 +++---- .../view-track/view-track.component.ts | 30 +++++-------------- 4 files changed, 21 insertions(+), 37 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 1e14877d..69ef767a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -894,7 +894,7 @@ resourceStatus: any; const modalRef = this.modal.create({ nzTitle: '查看轨迹', nzContent: OneCarOrderViewtrackComponent, - nzWidth: 1200, + nzWidth: '800px', nzComponentParams: { i: item, }, diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 474bc951..22d42094 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -4,19 +4,19 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 16:47:04 + * @LastEditTime : 2022-03-02 16:10:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
+
-
-
- - +
+
+ +
-
- +
+
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); }); } } From 01a406dcef62044f8e1cebe431eb2ff4c6b49e81 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 16:30:31 +0800 Subject: [PATCH 2/5] fix bug --- .../bulk-detail/bulk-detail.component.html | 6 +- .../bulk-detail/bulk-detail.component.ts | 9 +-- .../vehicle-detail.component.html | 6 +- .../vehicle-detail.component.ts | 50 +++------------- .../view-track/view-track.component.html | 6 +- .../bulk-detail/bulk-detail.component.html | 26 +++++---- .../bulk-detail/bulk-detail.component.ts | 57 ++++++++++++------- .../vehicle-detail.component.html | 27 +++++---- .../vehicle-detail.component.ts | 56 +++++++++++------- .../services/waybill-management.service.ts | 7 +-- 10 files changed, 130 insertions(+), 120 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 356c332b..3fa12800 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -202,11 +202,11 @@
- - + +
- +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index f53df0ff..69355b52 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -125,17 +125,18 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { const points = res.trackArray; + let list :any[] = []; points?.forEach((item: any) => { - this.MapList.push({ + list.push({ name: item.hgt, lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] }); }); + this.MapList = list; this.addressItems = res.parkArray; - if (this.addressItems && this.addressItems.length > 0) { + 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/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index adfc52dc..bbd4b5ca 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 11:11:04 + * @LastEditTime : 2022-03-02 16:28:37 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -195,11 +195,11 @@
- +
- +
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 98dca02d..c8674b7b 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 11:11:05 + * @LastEditTime : 2022-03-02 16:19:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -37,24 +37,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; 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' }, ]; trajectory = 'car'; addressItems: any[] = []; //打点地址数据组 @@ -69,7 +53,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.initData(); - this.MapInit(); + this.MapInit() } initData() { @@ -124,39 +108,23 @@ export class OrderManagementVehicleDetailComponent implements OnInit { // elf['elementRef'].nativeElement.className = 'target-fix' } } - // MapInit() { - // this.service.request('/api/sdc/billShipper/getTrajectoryByBillId', { id: this.id }).subscribe(res => { - // if (res?.trackArray) { - // const points = res?.trackArray; - // const list: any[] = []; - // points.forEach((item: any) => { - // list.push({ - // name: item?.hgt, - // lnglat: [Number((Number(item?.lon) / 600000).toFixed(6)), Number((Number(item?.lat) / 600000).toFixed(6))] - // }); - // }); - // console.log(list); - // this.MapList = list; - // } - // }); - // } - // 获取轨迹 MapInit() { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { const points = res.trackArray; + let list :any[] = []; points?.forEach((item: any) => { - this.MapList.push({ + list.push({ name: item.hgt, lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] }); }); + this.MapList = list; this.addressItems = res.parkArray; - if (this.addressItems && this.addressItems.length > 0) { + 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/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 22d42094..36828461 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 16:10:44 + * @LastEditTime : 2022-03-02 16:18:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,11 +12,11 @@
- +
- +
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 @@
- -
-
- -
-
- -
-
+ +
+
+ + +
+
+ +
+
+ + + + + +
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index cc564ea8..572813c8 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime : 2022-02-21 19:52:43 + * @LastEditTime : 2022-03-02 16:24:32 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts @@ -13,6 +13,7 @@ import { _HttpClient } from '@delon/theme'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; +import format from 'date-fns/format'; import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component'; import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component'; import { WaybillManagementServe } from '../../services/waybill-management.service'; @@ -28,27 +29,15 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { totalObj: any; attObj: any; isVisible = false; - logColumns: STColumn[] = [ - { title: '款项', index: 'costName' }, - { title: '运输费（元）', index: 'price',render: 'price' }, - { 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' }, - }, - }, - ]; + MapList: any[]=[]; imges: any; unLoadingPlaceVOList: any = []; - + logColumns: STColumn[] = [ + { title: '时间', index: 'vinOutTime' }, + { title: '地点', index: 'cityName' }, + ]; + trajectory = 'car'; + addressItems: any[] = []; //打点地址数据组 constructor( private route: ActivatedRoute, private msgSrv: NzMessageService, @@ -61,7 +50,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { ngOnInit(): void { this.initData() - + this.MapInit() } initData() { const params = { @@ -148,4 +137,30 @@ sureArrive(item: any) { this.initData() }); } + // 获取轨迹 + MapInit() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { + if (res) { + const points = res.trackArray; + let list :any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.MapList = list; + this.addressItems = res.parkArray; + if(this.addressItems && this.addressItems.length > 0){ + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.vinOutTime); + }); + } + } + }); + } + + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } } diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 3c51efaa..b18e685b 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -189,20 +189,25 @@ -
- -
-
- -
-
- -
-
+ +
+
+ + +
+
+ +
+
+ + + + + +
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index a8ea44e8..421e6348 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime : 2022-02-21 19:46:47 + * @LastEditTime : 2022-03-02 16:26:15 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts @@ -10,6 +10,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; +import format from 'date-fns/format'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -24,30 +25,19 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic export class WaybillManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; + MapList: any[]=[]; i: any; totalObj: any; attObj: any; isVisible = false; - logColumns: STColumn[] = [ - { title: '款项', index: 'costName' }, - { title: '运输费（元）', index: 'price', render: 'price' }, - { title: '支付时间', render: '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' }, - }, - }, - ]; imges: any; unLoadingPlaceVOList: any = []; + logColumns: STColumn[] = [ + { title: '时间', index: 'vinOutTime' }, + { title: '地点', index: 'cityName' }, + ]; + trajectory = 'car'; + addressItems: any[] = []; //打点地址数据组 constructor( private route: ActivatedRoute, @@ -60,7 +50,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.initData() - + this.MapInit() } initData() { const params = { @@ -140,4 +130,30 @@ goDistance(elf: NzCardComponent) { }); } + // 获取轨迹 + MapInit() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { + if (res) { + const points = res.trackArray; + let list :any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.MapList = list; + this.addressItems = res.parkArray; + if(this.addressItems && this.addressItems.length > 0){ + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.vinOutTime); + }); + } + } + }); + } + + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } } diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts index 84cb458e..94649b1b 100644 --- a/src/app/routes/waybill-management/services/waybill-management.service.ts +++ b/src/app/routes/waybill-management/services/waybill-management.service.ts @@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon /* * @Author: your name * @Date: 2021-12-07 14:52:29 - * @LastEditTime : 2022-03-02 14:30:55 + * @LastEditTime : 2022-03-02 16:22:23 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts @@ -15,8 +15,6 @@ import { BaseService } from 'src/app/shared/services'; }) export class WaybillManagementServe extends BaseService { $api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表 - $api_get_catalogue_member = `/user?_allow_anonymous=true`; - $api_del_driver = ``; // 据 手机号/姓名 查询 车队长/司机 $api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`; // 查询整车运单-运营后台 @@ -56,7 +54,8 @@ export class WaybillManagementServe extends BaseService { $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage'; // 查询运营端已回复异常上报 $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage'; - + // 获取轨迹 + $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`; // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; constructor(public injector: Injector) { From 35c459895e2266aeb35d35a1270ae23fb2a7ec8e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 16:34:35 +0800 Subject: [PATCH 3/5] fix bug --- .../vehicle-detail/vehicle-detail.component.html | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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..d207afac 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,7 +13,7 @@
网络货运人：{{ i?.enterpriseInfoName }}
- <<<<<<< HEAD @@ -21,16 +21,6 @@ [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源 - ======= - - - - - >>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
From 6bcc71ab8ebcce4c8703ab2ec9a47d1ecfd0960e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 16:34:41 +0800 Subject: [PATCH 4/5] fix bug --- .../vehicle-detail.component.html | 73 ++++++++++++++----- 1 file changed, 55 insertions(+), 18 deletions(-) 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 d207afac..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,19 +13,40 @@
网络货运人：{{ i?.enterpriseInfoName }}
- - - - + + + +
- 总费用：{{ i?.totalAmount | currency: '￥' }} + 总费用：{{ i?.totalAmount | currency: '￥' }}
@@ -42,13 +63,27 @@
- - - + + +
@@ -77,8 +112,10 @@
-

装货卸货信息 - ( +

装货卸货信息 + ( ) From 3b016972b095b65892d515f8e53bd7682ba93dd1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 16:39:24 +0800 Subject: [PATCH 5/5] fix bug --- .../components/network-freight/new/new.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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()) {