From 9bc65559a10a47bbf29b9dea042c0acac5c5929b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 13:53:09 +0800 Subject: [PATCH 1/6] fix bug --- .../bulk-detail-change/bulk-detail-change.component.html | 7 ++++--- .../bulk-detail-change/bulk-detail-change.component.ts | 6 +++--- .../components/bulk-detail/bulk-detail.component.ts | 2 -- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 0e98b137..f2a6e57e 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:33:51 + * @LastEditTime : 2022-03-04 13:53:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -262,8 +262,9 @@ -

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

- +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

+ + 到付 {{ item.price | currency }} diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 8569a071..ffe86843 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:26:50 + * @LastEditTime : 2022-03-04 13:53:04 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -66,6 +66,7 @@ loadTime: any; // 货源单设置回显 @ViewChild('sf4', { static: false }) sf4!: SFComponent; schema4: SFSchema = {}; isVisible = false; + billExpenses: any[] = []; //运费信息表格信息 ui4!: SFUISchema; formData: any; @ViewChild('sf', { static: false }) sf!: SFComponent; @@ -319,8 +320,7 @@ loadTime: any; // 货源单设置回显 this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { if (res) { this.i = res; - this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; - this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; + this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); // 对装货凭证进行初始化 let arr : any= [] res?.receiptFilePath.forEach((element: any, index: any) => { 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 69355b52..56d51e8b 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 @@ -71,9 +71,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; - console.log(this.i.billExpenseDetails ) this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); - console.log(this.billExpenses ) this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); } }); From 7463eb642530566f666ca0c3c29b33f49961b762 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:07:58 +0800 Subject: [PATCH 2/6] fix bug --- .../bulk-detail-change/bulk-detail-change.component.html | 8 +++++--- .../components/bulk-detail/bulk-detail.component.html | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index f2a6e57e..d21d0098 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:53:06 + * @LastEditTime : 2022-03-04 14:06:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -42,7 +42,7 @@ - + @@ -261,7 +261,8 @@ - + +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -279,6 +280,7 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+ 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 c6d790fb..7dd7c9c7 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:40:09 + * @LastEditTime : 2022-03-04 14:07:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -135,6 +135,7 @@ +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -152,6 +153,7 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+ From 3387c37e6a865b6ae698f91777c90d070cbaec70 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:15:33 +0800 Subject: [PATCH 3/6] fix bug --- .../bulk-detail-change.component.html | 28 ++++++---- .../bulk-detail-change.component.ts | 51 ++++++++++++------- .../bulk-detail/bulk-detail.component.ts | 19 +------ 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index d21d0098..de563b7b 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 14:06:28 + * @LastEditTime : 2022-03-04 14:15:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -345,17 +345,23 @@
- -
-
- -
-
- -
-
+ +
+
+ + +
+
+ +
+
+ + + + + +
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index ffe86843..8de03795 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 13:53:04 + * @LastEditTime : 2022-03-04 14:15:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -22,6 +22,7 @@ import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, Observer } from 'rxjs'; import { apiConf } from '@conf/api.conf'; import { OrderManagementService } from '../../services/order-management.service'; +import format from 'date-fns/format'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { map } from 'rxjs/operators'; function getBase64(file: File): Promise { @@ -40,7 +41,9 @@ function getBase64(file: File): Promise { export class OrderManagementBulkDetailChangeComponent implements OnInit { validateForm1: FormGroup; id = this.route.snapshot.params.id; + trajectory = 'car'; @ViewChild('distannce3', { static: false }) + MapList: any[]=[]; i: any= {unLoadingPlaceList:[]}; totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 @@ -67,29 +70,15 @@ loadTime: any; // 货源单设置回显 schema4: SFSchema = {}; isVisible = false; billExpenses: any[] = []; //运费信息表格信息 + addressItems: any[] = []; //打点地址数据组 ui4!: SFUISchema; formData: any; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; logColumns: STColumn[] = [ - { title: '款项', index: 'expenseName' }, - { 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 route: ActivatedRoute, @@ -889,4 +878,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/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 56d51e8b..ff871426 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 @@ -34,23 +34,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { attObj: any; isVisible = false; logColumns: STColumn[] = [ - { title: '款项', index: 'costName', render: 'PriceType' }, - { 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[] = []; //打点地址数据组 From 021ce61aca1db6af2a67337b39e757cbcce6d8a5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:24:40 +0800 Subject: [PATCH 4/6] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- .../usercenter/components/driver/detail/detail.component.ts | 2 +- .../components/freight/list/detail/detail.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 4652ed26..5e54ff7d 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -690,7 +690,7 @@ export class OrderManagementBulkComponent implements OnInit { }; const params2 = { businessCode: item.billCode, - passiveUserId: item.shipperAppUserId + evaluateUserId: item.shipperAppUserId }; this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res); 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 69ef767a..7e4d5bbf 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -664,7 +664,7 @@ resourceStatus: any; } const params2 = { businessCode: item.billCode, - passiveUserId: item.shipperAppUserId, + evaluateUserId: item.shipperAppUserId, } this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { console.log(res) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index bb13924b..5f3ef903 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -126,7 +126,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res) { this.billEvaluateList = res; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index 685c46ab..50d6da03 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -109,7 +109,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res?.length > 0) { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { From c32f0ea95be578e0c0a7dad43184a5169464a259 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:25:43 +0800 Subject: [PATCH 5/6] fix bug --- .../usercenter/components/driver/detail/detail.component.ts | 2 +- .../components/freight/list/detail/detail.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index 5f3ef903..bb13924b 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -126,7 +126,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res) { this.billEvaluateList = res; diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index 50d6da03..685c46ab 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -109,7 +109,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { // 获取评价信息 this.service - .request(this.service.$api_get_driver_billEvaluate, { evaluateUserId: this.route.snapshot.params.id }, 'POST', false) + .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) .subscribe(res => { if (res?.length > 0) { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { From 05b878ddcd04160fe31ccd83dcf529e8f711592a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 14:35:32 +0800 Subject: [PATCH 6/6] fix bug --- .../update-price/update-price.component.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/routes/supply-management/components/update-price/update-price.component.html b/src/app/routes/supply-management/components/update-price/update-price.component.html index 43523177..34fbb438 100644 --- a/src/app/routes/supply-management/components/update-price/update-price.component.html +++ b/src/app/routes/supply-management/components/update-price/update-price.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-02-16 15:02:33 + * @LastEditTime : 2022-03-04 14:34:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,12 +25,22 @@

变更日志

- + + + + + {{item?.operator}}/{{item.telephone}} + +
{{ freightType[i?.freightType] }}