fix bug

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts

@@ -33,12 +33,33 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   totalObj: any;
   attObj: any;
   isVisible = false;
-  logColumns: STColumn[] = [
+  logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
     { title: '地点', index: 'cityName' },
   ];
+  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' }
+      }
+    }
+  ];
   trajectory = 'car';
-  addressItems: any[] = []; //打点地址数据组
+  mapList:any[] = [];  //地图点位数据组
+  addressItems:any[] = [];  //打点地址数据组
   constructor(
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
@@ -49,7 +70,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.initData();
-    this.MapInit();
+    this.getTrajectory();
   }
 
   initData() {
@@ -103,8 +124,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
         })
     });
   }
-  // 获取轨迹
-  MapInit() {
+
+  // 获取车辆轨迹
+  getTrajectory(){
     this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
       if (res) {
         const points = res.trackArray;
@@ -115,8 +137,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
             lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
           });
         });
-        this.MapList = list;
-        this.addressItems = res.parkArray;
+        this.mapList = list;
+        this.addressItems = res.cityArray;
         if(this.addressItems && this.addressItems.length > 0){
           this.addressItems.forEach(item => {
             item.vinOutTime = this.getLocalTime(item.vinOutTime);
@@ -126,6 +148,36 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     });
   }
 
+   // 获取司机轨迹
+   getDriverTrajectory(){
+    this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res.tracks;
+        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.enclosureDataAppTrack];
+        if(this.addressItems && this.addressItems.length > 0){
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.gtm);
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+   }
+   trajectoryChange(event:any){
+    if(event ==='car'){
+      this.getTrajectory()
+    }else if(event ==='driver'){
+      this.getDriverTrajectory();
+    }
+ }
   getLocalTime(time: any) {
     return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
   }