From d5e8e5eb60e4a2159df067c73595a42cdc2c43d4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:54:31 +0800 Subject: [PATCH] fix bug --- .../bulk-detail/bulk-detail.component.html | 7 +++--- .../bulk-detail/bulk-detail.component.ts | 23 +++++++++++++++---- .../vehicle-detail.component.html | 6 +++-- .../vehicle-detail.component.ts | 23 +++++++++++++++---- .../logistics-time-line.component.html | 14 +++++++++-- 5 files changed, 56 insertions(+), 17 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 5cd7cb57..acf6fcff 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-04-13 19:02:35 + * @LastEditTime : 2022-04-13 19:38:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -241,13 +241,14 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + 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 ce203d88..33757e8a 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:29:45 + * @LastEditTime : 2022-04-13 19:52:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -31,6 +31,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { billExpenses: any[] = []; //运费信息表格信息 pois: any[] = []; abnormalList: any[] = []; + operationList: any; i: any; imges: any; totalObj: any; @@ -72,8 +73,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } ]; get logParams() { - console.log(this.i?.billCode); - return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } } trajectory = 'car'; @@ -118,8 +117,21 @@ export class OrderManagementBulkeDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; - setTimeout(() => { - this.logSt.load(1); + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } }); } }); @@ -130,6 +142,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.abnormalList = res; } }); + this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { console.log('异常预警'); 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 8fb28115..ef545cc3 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 @@ -247,13 +247,15 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + + 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 4dd0ddd8..89713968 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-04-13 19:30:46 + * @LastEditTime : 2022-04-13 19:52:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { modalcontent: any; modalTitle: string = ''; trajectory = 'car'; + operationList: any; mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 @@ -107,13 +108,25 @@ export class OrderManagementVehicleDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } + }); this.billExpenses = this.i?.billExpenseDetails?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); - this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); - setTimeout(() => { - this.logSt.load(1); - }); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { diff --git a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html index 5ab3688a..8a63e8bf 100644 --- a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html +++ b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html @@ -1,5 +1,15 @@ + - - + + \ No newline at end of file