Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

2022-04-08 15:13:36 +08:00
parent 8bb5eb8ebd b6c67e5353
commit c9f30c473f
51 changed files with 1310 additions and 878 deletions
--- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
+++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
@ -37,7 +37,9 @@ export class DatatableBusiindexComponent implements OnInit {
    { title: '客户预存款', index: 'czcgje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.czcgje }) } },
    { title: '业绩量', index: 'yisje', className: 'text-center' },
    { title: '已收附加费', index: 'yisfjf', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } },
-    { title: '平均附加费率', index: 'fjfl', className: 'text-center' },
+    { title: '平均附加费率', index: 'fjfl', className: 'text-center',format: (item)=> {
+      return item.fjfl + '%'
+    } },
    { title: '已开票金额', index: 'ykpje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } },
  ];
  /**
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.html
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.html
@ -0,0 +1,2 @@
+<g2-custom delay="100" (render)="render($event)"></g2-custom>
+
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.less
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.less
--- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts
@ -0,0 +1,132 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-07 17:57:23
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-07 19:28:24
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { G2MiniAreaClickItem } from '@delon/chart/mini-area';
+import { DataService } from '../../../services/data.service';
+// import DataSet from '@antv/data-set';
+const DataSet = require('@antv/data-set');
+import { Chart } from '@antv/g2';
+@Component({
+  selector: 'app-financetable-curve-min',
+  templateUrl: './curve.component.html',
+  styleUrls: ['./curve.component.less']
+})
+export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
+  el: any;
+  @Input() chartData: any;
+  chart: any;
+  data = [
+    { time: '01', type: '订单数', temperature: 7 },
+    { time: '02', type: '运单数', temperature: 3.9 },
+    { time: '03', type: '订单数', temperature: 6.9 },
+    { time: '04', type: '订单数', temperature: 4.2 },
+    { time: '05', type: '订单数', temperature: 9.5 },
+    { time: '06', type: '订单数', temperature: 5.7 },
+    { time: '06', type: '运单数', temperature: 5.7 },
+    { time: '07', type: '运单数', temperature: 14.5 },
+    { time: '08', type: '订单数', temperature: 8.5 },
+    { time: '09', type: '订单数', temperature: 18.4 },
+    { time: '10', type: '订单数', temperature: 11.9 },
+    { time: '11', type: '订单数', temperature: 21.5 },
+    { time: '12', type: '订单数', temperature: 15.2 },
+    { time: '08', type: '运单数', temperature: 8.5 },
+    { time: '09', type: '运单数', temperature: 18.4 },
+    { time: '10', type: '运单数', temperature: 11.9 },
+    { time: '11', type: '运单数', temperature: 21.5 },
+    { time: '12', type: '订单数', temperature: 15.2 },
+  ];
+  constructor(private service: DataService, private ngZone: NgZone) {
+
+  }
+  ngOnChanges(changes: SimpleChanges): void {
+    if (this.chartData) {
+      // setTimeout(()=>{
+      //   this.chart.render(true)
+      // }, 1000)
+
+    }
+  }
+
+  ngOnInit(): void {
+
+  }
+  reRender() {
+    setTimeout(() => {
+      this.chart.data(this.chartData);
+      this.chart.render();
+    }, 1000)
+  }
+  render(el: ElementRef<HTMLDivElement>): void {
+    this.el = el.nativeElement
+    setTimeout(() => {
+      this.ngZone.runOutsideAngular(() => this.init(this.el));
+      }, 1000)
+  }
+
+  private init(el: HTMLElement): void {
+    this.chart = new Chart({
+      container: el,
+      autoFit: true,
+      height: 200,
+    });
+    let value: any = []
+      this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
+     if(res) {
+      res.forEach((element: any) => {
+        value.push({
+          time: element?.time,
+          type: element?.type == 'DD' ? '订单数' : '运单数',
+          temperature: element?.value,
+       });
+       });
+       console.log(value);
+       this.chartData = value
+    this.chart.data(this.chartData);
+    this.chart.scale({
+      time: {
+        range: [0, 1],
+      },
+      number: {
+        nice: true,
+      },
+    });
+    
+    this.chart.tooltip({
+      showCrosshairs: true,
+      shared: true,
+    });
+    
+  
+    this.chart.axis('temperature', {
+      label: {
+        formatter: (val: any) => {
+          return val + '万';
+        },
+      },
+    });
+    this.chart
+    .line()
+    .position('time*temperature')
+    .color('type')
+    .shape('smooth');
+  
+    this.chart
+    .point()
+    .position('time*temperature')
+    .color('type')
+    .shape('circle');
+  this.chart.render();
+        };
+      });
+  
+    
+  }
+}
--- a/src/app/routes/datatable/components/datascreen/curve/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/curve/map.component.html
@ -1 +0,0 @@
-<g2-custom delay="100" (render)="render($event)"></g2-custom>
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.html
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html
@ -4,46 +4,71 @@
 * @Author       : Shiming
 * @Date         : 2022-04-06 10:57:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 01:26:56
+ * @LastEditTime : 2022-04-07 19:51:32
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 页头 -->
 <!-- <page-header-wrapper [title]="'运营报表'"></page-header-wrapper> -->
+<div >
+  <div style="position: relative;">
+    <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0; font-size: 25px;font-weight: 700;">运多星网络货运平台</h1>
+    <div style="position: absolute; right: 0; display: flex;">
+  <img src="../../../../../assets/images/oclock.svg" alt="">&nbsp;
+   <span style="font-size: 16px; margin-top: 5px;">{{todayTime}}</span>
+    </div>
+  </div>
+ 
+  <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0;font-size: 25px;font-weight: 700;">实时交易监控</h1>
+
+</div>
 <div nz-row [nzGutter]="24">
  <div nz-col class="gutter-row" [nzSpan]="8">
-    <nz-card nzTitle="">
+    <nz-card nzTitle="2022全年交易情况">
      <nz-row [nzGutter]="16">
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'成交额'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.dealAmount | currency)!" [nzTitle]="'成交额'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'结算额'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.settlementAmount | currency)!" [nzTitle]="'结算额'"></nz-statistic>
        </nz-col>
      </nz-row>
      <nz-row [nzGutter]="16">
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.billQuantity | number)!" [nzTitle]="'订单数'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
+          <nz-statistic [nzValue]="(allDeal?.weight | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
        </nz-col>
      </nz-row>
    </nz-card>
-    <nz-card nzTitle="本月交易趋势">
-      <g2-timeline
-      [data]="chartData"
-      [titleMap]="{ y1: '客流量', y2: '支付笔数' }"
-      [height]="200"
-      mask="MM月DD日"
-      [slider]="false"
-    ></g2-timeline>
+    <nz-card nzTitle="本月交易趋势" >
+      <app-financetable-curve-min  #curve [chartData]='chartData2'></app-financetable-curve-min>
    </nz-card>
    <nz-card nzTitle="实时货源">
-      <st #st multiSort bordered [columns]="columns" [ps]="5" [data]="service.$api_listShipperReportPage"
+      <st
+        [scroll]="{ y: '300px' }"
+        #st
+        multiSort
+        bordered
+        [columns]="columns"
+        [data]="service.$api_getRealTimeSupply"
        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" [loading]="service.http.loading">
+        [res]="{ reName: { list: 'data' } }"
+        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
+        [loading]="service.http.loading"
+      >
+        <ng-template st-row="index" let-item let-index="index">
+          {{ index }}
+        </ng-template>
+        <ng-template st-row="weight" let-item let-index="index">
+          {{ item.weight ? item.weight + '吨' : '' }}
+          {{ item.volume ? item.volume + '方' : '' }}
+        </ng-template>
+        <ng-template st-row="weight" let-item let-index="index">
+          {{ item.weight ? item.weight + '吨' : '' }}
+          {{ item.volume ? item.volume + '方' : '' }}
+        </ng-template>
      </st>
    </nz-card>
  </div>
@ -51,20 +76,20 @@
    <nz-card>
      <nz-row [nzGutter]="24">
        <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'今日交易额'"></nz-statistic> 
+          <nz-statistic [nzValue]="(headDeal?.todayAmount | currency)!" [nzTitle]="'今日交易额'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'本月交易额'"></nz-statistic>
+          <nz-statistic [nzValue]="(headDeal?.monthAmount | currency)!" [nzTitle]="'本月交易额'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="8">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'累计交易额'"></nz-statistic>
+          <nz-statistic [nzValue]="(headDeal?.cumulativeAmount | currency)!" [nzTitle]="'累计交易额'"></nz-statistic>
        </nz-col>
      </nz-row>
    </nz-card>
-    <app-datatable-customindex-map style="max-height: 600px;" #map [chartData]="chartData"></app-datatable-customindex-map>
+    <app-datatable-customindex-map style="max-height: 600px" #map [chartData]="chartData"></app-datatable-customindex-map>
    <nz-card>
      <nz-row [nzGutter]="24">
-        <g2-bar height="200" [title]="'销售额趋势'" [data]="salesData" (clickItem)="handleClick($event)"></g2-bar>
+        <g2-bar #bar height="200" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
      </nz-row>
    </nz-card>
  </div>
@ -72,59 +97,78 @@
    <nz-card>
      <nz-row [nzGutter]="24">
        <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'货主'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.enterpriseTotal | number)!" [nzTitle]="'货主'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'合伙人'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.partnerTotal | number: '1.0-2')!" [nzTitle]="'合伙人'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'司机'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.driverTotal | number)!" [nzTitle]="'司机'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="6">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'车辆'"></nz-statistic>
+          <nz-statistic [nzValue]="(classifyDeal?.carTotal | number: '1.0-2')!" [nzTitle]="'车辆'"></nz-statistic>
        </nz-col>
      </nz-row>
    </nz-card>
    <nz-card nzTitle="今日交易情况">
      <nz-row [nzGutter]="16">
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.billQuantity | number)!" [nzTitle]="'订单数'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'有效订单'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.billEffectiveQuantity | number: '1.0-2')!" [nzTitle]="'有效订单'"></nz-statistic>
        </nz-col>
      </nz-row>
      <nz-row [nzGutter]="16">
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'运输金额(元)'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.amount | currency)!" [nzTitle]="'运输金额(元)'"></nz-statistic>
        </nz-col>
        <nz-col [nzSpan]="12">
-          <nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
+          <nz-statistic [nzValue]="(todaysDeal?.weight | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
        </nz-col>
      </nz-row>
    </nz-card>
    <nz-card nzTitle="本月运营质量监测">
-       <nz-row [nzGutter]="24">
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+      <nz-row [nzGutter]="24">
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="28" subTitle="准点率" total="28%" height="100"></g2-pie>
+          </div>
        </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="货损率" total="22%" height="100"></g2-pie>
+          </div>
        </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="空车率" total="22%" height="100"></g2-pie>
+          </div>
        </nz-col>
-        <nz-col [nzSpan]="6">
-          <g2-pie percent="28" subTitle="中式快餐" total="28%" height="130"></g2-pie>
+        <nz-col [nzSpan]="12">
+          <div style="width: 200px; display: inline-block">
+            <g2-pie percent="22" subTitle="结算率" total="22%" height="100" width="200"></g2-pie>
+          </div>
        </nz-col>
      </nz-row>
    </nz-card>
    <nz-card nzTitle="实时运单风控">
-      <st #st multiSort bordered [columns]="orderColumns" [ps]="5" [data]="service.$api_listShipperReportPage"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" [loading]="service.http.loading">
-    </st>
+      <st
+        #st
+        multiSort
+        bordered
+       [scroll]="{y: '300px'}"
+        [columns]="orderColumns"
+        [data]="service.$api_getRealTimeWaybillRiskControl"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
+        [res]="{ reName: { list: 'data' } }"
+        [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
+        [loading]="service.http.loading"
+      >
+      <ng-template st-row="carNo" let-item let-index="index">
+        {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }}
+      </ng-template>
+      </st>
    </nz-card>
  </div>
-</div>
+</div>
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.less
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.less
@ -4,5 +4,8 @@
            color: #399ffd;
            font-weight: bold;
        }
+        .nz-statistic-number,.ant-statistic-content-value {
+            font-size: 20px;
+        }
    }
 }
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
@ -1,11 +1,11 @@
 import { map } from 'rxjs/operators';
 /*
- * @Description  : 
+ * @Description  :
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2022-04-06 10:57:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:30:20
+ * @LastEditTime : 2022-04-07 19:48:19
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -14,10 +14,10 @@ import { STColumn, STComponent } from '@delon/abc/st';
 import { SFSchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { DataService } from '../../services/data.service';
-import { DatatableCustomindexMapComponent } from './curve/map.component';
-import { G2TimelineData } from '@delon/chart/timeline';
+import { DatatableCustomindexMapComponent } from './map/map.component';
+import { G2TimelineComponent, G2TimelineData } from '@delon/chart/timeline';
 import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area';
-import { format } from 'date-fns';
+import { FinanceTableCurveComponent } from '../financetable/curve/curve.component';


@Component({
@ -29,90 +29,121 @@ export class DatatableDatascreenComponent implements OnInit {
  @ViewChild('st') private readonly st!: STComponent;
  @ViewChild('orderSt') private readonly orderSt!: STComponent;
  @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent;
-  columns: STColumn[] = [];
-  chartData: G2TimelineData[] = [];
-  orderColumns: STColumn[] = [];
-  salesData = this.genData();
-  constructor(public service: DataService) {
-   
-   }
+  @ViewChild('timeline', { static: false }) timeline!: G2TimelineComponent;
+  @ViewChild('curve') private readonly curve!: FinanceTableCurveComponent;

+  columns: STColumn[] = [];
+  chartData: any[] = [];
+  orderColumns: STColumn[] = [];
+  chartData2: any = {}
+  allDeal: any;
+  headDeal: any;
+  classifyDeal: any;
+  todaysDeal: any;
+  todayTime: string = '';
+
+  monthData: G2TimelineData[] = [];
+  monthData2:G2TimelineData[] =[];
+  salesData2: Array<any> = this.genData();
+  constructor(public service: DataService) {}
+  ngOnChanges(changes: any): void {
+    console.log(changes);
+  }
  /**
   * 查询参数
   */
  get reqOrderParams() {
-    const params = {
-
-    }
+    const params = {};
    return { ...params };
  }
  get reqParams() {
-    const params = {
-    }
- 
-
+    const params = {};
    return { ...params };
  }
  ngOnInit(): void {
-    this.initST()
-    this.initOrderST()
-    this.initData()
-    this.initLineData()
+    setInterval(() => {
+      this.setTime();
+    }, 1000);
+    this.initST();
+    this.initOrderST();
+    this.initData();
+    // this.initLineData();
  }
-  initData(){
+  setTime() {
+    var myDate = new Date();
+    var mytime = myDate.toLocaleTimeString(); //获取当前时间
+    myDate.getFullYear(); //获取完整的年份(4位,1970-????)
+    myDate.getMonth(); //获取当前月份(0-11,0代表1月)
+    myDate.getDate(); //获取当前日(1-31)
+    this.todayTime = myDate.getFullYear() + '-' + myDate.getMonth() + 1 + '-' + myDate.getDate() + ' ' + mytime;
+  }
+  initData() {
    this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => {
+      this.allDeal = res;
+    });
+    this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => {
+      this.headDeal = res;
+    });
+    this.service.request(this.service.$api_getCustomerStatistics).subscribe((res: any) => {
+      this.classifyDeal = res;
+    });
+    this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => {
+      this.todaysDeal = res;
+    });
+    let value: any = [];
+    this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => {
+      if (res) {
+        res.forEach((element: any) => {
+          value.push({
+            name: element.province,
+            value: element.weight
+          });
+        });
+        console.log(value);
+        this.chartData = value;
+        this.map.reRender();
+      }
+    });
+  }
+  public genData(): G2MiniAreaData[] {
+    let value: any = [];
+    this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
      console.log(res);
-      
-    })
-  }
-  initLineData(){
-    for (let i = 0; i < 20; i += 1) {
-      this.chartData.push({
-        time: new Date().getTime() + 1000 * 60 * 60 * 24 * i,
-        y1: Math.floor(Math.random() * 100) + 1000,
-        y2: Math.floor(Math.random() * 100) + 10,
+      res.forEach((element: any) => {
+        value.push({
+          x: element.city,
+          y: element.weight
+        });
      });
-    }
+    });
+    console.log(value);
+    return value;
  }
-  private genData(): G2MiniAreaData[] {
-    const beginDay = new Date().getTime();
-    const res: G2MiniAreaData[] = [];
-    for (let i = 0; i < 20; i += 1) {
-      res.push({
-        x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
-        y: Math.floor(Math.random() * 100) + 10,
-      });
-    }
-    return res;
+  initPillarData(){
+        this.curve.reRender()
  }
  /**
-* 初始化数据列表
-*/
+   * 初始化数据列表
+   */
  initST() {
    this.columns = [
-      { title: '序号', index: 'carNo', className: 'text-center' },
-      { title: '发货地', index: 'carNoColorLabel', className: 'text-center' },
-      { title: '卸货地', index: 'carModelLabel', className: 'text-center' },
-      { title: '货物', index: 'carStatus', className: 'text-center'},
-      { title: '数量', index: 'approvalStatus', className: 'text-center' },
+      { title: '序号', render: 'index', className: 'text-center', width: '70px' },
+      { title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' },
+      { title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' },
+      { title: '货物', index: 'goodsName', className: 'text-center', width: '90px' },
+      { title: '数量', render: 'weight', className: 'text-center', width: '120px' }
    ];
-    console.log(this.map);
-    setTimeout(() => {
-      if(this.map) {
-        this.map.reRender()
-      }
-    }, 500);
-   
  }
  initOrderST() {
    this.orderColumns = [
-      { title: '运单号', index: 'carNo', className: 'text-center' },
-      { title: '货主', index: 'carNoColorLabel', className: 'text-center' },
-      { title: '时间', index: 'carModelLabel', className: 'text-center' },
-      { title: '风险等级', index: 'carStatus', className: 'text-center'}
+      { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
+      { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
+      { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' },
+      { title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
+      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
    ];
  }
-  
+
  handleClick(data: G2MiniAreaClickItem): void {
    this.service.msgSrv.info(`${data.item.x} - ${data.item.y}`);
  }
--- a/src/app/routes/datatable/components/datascreen/map/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.html
@ -0,0 +1,11 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 17:57:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-07 19:44:32
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<g2-custom delay="200" (render)="render($event)" ></g2-custom>
--- a/src/app/routes/datatable/components/datascreen/map/map.component.less
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.less
--- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts
+++ b/src/app/routes/datatable/components/datascreen/curve/map.component.ts
@ -49,7 +49,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
      this.chart = new Chart({
        container: el,
        autoFit: true,
-        height: 540,
+        height: 680,
        padding: [0, 0]
      });
      this.chart.tooltip({
@ -87,16 +87,27 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
      });

    // 可视化用户数据
-    this.userData = [
-      { name: '山东', value: '21',trend:'#F51D27'  },
-      { name: '山东', value: 22},
-      { name: '广东', value: 20,trend:'#0A61D7'  },
-      { name: '广东', value: 20  },
-      { name: '四川', value: 120  },
-      { name: '湖南', value: 200  },
-      { name: '河北', value: 30  },
+    // this.userData = [
+    //   { name: '山东', value: 21 },
+    //   { name: '山东', value: 22},
+    //   { name: '广东', value: 20, },
+    //   { name: '广东', value: 20  },
+    //   { name: '四川', value: 120  },
+    //   { name: '湖南', value: 200  },
+    //   { name: '河北', value: 30  },

-    ];
+    // ];
+        let value: any = []
+      this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => {
+     if(res) {
+      res.forEach((element: any) => {
+        value.push({
+          name: element.province,
+          value: element.weight,
+       });
+       });
+       console.log(value);
+       this.userData = value
    this.userDv = this.ds.createView().source(this.userData).transform({
        geoDataView: this.worldMap,
        field: 'name',
@ -105,31 +116,37 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
      }).transform({
        type: 'map',
        callback: (obj: { trend: string; value: number }) => {
-          
-          obj.trend = obj.value > 100 ? '蓝色地区' : '红色地区';
+          if(obj.value < 500) {
+            obj.trend = '500以下';
+          } else if(obj.value >= 500 && obj.value < 1000){
+            obj.trend = '500-1000';
+          } else if(obj.value >= 1000 ){
+            obj.trend = '>1000';
+          }
          return obj;
        }
      });
    this.userView = this.chart.createView();
    this.userView.data(this.userDv.rows);
-    // this.userView.scale({
-    //   trend: {
-    //     alias: '蓝色地区数量'
-    //   }
-    // });
+    this.userView.scale({
+      trend: {
+        alias: '蓝色地区数量'
+      }
+    });
    console.log(this.userView);
    console.log('45545');
    
-    this.userView.polygon().position('longitude*latitude').color('trend', ['#000', '#76ddb2']).tooltip('').style({fillOpacity: 0.85 })
-      // .animate({
-      //   leave: {
-      //     animation: 'fade-out'
-      //   }
-      // });
+    this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 })
+      .animate({
+        leave: {
+          animation: 'fade-out'
+        }
+      });
      this.userView.interaction('element-active');
      this.chart.render();

-
+    }
+      })
      });

      console.log('9999');
--- a/src/app/routes/datatable/datatable.module.ts
+++ b/src/app/routes/datatable/datatable.module.ts
@ -1,10 +1,10 @@
 /*
- * @Description  : 
+ * @Description  :
 * @Version      : 1.0
 * @Author       : Shiming
 * @Date         : 2022-04-06 11:02:17
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 17:22:44
+ * @LastEditTime : 2022-04-07 18:29:39
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\datatable.module.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -40,7 +40,9 @@ import { FinancetablePillarComponent } from './components/financetable/pillar/pi
 import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component';
 import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component';
 import { DatatableCustomindexCurveComponent } from './components/customtable/customindex/curve/curve.component';
-import { DatatableCustomindexMapComponent } from './components/datascreen/curve/map.component';
+import { DatatableCustomindexMapComponent } from './components/datascreen/map/map.component';
+import { DatatableCustomindexCurveMinComponent } from './components/datascreen/curve/curve.component';
+import { DatatableReportingvViewTrackComponent } from './reporting/components/view-track/view-track.component';

 const COMPONENTS: Type<void>[] = [
  DatatableDataindexComponent,
@ -74,7 +76,9 @@ const COMPONENTS: Type<void>[] = [
  ComplianceCurveComponent,
  BusitableCurveComponent,
  DatatableCustomindexCurveComponent,
-  DatatableCustomindexMapComponent
+  DatatableCustomindexMapComponent,
+  DatatableCustomindexCurveMinComponent,
+  DatatableReportingvViewTrackComponent
 ]


--- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html
@ -3,10 +3,8 @@
  <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_fund_valid_result" [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams,process: beforeReq }"
    [res]="{ reName: { list: 'data' } }" [page]="{ show: false,showSize:false}" [loading]="false" [bordered]="true">
-    <ng-template st-row="freightDetails" let-item>
-      <div *ngFor="let item of item.freightDetails">
-        <div>{{item.expenseName}}:{{item.price | currency}} </div>
-      </div>
+    <ng-template st-row="checkStatus" let-item>
+      <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
    </ng-template>
  </st>
 </div>
--- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
@ -51,16 +51,17 @@ export class DatatableReportingFundInfoComponent implements OnInit {
        width: '10%',
        type: 'enum',
        enum: {
-          '0': '非必填',
-          '1': '必填',
+          0: '否',
+          1: '是',
        },
      },
      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', },
      {
        title: '本地校验',
-        index: 'checkStatus',
+        render: 'checkStatus',
        className: 'text-center',
        type: 'enum',
+
        enum: {
          '0': '校验中',
          '1': '通过',
@ -97,6 +98,19 @@ export class DatatableReportingFundInfoComponent implements OnInit {
    this.modalRef.destroy();
  }

+  filterCheckStatus(status: number) {
+    switch (status) {
+      case 0:
+        return '校验中';
+      case 1:
+        return '通过';
+      case 2:
+        return '不通过';
+      default:
+        return '';
+
+    }
+  }


 }
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@ -28,7 +28,7 @@
  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_fund_reporting_page" [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [1,10,20, 50, 100] }" (change)="changeSt($event)">
+    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" (change)="changeSt($event)">
    <ng-template st-row="uploadStatus" let-item>
      <span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.uploadStatusLabel}}</span>
    </ng-template>
@ -58,5 +58,6 @@
    </div>
    <button nz-button nzType="primary" (click)="upload()">上传</button>
    <button nz-button nzType="primary" (click)="recall()">撤回</button>
+    <button nz-button nzType="primary" (click)="updateData()">更新数据</button>
  </div>
 </ng-template>
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@ -7,7 +7,6 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
 import { DatatableReportingFundInfoComponent } from '../fund-info/fund-info.component';
 import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';

@Component({
  selector: 'app-datatable-fund-reporting',
@ -117,7 +116,7 @@ export class DatatableFundReportingComponent implements OnInit {
          title: '承运司机',
          type: 'string',
          ui: {
-            placeholder: '请输入司机姓名/手机号', visibleIf: {
+            placeholder: '请输入司机姓名', visibleIf: {
              _$expand: (value: boolean) => value,
            },
          }
@ -147,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit {
        uploadStatus: {
          title: '上传状态',
          type: 'string',
+          default: 0,
+          enum: [
+            { label: '待上传', value: 0 },
+            { label: '已上传', value: 1 },
+            { label: '异常', value: 2 }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
+            widget: 'select',
+            allowClear: true,
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
@ -160,17 +164,21 @@ export class DatatableFundReportingComponent implements OnInit {
        verifyStatus: {
          title: '本地校验',
          type: 'string',
+          enum: [
+            { label: '校验中', value: 0 },
+            { label: '通过', value: 1 },
+            { label: '不通过', value: 2 }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
+            allowClear: true,
+            widget: 'select',
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
          }
        },
-        enterpriseInfoId: {
+        ltdId: {
          title: '网络货运人',
          type: 'string',
          ui: {
@ -230,24 +238,24 @@ export class DatatableFundReportingComponent implements OnInit {
        className: 'text-center',
        width: '180px',
      },
-      { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', },
+      { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', },
      {
        title: '网络货运人',
        index: 'ltdName',
        className: 'text-center',
        width: '180px',
      },
-      { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '200px' },
-      { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '120px' },
+      { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' },
+      { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' },
      { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' },
      { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
      { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },

-      { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '180px' },
-      { title: '车队长', index: 'payee', className: 'text-center', width: '250px' },
-      { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '200px' },
+      { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' },
+      { title: '车队长', index: 'payee', className: 'text-center', width: '150px' },
+      { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' },

-      { title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '200px' },
+      { title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '150px' },

      { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '180px' },
      { title: '实际支付金额', render: 'payAmount', className: 'text-center', width: '150px' },
@ -290,7 +298,9 @@ export class DatatableFundReportingComponent implements OnInit {

  selectChange(item: any) {
    this.selectedIndex = item?.value || '';
+
    setTimeout(() => {
+      this.selectedRows = [];
      this.st.load(1);
    })
  }
@ -378,14 +388,34 @@ export class DatatableFundReportingComponent implements OnInit {
    })
  }

+
+
  /**
   * 查看监管审核结果
   */
  viewAuditResult(record: any) {
-    if (record?.verifyStatus !== '1') {
+    if (record?.verifyStatus !== '2') {
      return;
    }
-    this.openWainingModal('监管审核结果', record?.result)
+    this.openWainingModal('监管审核结果', record?.uploadResult)
+  }
+
+  /**
+   * 更新数据
+   */
+  updateData() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要更新的数据');
+      return;
+    }
+    const ids = this.selectedRows.map(i => i?.id);
+    this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => {
+      if (res) {
+        this.selectedRows = [];
+        this.st.reload();
+
+      }
+    })
  }


--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@ -28,26 +28,28 @@
  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
+    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"
+    (change)="changeSt($event)">
    <ng-template st-row="orderCheckStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)"
-        *ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
-      <span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
+      <a *ngIf="item?.orderCheckStatus === 2"
+        (click)="viewAuditResult(item)">{{filterStatus(item?.orderCheckStatus)}}</a>
+      <span *ngIf="item?.orderCheckStatus !== 2">{{filterStatus(item?.orderCheckStatus)}}</span>
    </ng-template>
    <ng-template st-row="driverCheckStatus" let-item let-index="index">
      <a (click)="viewAuditResult(item)"
-        *ngIf="item?.driverCheckStatus === '2'">{{filterStatus(item?.driverCheckStatus)}}</a>
-      <span *ngIf="item?.driverCheckStatus !== '2'">{{filterStatus(item?.driverCheckStatus)}}</span>
+        *ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}}</a>
+      <span *ngIf="item?.driverCheckStatus !== 2">{{filterStatus(item?.driverCheckStatus)}}</span>
    </ng-template>
    <ng-template st-row="carCheckStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === '2'">{{filterStatus(item?.carCheckStatus)}}</a>
-      <span *ngIf="item?.carCheckStatus !== '2'">{{filterStatus(item?.carCheckStatus)}}</span>
+      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === 2">{{filterStatus(item?.carCheckStatus)}}</a>
+      <span *ngIf="item?.carCheckStatus !== 2">{{filterStatus(item?.carCheckStatus)}}</span>
    </ng-template>

    <ng-template st-row="checkStatus" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterCheckStatus(item?.checkStatus)}}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
+      <a (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
+      <span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
    </ng-template>
+
    <ng-template st-row="billCode" let-item>
      <span class="text-red-dark">{{item?.billCode}}</span>
    </ng-template>
@ -65,10 +67,10 @@
    </ng-template>

    <ng-template st-row="car" let-item let-index="index">
-      <a (click)="viewAuditResult(item)">查看轨迹</a>
+      <a (click)="viewTrack(item,'car')">查看轨迹</a>
    </ng-template>
    <ng-template st-row="driver" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">查看轨迹</a>
+      <a (click)="viewTrack(item,'driver')">查看轨迹</a>
    </ng-template>
  </st>
 </nz-card>
@ -80,6 +82,7 @@
    </div>
    <button nz-button nzType="primary" (click)="upload()">上传</button>
    <button nz-button nzType="primary" (click)="recall()">撤回</button>
+    <button nz-button nzType="primary" (click)="updateData()">更新数据</button>
    <button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
  </div>
 </ng-template>
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@ -1,12 +1,13 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
 import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
 import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
+import { DatatableReportingvViewTrackComponent } from '../view-track/view-track.component';

@Component({
  selector: 'app-datatable-order-reporting',
@ -28,9 +29,9 @@ export class DatatableOrderReportingComponent implements OnInit {
    { name: '异常', value: '4' },
    { name: '全部', value: '' }
  ];
-  selectedIndex = ''; //选择的项目
-  serviceTel = '';
+  selectedIndex = '1';
  isLoading: boolean = false;
+  selectedRows: any[] = [];
  constructor(
    public service: ReportingService,
    private router: Router,
@ -52,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   */
  get reqParams() {
    const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex,
+      putStatus: this.selectedIndex,
    });
    delete params._$expand;
    return { ...params };
@ -61,9 +62,9 @@ export class DatatableOrderReportingComponent implements OnInit {
  /**
   * 选中行
   */
-  get selectedRows() {
-    return this.st?.list.filter((item: any) => item.checked) || [];
-  }
+  // get selectedRows() {
+  //   return this.st?.list.filter((item: any) => item.checked) || [];
+  // }

  /**
   * 伸缩查询条件
@ -148,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit {
        putStatus: {
          title: '上传状态',
          type: 'string',
+          default: 0,
          enum: [
            { label: '待上传', value: 0 },
            { label: '已上传', value: 1 },
@ -157,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit {
          ui: {
            placeholder: '请选择',
            widget: 'select',
+            allowClear: true,
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
@ -173,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit {
          ui: {
            placeholder: '请选择',
            widget: 'select',
+            allowClear: true,
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
@ -283,9 +287,9 @@ export class DatatableOrderReportingComponent implements OnInit {
        title: '订单号',
        render: 'billCode',
        className: 'text-center',
-        width: '150px',
+        width: '180px',
      },
-      { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', },
+      { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', },

      {
        title: '网络货运人',
@ -293,14 +297,13 @@ export class DatatableOrderReportingComponent implements OnInit {
        className: 'text-center',
        width: '180px',
      },
-
-      { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', className: 'text-center', width: '200px' },
      { title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' },
      { title: '发货时间', index: 'dispatchedDate', className: 'text-center', width: '180px' },
      { title: '收货时间', index: 'receivingDate', className: 'text-center', width: '180px' },
      { title: '托运人名称', index: 'shipperName', className: 'text-center', width: '250px' },
-      { title: '托运人统一社会信用代码', index: 'shipperCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '装货地址', index: 'loadingAddress', render: 'dischargePlace', className: 'text-center', width: '200px' },
+      { title: '托运人统一社会信用代码', index: 'shipperCreditCode', className: 'text-center', width: '200px' },
+      { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' },
      { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
      { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
      { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' },
@ -364,9 +367,51 @@ export class DatatableOrderReportingComponent implements OnInit {

  }

+  changeSt(e: STChange): void {
+
+    if (e.type === 'checkbox') {
+      const checkRows = (e.checkbox as STData[]) || [];
+      //判断当前页是否有选中的行
+      if (checkRows.length === 0) {
+        // 当前页没有存在已勾选的行，移除之前所记录的当前页的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id);
+        })
+      } else {
+        //添加新增的行
+        checkRows.forEach((item: any) => {
+          const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id);
+          if (newSelectedList.length === 0) {
+            this.selectedRows.push(item);
+
+          }
+        })
+        // 移除取消选中的行
+        const stList = this.st.list;
+        stList.forEach(item => {
+          if (!item.checked) {
+            const index = this.selectedRows.findIndex(_item => item.id === _item.id);
+            if (index !== -1) this.selectedRows.splice(index, 1);
+          }
+        })
+      }
+    } else if (e.type === 'loaded') {
+      // 页面加载时勾选
+      (e?.loaded || []).forEach((r: any) => {
+        this.selectedRows.forEach((x) => {
+          if (x.id === r.id) {
+            r.checked = true;
+          }
+        });
+      });
+    }
+  }
+
  selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    this.selectedIndex = item?.value || '';
    setTimeout(() => {
+      this.selectedRows = [];
      this.st.load(1);
    })
  }
@ -465,6 +510,7 @@ export class DatatableOrderReportingComponent implements OnInit {


  search() {
+    this.selectedRows = [];
    this.st.load(1);
  }

@ -483,14 +529,51 @@ export class DatatableOrderReportingComponent implements OnInit {
    })
  }

+  /**
+   * 查看轨迹
+   */
+  viewTrack(_record: any, trajectory: string) {
+    const title = trajectory === 'car' ? '车辆' : '司机'
+    const modalRef = this.modal.create({
+      nzTitle: `查看${title}轨迹`,
+      nzWidth: 1000,
+      nzContent: DatatableReportingvViewTrackComponent,
+      nzComponentParams: {
+        id: _record?.orderId,
+        trajectory
+      },
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(res => {
+    })
+  }
+
+  /**
+ * 更新数据
+ */
+  updateData() {
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要更新的数据');
+      return;
+    }
+    const ids = this.selectedRows.map(i => i?.id);
+    this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
+      if (res) {
+        this.selectedRows = [];
+        this.st.reload();
+
+      }
+    })
+  }
+
  filterStatus(status: number) {
    switch (status) {
      case 0:
-        return '校验中';
+        return '待上传';
      case 1:
-        return '通过';
+        return '已上传';
      case 2:
-        return '不通过';
+        return '上传异常';
      default:
        return '';

--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
+++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
@ -5,14 +5,12 @@
    </nz-tabset>
  </div>
  <div style="width: 90%;">
-    <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
+    <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
+      [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}" [loading]="false"
      [bordered]="true">
-      <ng-template st-row="freightDetails" let-item>
-        <div *ngFor="let item of item.freightDetails">
-          <div>{{item.expenseName}}:{{item.price | currency}} </div>
-        </div>
+      <ng-template st-row="checkStatus" let-item>
+        <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
      </ng-template>
    </st>
  </div>
--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
+++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
@ -1,8 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';

@ -11,26 +9,22 @@ import { ReportingService } from '../../services/reporting.service';
  templateUrl: './verify-result.component.html',
 })
 export class DatatableReportingVerifyResultComponent implements OnInit {
-  url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
  @ViewChild('st') private readonly st!: STComponent;
  columns: STColumn[] = [];
-  record: any = {}
-  tabs: any[] = [
-    { name: '订单信息', value: '1' },
-    { name: '司机信息', value: '2' },
-    { name: '车辆信息', value: '3' },
-  ];
+  record: any = {};

+  tabs: any[] = [
+    { name: '订单信息', value: 3 },
+    { name: '司机信息', value: 2 },
+    { name: '车辆信息', value: 4 },
+  ];
+  subjectType = 3;
+  subjectId = '';
  get reqParams() {
-    return {};
+    return {
+      subjectType: this.subjectType,
+      subjectId: this.record?.id
+    };
  }
  constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {

@ -46,13 +40,31 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '序号', type: 'no', className: 'text-center', width: '60px', },
-      { title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', },
+      { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', },
+      { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', },
      { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
-      { title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', },
-      { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
-      { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
+      {
+        title: '是否必填',
+        index: 'requiredStatus',
+        className: 'text-center',
+        width: '100px',
+        type: 'enum',
+        enum: {
+          0: '否',
+          1: '是'
+        }
+      },
+      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
+      {
+        title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
+        type: 'enum',
+        enum: {
+          0: '校验中',
+          1: '通过',
+          2: '不通过'
+        }
+      },
+      { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
    ]
  }

@ -64,7 +76,10 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
  }

  selectTab(e: any) {
-
+    setTimeout(() => {
+      this.subjectType = e?.value;
+      this.st.load(1);
+    })
  }

  update() {
@ -77,9 +92,23 @@ export class DatatableReportingVerifyResultComponent implements OnInit {


  }
+
+
  close(): void {
    this.modalRef.destroy();
  }
+  filterCheckStatus(status: number) {
+    switch (status) {
+      case 0:
+        return '校验中';
+      case 1:
+        return '通过';
+      case 2:
+        return '不通过';
+      default:
+        return '';

+    }
+  }

 }
--- a/src/app/routes/datatable/reporting/components/view-track/view-track.component.html
+++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.html
@ -0,0 +1,5 @@
+<div>
+  <!-- <amap-path-simplifier [mapList]="mapList" [mapHeight]="'600px'" [pois]="pois"></amap-path-simplifier> -->
+  <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
+  </amap-path-simplifier>
+</div>
--- a/src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts
+++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts
@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableReportingvViewTrackComponent } from './view-track.component';
+
+describe('DatatableReportingvViewTrackComponent', () => {
+  let component: DatatableReportingvViewTrackComponent;
+  let fixture: ComponentFixture<DatatableReportingvViewTrackComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DatatableReportingvViewTrackComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableReportingvViewTrackComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
+++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
@ -0,0 +1,92 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import format from 'date-fns/format';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { OrderManagementService } from 'src/app/routes/order-management/services/order-management.service';
+
+
+@Component({
+  selector: 'app-datatable-view-track',
+  templateUrl: './view-track.component.html',
+})
+export class DatatableReportingvViewTrackComponent implements OnInit {
+  mapList: any[] = [];  //地图点位数据组
+  addressItems: any[] = [];  //打点地址数据组
+  trajectory = "car";
+  pois: any[] = [];
+  id = '';
+  constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) {
+
+  }
+
+  ngOnInit(): void {
+    if (this.trajectory === 'car') {
+      this.getTrajectory();
+    } else if (this.trajectory === 'driver') {
+      this.getDriverTrajectory();
+    }
+  }
+
+
+
+  selectTab(e: any) {
+
+  }
+
+  close(): void {
+    this.modalRef.destroy();
+  }
+
+  // 车辆轨迹
+  getTrajectory() {
+    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.cityArray];
+        if (this.addressItems && this.addressItems.length > 0) {
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.vinOutTime);
+          });
+        }
+      }
+    });
+
+
+  }
+
+  // 获取司机轨迹
+  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 = item.vinOutTime ? this.getLocalTime(item.gtm) : '';
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+  }
+  getLocalTime(time: any) {
+    return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+}
--- a/src/app/routes/datatable/reporting/services/reporting.service.ts
+++ b/src/app/routes/datatable/reporting/services/reporting.service.ts
@ -6,17 +6,20 @@ import { BaseService } from '@shared';
 })
 export class ReportingService extends BaseService {

-  $api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表
+  $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表
  $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报
  $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报
  $api_async_export_order_reporting_list = ``; // 导出订单上报
  $api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置
  $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置
+  $api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果
+  $api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据

  $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表
  $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传
  $api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回
  $api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表
+  $api_update_fund_data = `/api/fcc/fundUploadHead/updateUploadFundNumber`;//资金批量更新数据


  constructor(public injector: Injector) {
--- a/src/app/routes/datatable/services/data.service.ts
+++ b/src/app/routes/datatable/services/data.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-27 10:30:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:30:16
+ * @LastEditTime : 2022-04-07 15:07:27
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -82,6 +82,8 @@ export class DataService extends BaseService {
  $api_getTradingTrend = `/api/sdc/reportDataLargeScreen/getTradingTrend`;
  // 数据大屏-交易额(今日，本月，累计)
  $api_getTransactionAmount = `/api/sdc/reportDataLargeScreen/getTransactionAmount`;
+  // 数据大屏-交易分布
+  $api_getTransactionDistribution = `/api/sdc/reportDataLargeScreen/getTransactionDistribution`;



--- 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-01 10:56:13
+ * @LastEditTime : 2022-04-08 14:06:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -137,7 +137,7 @@
  </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
+  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
    <ng-template st-row="prices" let-item let-index="index">
@ -225,7 +225,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
  <nz-tabset >
    <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary"[disabled]="">申 诉</button>
      <div>
        您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
      </div>
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 10:52:51
+ * @LastEditTime : 2022-04-08 11:30:05
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -104,7 +104,8 @@
      <ng-template st-row="mybidDetailInfo" let-item let-index="index">
        <div *ngIf="item.mybidDetailInfo.length > 0">
          <p *ngFor="let data of item.mybidDetailInfo">
-            {{ data.expenseName }}：{{ data.price | currency }}
+            <span *ngIf="data.expenseCode !== 'FL'">{{ data.expenseName }}：{{ data.price | currency }}</span>
+            <span *ngIf="data.expenseCode === 'FL'" >{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }}</span>
            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
          </p>
        </div>
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/src/app/routes/order-management/components/risk/risk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 11:02:21
+ * @LastEditTime : 2022-04-08 13:51:12
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -86,8 +86,12 @@
      <ng-template st-row="driverName" let-item let-index="index">
        <div> {{ item?.driverName }}{{  item?.driverPhone ? "/" + item?.driverPhone : '' }}{{   item?.carNo ? "/" + item?.carNo : ''}} </div>
      </ng-template>
-      <ng-template st-row="payeeName" let-item let-index="index">
-        <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : ''  }} </div>
+      <ng-template st-row="payeeName" let-item>
+        <div *ngIf="item?.driverId !== item?.payeeId">
+          <div>{{item.payeeName}}</div>
+          <div>{{item.payeePhone}}</div>
+        </div>
+        <div *ngIf="item?.driverId === item?.payeeId">-</div>
      </ng-template>
      <ng-template st-row="freightDetails" let-item let-index="index">
        <div *ngIf="item.freightDetails.length > 0">
--- 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-04-06 15:39:20
+ * @LastEditTime : 2022-04-08 14:06:27
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -249,7 +249,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
  <nz-tabset>
    <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary" [disabled]="">申 诉</button>
      <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
      <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
      <ul *ngFor="let item of abnormalList">
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 11:03:39
+ * @LastEditTime : 2022-04-08 11:32:46
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -81,16 +81,11 @@
      </ng-template> -->
      <ng-template st-row="mybidDetailInfo" let-item let-index="index">
        <div *ngIf="item.mybidDetailInfo.length > 0">
-          <div *ngFor="let data of item.mybidDetailInfo">
-            {{ data.expenseName }}：{{ data?.expenseCode === 'FL' ? (data.price * 100 + '%' ) : (data.price | currency) }}
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0"
-              style="color: #f59a63">待申请</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已拒绝</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '5'" style="color: #f59a63">退款中</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '6'" style="color: #f59a63">退款成功</span>
-          </div>
+          <p *ngFor="let data of item.mybidDetailInfo">
+            <span *ngIf="data.expenseCode !== 'FL'">{{ data.expenseName }}：{{ data.price | currency }}</span>
+            <span *ngIf="data.expenseCode === 'FL'" >{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }}</span>
+            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+          </p>
        </div>
      </ng-template>
      <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.less
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.less
@ -0,0 +1,13 @@
+
+    :host {
+     p{
+         margin-bottom: 0
+     }
+     .left_btn {
+          width: 50px;
+         height: 32px; 
+          padding-left: 8px;
+          line-height:32px; 
+          background-color: #d7d7d7;
+     }
+ }
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -19,7 +19,7 @@ import { OrderManagementService } from '../../services/order-management.service'
@Component({
  selector: 'app-supply-management-vehicle',
  templateUrl: './vehicle.component.html',
-  styleUrls: ['../../../commom/less/commom-table.less']
+  styleUrls: ['../../../commom/less/commom-table.less','./vehicle.component.less']
 })
 export class OrderManagementVehicleComponent extends BasicTableComponent implements OnInit {
  ui: SFUISchema = {};
--- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
@ -1,4 +1,14 @@
 <!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-23 14:24:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-08 14:04:13
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+货物单价<!--
 * @Description  : 
 * @Version      : 1.0
 * @Author       : Shiming
@ -18,7 +28,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
 <sv-container col="1">
  <sv label="货物单价">
    <span>
-      {{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightTypeLabel}}
+      {{detailList?.freightPrice}} {{detailList?.freightTypeLabel}}
     </span>
  </sv>
  <sv label="结算依据">
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
@ -10,23 +10,16 @@
 -->
 <page-header-wrapper [title]="''"></page-header-wrapper>

-<nz-card>
+<nz-card class="search-box">
  <!-- 搜索表单 -->
  <div nz-row nzGutter="8">
    <div nz-col [nzSpan]="_$expand ? 24 : 18">
-      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
+        [compact]="true" [button]="'none'"></sf>
    </div>
-    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button
-        nz-button
-        nzType="primary"
-        [disabled]="!sf.valid"
-        [nzLoading]="service.http.loading"
-        (click)="search()"
-        acl
-        [acl-ability]="['RiskOrder-Search']"
-        >查询</button
-      >
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()"
+        acl [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
      <button nz-button nzType="link" (click)="expandToggle()">
@ -36,34 +29,13 @@
    </div>
  </div>
 </nz-card>
-<nz-card>
+<nz-card class="content-box">
  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
  </nz-tabset>
  <!-- 数据列表 -->
-  <st
-    #st
-    [scroll]="{ x: '1200px' }"
-    [data]="service.$api_order_reporting_page"
-    [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
-    [loading]="false"
-  >
-    <ng-template st-row="orderStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
-      <span style="color: red" (click)="unnormal(item)">异常</span>
-    </ng-template>
-
-    <ng-template st-row="localValid" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
-    </ng-template>
-    <ng-template st-row="amount" let-item let-index="index">
-      <div class="text-right">{{ item?.amount | currency: ' ' }}</div>
-    </ng-template>
+  <st #st [scroll]="{ x: '1200px',y:'450px'  }" [data]="service.$api_get_individual_collect_page" [columns]="columns"
+    [req]="{ params: reqParams }" [page]="{ }" [loading]="false" (change)="stChange($event)">
  </st>
 </nz-card>
 <ng-template #extraTemplate>
@ -76,5 +48,4 @@
    <button nz-button nzType="primary" (click)="recall()">更正</button>
    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
  </div>
-</ng-template>
-
+</ng-template>
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less
@ -1,5 +0,0 @@
-:host {
-  .text-black {
-    color: #000;
-  }
-}
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts
@ -1,34 +0,0 @@
-/*
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-03-30 14:45:52
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 15:33:06
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TaxManagementIndividualCollectComponent } from './individual-collect.component';
-
-describe('TaxManagementIndividualCollectComponent', () => {
-  let component: TaxManagementIndividualCollectComponent;
-  let fixture: ComponentFixture<TaxManagementIndividualCollectComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ TaxManagementIndividualCollectComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TaxManagementIndividualCollectComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@ -1,71 +1,44 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { TaxManagementService } from '../../services/tax-management.service';
-// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';

@Component({
  selector: 'app-tax-management-individual-collect',
  templateUrl: './individual-collect.component.html',
-  styleUrls: ['./individual-collect.component.less']
+  styleUrls: ['../../../commom/less/box.less']
 })
 export class TaxManagementIndividualCollectComponent implements OnInit {
  _$expand = false;
-  ui!: SFUISchema;
  schema!: SFSchema;
  columns!: STColumn[];
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  tabType!: string;
  tabs: any[] = [
-    { name: '待申报', value: '1' },
-    { name: '待审核', value: '2' },
-    { name: '已通过', value: '3' },
-    { name: '不通过', value: '4' },
+    { name: '待申报', value: '0' },
+    { name: '待审核', value: '1' },
+    { name: '已通过', value: '2' },
+    { name: '不通过', value: '3' },
    { name: '全部', value: '' }
  ];
-  selectedIndex = ''; //选择的项目
-  serviceTel = '';
-  constructor(
-    public service: TaxManagementService,
-    private router: Router,
-    private ar: ActivatedRoute,
-    public shipperservice: ShipperBaseService,
-    private modal: NzModalService,
-    public shipperSrv: ShipperBaseService
-  ) {}
+  selectedIndex = '0';

-  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
+  selectedRows: any[] = [];
+  constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {}

  /**
   * 查询参数
   */
  get reqParams() {
    const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex
+      declareStatus: this.selectedIndex
    });
    delete params._$expand;
    return { ...params };
  }

-  /**
-   * 选中行
-   */
-  get selectedRows() {
-    return this.st?.list.filter((item: any) => item.checked) || [];
-  }
-
  /**
   * 伸缩查询条件
   */
@ -74,6 +47,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
    this.sf?.setValue('/_$expand', this._$expand);
  }

+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
+  }
+
  /**
   * 重置表单
   */
@ -96,28 +77,47 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
    this.schema = {
      properties: {
        _$expand: { type: 'boolean', ui: { hidden: true } },
-        billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } },
-        resourceCode: {
+        declareStatus: {
+          title: '申报状态',
+          type: 'string',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '0', label: '待申报' },
+            { value: '1', label: '待审核' },
+            { value: '2', label: '已通过' },
+            { value: '3', label: '不通过' }
+          ],
+          ui: {
+            placeholder: '请选择',
+            widget: 'select',
+            containsAllLabel: true
+          },
+          default: ''
+        },
+        declareResult: {
          type: 'string',
          title: '申报结果',
          ui: {
-            placeholder: '请输入'
+            placeholder: '请选择',
+            widget: 'select',
          }
        },
-        serviceType3: {
+        overdueStatus: {
          title: '是否逾期',
          type: 'string',
+          enum: [
+            { value: '', label: '全部' },
+            { value: false, label: '否' },
+            { value: true, label: '是' }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
+            widget: 'select',
+            containsAllLabel: true
+          },
+          default: ''
        },
-        createTime: {
+        taxMonth: {
          title: '税款所属期',
          type: 'string',
          ui: {
@ -129,7 +129,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        createTime3: {
+        sbrq: {
          title: '申报日期',
          type: 'string',
          ui: {
@ -151,15 +151,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
            visibleIf: {
              _$expand: (value: boolean) => value
            },
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+            asyncData: () => this.service.getNetworkFreightForwarder()
          }
        }
      }
    };
-    this.ui = {
-      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
-      $time: { grid: { span: 24 } }
-    };
  }

  /**
@ -168,121 +164,123 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
-      { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
-      { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
+      {
+        title: '申报状态',
+        index: 'declareStatus',
+        className: 'text-center',
+        width: '120px',
+        type: 'badge',
+        badge: {
+          '0': { text: '待申报', color: 'default' },
+          '1': { text: '待审核', color: 'processing' },
+          '2': { text: '已通过', color: 'success' },
+          '3': { text: '不通过', color: 'error' }
+        }
+      },
+      {
+        title: '是否逾期',
+        index: 'overdueStatus',
+        className: 'text-center',
+        width: '120px',
+        type: 'enum',
+        enum: { false: '否', true: '是' }
+      },
      {
        title: '税款所属期起',
-        render: 'billComplianceVOS',
+        index: 'skssqq',
        className: 'text-center',
        width: '150px'
      },
-      { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
+      { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' },
      {
        title: '纳税人名称',
-        render: 'serviceType',
+        index: 'nsrmc',
        className: 'text-center',
        width: '180px'
      },
-      { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '申报人数', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
+      {
+        title: '税率',
+        index: 'sl',
+        className: 'text-right',
+        width: '150px',
+        format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%`
+      },
+      { title: '申报人数', index: 'sbrs', className: 'text-right', width: '150px' },
+      {
+        title: '应税收入',
+        index: 'yssr',
+        className: 'text-right',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) }
+      },
+      {
+        title: '应纳税额',
+        index: 'ynse',
+        className: 'text-right',
+        width: '180px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+      },
+      {
+        title: '累计已缴纳税额',
+        index: 'ljyjnse',
+        className: 'text-center',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) }
+      },
+      {
+        title: '本期应补退税额',
+        index: 'bqybtse',
+        className: 'text-center',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) }
+      },
+      { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' }
    ];
  }

  /**
-   *撤销
+   *更正
   * @param record 记录实例
   */
  recall() {
    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要撤回的数据');
+      this.service.msgSrv.warning('请选择需要更正的数据');
      return;
    }
-    this.modal.confirm({
-      nzTitle: '撤回提示',
-      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-      nzOkText: '确定',
-      nzCancelText: '取消',
-      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-          if (res) {
-            this.service.msgSrv.success('撤销成功');
-            this.search();
-          }
-        });
-      }
-    });
-  }
-  /**
-   *撤销
-   * @param record 记录实例
-   */
-  unnormal(value: any) {
-    this.modal.confirm({
-      nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
-      nzOkText: '确定',
-      nzCancelText: '',
-      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-          if (res) {
-            this.service.msgSrv.success('撤销成功');
-            this.search();
-          }
-        });
-      }
-    });
+    // this.modal.confirm({
+    //   nzTitle: '撤回提示',
+    //   nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+    //   nzOkText: '确定',
+    //   nzCancelText: '取消',
+    //   nzOnOk: () => {
+    //     this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //       if (res) {
+    //         this.service.msgSrv.success('撤销成功');
+    //         this.search();
+    //       }
+    //     });
+    //   }
+    // });
  }

  selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    this.selectedIndex = item?.value || '';
    setTimeout(() => {
      this.st.load(1);
    });
  }

-  /**
-   * 查看当行数据
-   */
-  view(record: STData) {
-    // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
-    this.router.navigate(['../detail'], {
-      queryParams: {
-        id: record.id
-      },
-      relativeTo: this.ar
-    });
-  }
-
-  // appeal(item: any) {
-  //   const modalRef = this.modal.create({
-  //     nzTitle: '申诉',
-  //     nzWidth: '40%',
-  //     nzContent: CtcAppealComponent,
-  //     nzComponentParams: {
-  //       i: item,
-  //       status: 'add'
-  //     },
-  //     nzFooter: null
-  //   });
-  //   modalRef.afterClose.subscribe(res => {
-  //     if (res) {
-  //       this.search({ representationsStatus: '' });
-  //     }
-  //   })
-  // }
-
  /**
   * 申报
   */
  upload() {
    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
+      this.service.msgSrv.warning('请选择需要上传的数据');
      return;
    }
    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
@ -298,10 +296,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
   * @param params 更新数据
   */
  uploadSetting() {
-    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
-      return;
-    }
    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
    //   if (res) {
    //     this.service.msgSrv.success('更新成功');
@ -310,33 +304,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
    // })
  }

-  /**
-   * 查看校验结果
-   */
-  viewResult(item: any) {
-    // const modalRef = this.modal.create({
-    //   nzTitle: '本地校验结果',
-    //   nzWidth: 1200,
-    //   nzContent: TaxManagementOrderVerifyResultComponent,
-    //   nzComponentParams: {
-    //     record: item
-    //   },
-    //   nzFooter: null
-    // });
-    // modalRef.afterClose.subscribe(res => {
-    // })
-  }
-
-  /**
-   * 查看监管审核结果
-   */
-  viewAuditResult(record: any) {
-    if (record?.billStatus !== '2') {
-      return;
-    }
-    this.openWainingModal('监管审核结果', record?.result);
-  }
-
  search() {
    this.st.load(1);
  }
@ -347,12 +314,4 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
  export() {
    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
  }
-
-  openWainingModal(content: string, title = '提示') {
-    this.modal.warning({
-      nzMask: false,
-      nzTitle: title,
-      nzContent: content
-    });
-  }
 }
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
@ -10,15 +10,16 @@
 -->
 <page-header-wrapper [title]="''"></page-header-wrapper>

-<nz-card>
+<nz-card class="search-box">
  <!-- 搜索表单 -->
  <div nz-row nzGutter="8">
    <div nz-col [nzSpan]="_$expand ? 24 : 18">
-      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        [button]="'none'"></sf>
    </div>
-    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
-        [acl-ability]="['RiskOrder-Search']">查询</button>
+    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
+        acl [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
      <button nz-button nzType="link" (click)="expandToggle()">
@ -28,28 +29,14 @@
    </div>
  </div>
 </nz-card>
-<nz-card>
+
+<nz-card class="content-box">
  <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
    <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
  </nz-tabset>
  <!-- 数据列表 -->
-  <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_individual_income_page" [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="service.http.loading">
-    <ng-template st-row="orderStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
-      <span style="color: red" (click)="unnormal(item)">异常</span>
-    </ng-template>
-
-    <ng-template st-row="localValid" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
-    </ng-template>
-    <ng-template st-row="amount" let-item let-index="index">
-      <div class="text-right">{{ item?.amount | currency: ' ' }}</div>
-    </ng-template>
+  <st #st [scroll]="{ x: '1200px',y:'450px' }" [data]="service.$api_get_individual_income_page" [columns]="columns"
+    [req]="{  params: reqParams }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)">
  </st>
 </nz-card>
 <ng-template #extraTemplate>
@ -59,7 +46,7 @@
      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
    </div>
    <button nz-button nzType="primary" (click)="upload()">申报</button>
-    <button nz-button nzType="primary" (click)="recall()">更正</button>
+    <button nz-button nzType="primary" (click)="corrections()">更正</button>
    <button nz-button nzType="primary" (click)="resetData()">修改起征点</button>
    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
  </div>
@ -75,4 +62,4 @@
    <button nz-button nzType="default" (click)="handleCancel()">取消</button>
    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
  </ng-template>
-</nz-modal>
+</nz-modal>
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.less
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.less
@ -1,5 +0,0 @@
-:host {
-  .text-black {
-    color: #000;
-  }
-}
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts
@ -1,34 +0,0 @@
-/*
- * @Description  : 
- * @Version      : 1.0
- * @Author       : Shiming
- * @Date         : 2022-03-30 14:45:52
- * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 15:33:06
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TaxManagementIndividualIncomeComponent } from './individual-income.component';
-
-describe('TaxManagementIndividualIncomeComponent', () => {
-  let component: TaxManagementIndividualIncomeComponent;
-  let fixture: ComponentFixture<TaxManagementIndividualIncomeComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ TaxManagementIndividualIncomeComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TaxManagementIndividualIncomeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
@ -1,71 +1,54 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { STColumn, STComponent, STData } from '@delon/abc/st';
+import { STChange, STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { TaxManagementService } from '../../services/tax-management.service';
-// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';

@Component({
  selector: 'app-tax-management-individual-income',
  templateUrl: './individual-income.component.html',
-  styleUrls: ['./individual-income.component.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class TaxManagementIndividualIncomeComponent implements OnInit {
  _$expand = false;
-  ui!: SFUISchema;
  schema!: SFSchema;
  columns!: STColumn[];
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
-  tabType!: string;
  isLoading: boolean = false;
  tabs: any[] = [
-    { name: '待申报', value: '1' },
-    { name: '待审核', value: '2' },
-    { name: '已通过', value: '3' },
-    { name: '不通过', value: '4' },
+    { name: '待申报', value: '0' },
+    { name: '待审核', value: '1' },
+    { name: '已通过', value: '2' },
+    { name: '不通过', value: '3' },
    { name: '全部', value: '' }
  ];
-  selectedIndex = ''; //选择的项目
-  serviceTel = '';
-  isVisible : boolean = false
-  constructor(
-    public service: TaxManagementService,
-    private router: Router,
-    private ar: ActivatedRoute,
-    public shipperservice: ShipperBaseService,
-    private modal: NzModalService,
-    public shipperSrv: ShipperBaseService
-  ) {}
+  selectedIndex = '0'; //选择的项目
+  isVisible: boolean = false;

-  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
+  selectedRows: any[] = [];
+
+  constructor(public service: TaxManagementService) {}

  /**
   * 查询参数
   */
  get reqParams() {
    const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex
+      declareStatus: this.selectedIndex
    });
    delete params._$expand;
    return { ...params };
  }

-  /**
-   * 选中行
-   */
-  get selectedRows() {
-    return this.st?.list.filter((item: any) => item.checked) || [];
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
  }

  /**
@ -82,7 +65,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
-    this.isLoading = true
+    this.isLoading = true;
  }
  /**
   * 程序初始化入口
@ -99,61 +82,73 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
    this.schema = {
      properties: {
        _$expand: { type: 'boolean', ui: { hidden: true } },
-        billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
-        resourceCode: {
+        driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
+        telephone: {
          type: 'string',
          title: '联系电话',
          ui: {
            placeholder: '请输入'
          }
        },
-        driverName: {
+        cardNumber: {
          title: '证件号码',
          type: 'string',
          ui: {
            placeholder: '请输入证件号码'
          }
        },
-        serviceType2: {
+        declareStatus: {
          title: '申报状态',
          type: 'string',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '0', label: '待申报' },
+            { value: '1', label: '待审核' },
+            { value: '2', label: '已通过' },
+            { value: '3', label: '不通过' }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
+            widget: 'select',
            containsAllLabel: true,
            visibleIf: {
              _$expand: (value: boolean) => value
            }
-          }
+          },
+          default: ''
        },
-        serviceType3: {
-          title: '申报结果',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
-        serviceType1: {
+        // declareStatu1s: {
+        //   title: '申报结果',
+        //   type: 'string',
+        //   ui: {
+        //     placeholder: '请选择',
+        //     widget: 'dict-select',
+        //     params: { dictKey: 'service:type' },
+        //     containsAllLabel: true,
+        //     visibleIf: {
+        //       _$expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
+        isOvertime: {
          title: '是否逾期',
          type: 'string',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '0', label: '否' },
+            { value: '1', label: '是' }
+          ],
          ui: {
            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
+            widget: 'select',
            containsAllLabel: true,
            visibleIf: {
              _$expand: (value: boolean) => value
            }
-          }
+          },
+          default: ''
        },
-        createTime: {
+        taxDate: {
          title: '税款所属期',
          type: 'string',
          ui: {
@ -165,7 +160,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        createTime3: {
+        declareDate: {
          title: '申报日期',
          type: 'string',
          ui: {
@ -177,7 +172,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        enterpriseInfoId: {
+        ltdId: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -187,15 +182,11 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            visibleIf: {
              _$expand: (value: boolean) => value
            },
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+            asyncData: () => this.service.getNetworkFreightForwarder()
          }
        }
      }
    };
-    this.ui = {
-      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
-      $time: { grid: { span: 24 } }
-    };
  }

  /**
@ -204,148 +195,149 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
-      { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
-      { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
      {
-        title: '税款所属期起',
-        render: 'billComplianceVOS',
+        title: '申报状态',
+        index: 'declareStatus',
        className: 'text-center',
-        width: '150px'
+        width: '120px',
+        type: 'badge',
+        badge: {
+          '0': { text: '待申报', color: 'default' },
+          '1': { text: '待审核', color: 'processing' },
+          '2': { text: '已通过', color: 'success' },
+          '3': { text: '不通过', color: 'error' }
+        }
      },
-      { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
+      { title: '是否逾期', index: 'overtime', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } },
+      { title: '税款所属期起', index: 'skssqq', className: 'text-center', width: '150px' },
+      { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' },
+      { title: '纳税人名称', index: 'nsrmc', className: 'text-center', width: '180px' },
+      { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
+      { title: '行业', index: 'hy', className: 'text-center', width: '200px' },
+      { title: '行政区划', index: 'xzqh', className: 'text-center', width: '120px' },
+      { title: '街道乡镇', index: 'jdxz', className: 'text-center', width: '350px' },
+      { title: '税务机关', index: 'swjg', className: 'text-center', width: '180px' },
+      { title: '姓名', index: 'xm', className: 'text-center', width: '180px' },
+      { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '250px' },
+      { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' },
+      { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' },
+      { title: '国籍（地区）', index: 'gjdq', className: 'text-center', width: '150px' },
+      { title: '生产经营地行政区划', index: 'scjydxzqh', className: 'text-center', width: '180px' },
      {
-        title: '纳税人名称',
-        render: 'serviceType',
-        className: 'text-center',
-        width: '180px'
+        title: '当月应税收入',
+        index: 'dyyssr',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dyyssr }) }
      },
-      { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '行政区划', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
-      { title: '街道乡镇', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
-      { title: '税务机关', render: 'driver', className: 'text-center', width: '180px' },
-      { title: '姓名', render: 'payeeName', className: 'text-center', width: '180px' },
-      { title: '证件类型', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '联系电话', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
-      { title: '国籍（地区）', render: 'driver', className: 'text-center', width: '150px' },
-      { title: '生产经营地行政区划', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '当月应税收入', render: 'amount', className: 'text-center', width: '250px' },
-      { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '应税所得率', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '计税依据', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '速算扣除数', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
+      {
+        title: '应税收入',
+        index: 'yssr',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) }
+      },
+      {
+        title: '应税所得率',
+        index: 'yssdl',
+        className: 'text-right',
+        width: '250px',
+        format: item => `${item.yssdl ? ((item.yssdl as number) * 100).toFixed(2) : 0}%`
+      },
+      { title: '计税依据', index: 'jsyj', className: 'text-right', width: '150px' },
+      {
+        title: '税率',
+        index: 'sl',
+        className: 'text-right',
+        width: '150px',
+        format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%`
+      },
+      { title: '速算扣除数', index: 'sskcs', className: 'text-right', width: '150px' },
+      {
+        title: '应纳税额',
+        index: 'ynse',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+      },
+      {
+        title: '累计已缴纳税额',
+        index: 'ljyjnse',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) }
+      },
+      {
+        title: '本期应补退税额',
+        index: 'bqybtse',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) }
+      },
+      { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' }
    ];
  }

  /**
-   *撤销
+   *更正
   * @param record 记录实例
   */
-  recall() {
-    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要撤回的数据');
-      return;
-    }
-    this.modal.confirm({
-      nzTitle: '撤回提示',
-      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-      nzOkText: '确定',
-      nzCancelText: '取消',
-      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-          if (res) {
-            this.service.msgSrv.success('撤销成功');
-            this.search();
-          }
-        });
-      }
-    });
+  corrections() {
+    // if (this.selectedRows.length === 0) {
+    //   this.openWainingModal('请选择需要撤回的数据');
+    //   return;
+    // }
+    // this.modal.confirm({
+    //   nzTitle: '撤回提示',
+    //   nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+    //   nzOkText: '确定',
+    //   nzCancelText: '取消',
+    //   nzOnOk: () => {
+    //     this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //       if (res) {
+    //         this.service.msgSrv.success('撤销成功');
+    //         this.search();
+    //       }
+    //     });
+    //   }
+    // });
  }
  /**
-   *撤销
+   *修改起征点
   * @param record 记录实例
   */
  resetData() {
-    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要更新的数据！');
-      return;
-    }
-    this.isVisible = true
-
-  }
-  /**
-   *撤销
-   * @param record 记录实例
-   */
-  unnormal(value: any) {
-    this.modal.confirm({
-      nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
-      nzOkText: '确定',
-      nzCancelText: '',
-      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-          if (res) {
-            this.service.msgSrv.success('撤销成功');
-            this.search();
-          }
-        });
-      }
-    });
+    // if (this.selectedRows.length === 0) {
+    //   this.openWainingModal('请选择需要更新的数据！');
+    //   return;
+    // }
+    // this.isVisible = true;
  }

  selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    this.selectedIndex = item?.value || '';
    setTimeout(() => {
      this.st.load(1);
    });
  }

-  /**
-   * 查看当行数据
-   */
-  view(record: STData) {
-    // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
-    this.router.navigate(['../detail'], {
-      queryParams: {
-        id: record.id
-      },
-      relativeTo: this.ar
-    });
-  }
-
-  // appeal(item: any) {
-  //   const modalRef = this.modal.create({
-  //     nzTitle: '申诉',
-  //     nzWidth: '40%',
-  //     nzContent: CtcAppealComponent,
-  //     nzComponentParams: {
-  //       i: item,
-  //       status: 'add'
-  //     },
-  //     nzFooter: null
-  //   });
-  //   modalRef.afterClose.subscribe(res => {
-  //     if (res) {
-  //       this.search({ representationsStatus: '' });
-  //     }
-  //   })
-  // }
-
  /**
   * 申报
   */
  upload() {
    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
+      this.service.msgSrv.warning('请选择需要申报的数据');
      return;
    }
+    // this.modal.warning({
+    //   nzTitle: '申报提示',
+    //   nzContent: '订单结算时间所在月份与申报月份不一致......'
+    // });
    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
    //   if (res) {
    //     this.service.msgSrv.success('申报成功');
@ -359,43 +351,12 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
   * @param params 更新数据
   */
  uploadSetting() {
-    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
-      return;
-    }
-    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-    //   if (res) {
-    //     this.service.msgSrv.success('更新成功');
-    //     this.search();
-    //   }
-    // })
-  }
-
-  /**
-   * 查看校验结果
-   */
-  viewResult(item: any) {
-    // const modalRef = this.modal.create({
-    //   nzTitle: '本地校验结果',
-    //   nzWidth: 1200,
-    //   nzContent: TaxManagementOrderVerifyResultComponent,
-    //   nzComponentParams: {
-    //     record: item
-    //   },
-    //   nzFooter: null
-    // });
-    // modalRef.afterClose.subscribe(res => {
-    // })
-  }
-
-  /**
-   * 查看监管审核结果
-   */
-  viewAuditResult(record: any) {
-    if (record?.billStatus !== '2') {
-      return;
-    }
-    this.openWainingModal('监管审核结果', record?.result);
+    this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('更新成功');
+        this.search();
+      }
+    });
  }

  search() {
@ -409,17 +370,8 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
  }

-  openWainingModal(content: string, title = '提示') {
-    this.modal.warning({
-      nzMask: false,
-      nzTitle: title,
-      nzContent: content
-    });
-  }
-  handleOK() {
-
-  }
+  handleOK() {}
  handleCancel() {
-      this.isVisible = false;
+    this.isVisible = false;
  }
 }
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 14:00:43
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 15:29:14
+ * @LastEditTime : 2022-04-07 20:31:33
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -35,23 +35,53 @@
    </nz-tab>
  </nz-tabset>
  <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_individual_income_page" [columns]="columns"
+  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
-    <ng-template st-row="orderStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
-      <span style="color: red;" (click)="unnormal(item)">异常</span>
+    <ng-template st-row="putStatusLabel" let-item let-index="index">
+      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
+      <span *ngIf="item?.putStatus !== '2'">{{item?.billStatusLabel}}</span>
+      <span  *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">异常</span>

    </ng-template>
-
-    <ng-template st-row="localValid" let-item let-index="index">
+    <ng-template st-row="driverName" let-item let-index="index">
+      <div> {{ item?.driverName }}{{  item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+    </ng-template>
+    <!-- <ng-template st-row="localValid" let-item let-index="index">
      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
      <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
+    </ng-template> -->
+    <ng-template st-row="loadingPicture" let-item let-index="index">
+      <div class="imgBox">
+        <div *ngIf="item.loadingPicture">
+          <app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
+        </div>
+      </div>
    </ng-template>
-    <ng-template st-row="amount" let-item let-index="index">
-      <div class="text-right">{{item?.amount | currency :' '}}</div>
+    <ng-template st-row="unloadPicture" let-item let-index="index">
+      <div class="imgBox">
+        <div *ngIf="item.unloadPicture">
+          <app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template st-row="loadingLadingBill" let-item let-index="index">
+      <div class="imgBox">
+        <div *ngIf="item.loadingLadingBill">
+          <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template st-row="signatureForm" let-item let-index="index">
+      <div class="imgBox">
+        <div *ngIf="item.signatureForm">
+          <app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template st-row="orderAmount" let-item let-index="index">
+      <div class="text-right">{{item?.orderAmount | currency :' '}}</div>
    </ng-template>
  </st>
 </nz-card>
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less
@ -11,4 +11,12 @@
    /* stylelint-disable-next-line order/properties-order */
    fill: currentColor;
  }
+  ::ng-deep {
+    .imgBox {
+      display: flex;
+      img {
+          width: 60px !important; 
+      }
+  }
+  }
 }
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@ -102,7 +102,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      properties: {
        _$expand: { type: 'boolean', ui: { hidden: true } },
        billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
-        resourceCode: {
+        wayBillCode: {
          type: 'string',
          title: '运单号',
          ui: {
@ -152,7 +152,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            },
          }
        },
-        carNo3: {
+        collectionUserName: {
          title: '收款人',
          type: 'string',
          maxLength: 9,
@ -163,8 +163,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            },
          }
        },
-      
-        serviceType2: {
+        putStatus: {
          title: '上传状态',
          type: 'string',
          ui: {
@ -178,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
          }
        },
        serviceType1: {
-          title: '本地校验',
+          title: '精准',
          type: 'string',
          ui: {
            placeholder: '请选择',
@ -190,7 +189,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            },
          }
        },
-        enterpriseInfoId: {
+        networkTransporter: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -203,7 +202,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
          }
        },
-        createTime: {
+        recentlyPutTime: {
          title: '上传时间',
          type: 'string',
          ui: {
@ -215,7 +214,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            },
          } as SFDateWidgetSchema,
        },
-        createTime3: {
+        orderPayTime: {
          title: '结束时间',
          type: 'string',
          ui: {
@ -241,57 +240,57 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
+      { title: '上传状态', index: 'putStatus', className: 'text-center', width: '120px', },
+      { title: '精准', index: 'platformCheckStatusLabel', className: 'text-center', width: '120px', },
      {
        title: '订单号',
-        render: 'billComplianceVOS',
+        index: 'billCode',
        className: 'text-center',
        width: '150px',
      },
-      { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', },
+      { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
      {
        title: '网络货运人',
        render: 'serviceType',
        className: 'text-center',
        width: '180px',
      },
-      { title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
-      { title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
-      { title: '货主名称', render: 'driver', className: 'text-center', width: '180px' },
-      { title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' },
-      { title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
-      { title: '到车时间', render: 'driver', className: 'text-center', width: '150px' },
-      { title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '订单金额', render: 'amount', className: 'text-center', width: '250px' },
-      { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '卸货地', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
+      { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
+      { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' },
+      { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
+      { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' },
+      { title: '接单时间', index: 'wayBillCreateTime',  className: 'text-center', width: '200px' },
+      { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
+      { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },
+      { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' },
+      { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' },
+      { title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' },
+      { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' },
      { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '运费金额', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '装卸方式', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '支付方式', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '支付账号', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '银行流水号', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' },
-      { title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
+      { title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' },
+      { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' },
+      { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' },
+      { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' },
+      { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' },
+      { title: '收款人姓名', index: 'collectionUserName', className: 'text-center', width: '250px' },
+      { title: '收款人身份证号码', index: 'collectionUserCertificateNumber', className: 'text-center', width: '180px' },
+      { title: '装货照片', render: 'loadingPicture', className: 'text-center', width: '100px' },
+      { title: '卸货照片', render: 'unloadPicture', className: 'text-center', width: '100px' },
+      { title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' },
+      { title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' },
+      { title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' },
+      { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' },
    ];
  }



  /**
-   *撤销
+   *撤回
   * @param record 记录实例
   */
  recall() {
@ -299,13 +298,17 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      this.openWainingModal('请选择需要撤回的数据');
      return;
    }
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
    this.modal.confirm({
      nzTitle: '撤回提示',
      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
      nzOkText: '确定',
      nzCancelText: '取消',
      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+        this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => {
          if (res) {
            this.service.msgSrv.success('撤销成功');
            this.search();
@ -324,10 +327,14 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      this.openWainingModal('请选择需要更新的数据！');
      return;
    }
-    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
      if (res) {
        this.service.msgSrv.success('更新成功');
-        this.search();
+        this.st.load(1);
      }
    })
  }
@ -336,13 +343,22 @@ export class TaxManagementOrderReportingComponent implements OnInit {
   * @param record 记录实例
   */
  unnormal(value: any) {
+    // if (this.selectedRows.length === 0) {
+    //   this.openWainingModal('请选择需要更新的数据！');
+    //   return;
+    // }
+    console.log(this.selectedRows);
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
    this.modal.confirm({
      nzTitle: '税务审核结果',
      nzContent: '订单结算时间所在月份与申报月份不一致',
      nzOkText: '确定',
      nzCancelText: '',
      nzOnOk: () => {
-        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+        this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => {
          if (res) {
            this.service.msgSrv.success('撤销成功');
            this.search();
@ -356,7 +372,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  selectChange(item: any) {
    this.selectedIndex = item?.representationsStatus || '';
    setTimeout(() => {
-      this.st.load(1);
+      this.st.load();
    })
  }

@ -399,12 +415,16 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      this.openWainingModal('请选择需要上传的数据');
      return;
    }
-    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-    //   if (res) {
-    //     this.service.msgSrv.success('上传成功');
-    //     this.search();
-    //   }
-    // })
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('上传成功');
+        this.st.load();
+      }
+    })
  }


@ -421,6 +441,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      nzFooter: null
    });
    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.load();
+      }
    })
  }

--- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-31 11:10:10
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-07 20:07:47
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div nz-row>
  <div style="width: 10%;">
    <nz-tabset [nzTabPosition]="'left'" style="height: 100%;">
@ -5,7 +15,7 @@
    </nz-tabset>
  </div>
  <div style="width: 90%;">
-    <st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_individual_income_page" [columns]="columns"
+    <st #st [scroll]="{x:'1000px'}" [data]="service.$api_listOperationalReportPage" [columns]="columns"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
      [bordered]="true">
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@ -4,29 +4,45 @@
 * @Author       : Shiming
 * @Date         : 2021-12-27 10:30:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 14:18:01
+ * @LastEditTime : 2022-04-07 20:41:55
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */

 import { Injectable, Injector } from '@angular/core';
 import { _HttpClient } from '@delon/theme';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { map } from 'rxjs/operators';
-import { BaseService } from 'src/app/shared/services/core/base.service';
-import { EAFileUtil } from 'src/app/shared/utils/file.util';
+import { ShipperBaseService } from '@shared';

@Injectable({
-  providedIn: 'root',
+  providedIn: 'root'
 })
-export class TaxManagementService extends BaseService {
+export class TaxManagementService extends ShipperBaseService {
  // 获取货主企业列表
  public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
+  //
  public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
-  
+
  // 查询运营报表
  $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
-  $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
+
+  // 查询个税申报明细
+  $api_get_individual_income_page = `/api/sdc/taxIncome/list/page`;
+  // 更新所有数据个税申报明细
+  $api_update_individual_income_page = `/api/sdc/taxIncome/updateAll`;
+
+  // 查询个税汇总
+  $api_get_individual_collect_page = `/api/sdc/taxSummary/list/page`;
+  // 更新所有数据个税汇总
+  $api_update_individual_collect_page = `/api/sdc/taxIncome/updateAll`;
+
+  // 订单上报列表
+  $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
+  // 根据订单Id更新税务订单
+  $api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
+  // 撤回税务订单
+  $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`;
+  // 上传税务订单
+  $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`;
  $api_recall_reporting = ``; // 撤回
  $api_async_export_order_reporting_list = ``; // 导出订单上报
  $api_get_upload_setting = ``; // 修改上传设置
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@ -224,7 +224,7 @@ export class InvoiceRequestedComponent {
            };
            this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => {
              if (res) {
-                this.service.msgSrv.success('开票成功！');
+                this.service.msgSrv.success('提交成功！');
                modal.destroy();
                this.st.load(1);
              }
@ -248,7 +248,7 @@ export class InvoiceRequestedComponent {
            };
            this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => {
              if (res) {
-                this.service.msgSrv.success('开票成功！');
+                this.service.msgSrv.success('提交成功！');
                modal.destroy();
                this.st.load(1);
              }
--- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
@ -133,7 +133,7 @@ export class RequestedInvoiceModalComponent {
        this.nzModalService.confirm({
          nzTitle: '是否进入销票处理页面完成开票',
          nzOnOk: () => {
-            this.service.msgSrv.success('开票成功');
+            this.service.msgSrv.success('提交成功');
            this.modal.destroy(true);
            this.router.navigate(['/ticket/cancellation-invoice']);
          },
--- 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
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-04-06 15:37:59
+ * @LastEditTime : 2022-04-08 11:44:33
 * @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.html
@ -30,6 +30,7 @@
        <sv label="所属项目">{{i?.enterpriseProjectName}}</sv>
        <sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
        <sv label="调度员">{{i?.dispatchName}} /{{i?.dispatchPhone}}</sv>
+        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
        <sv label="货源编号">{{ i?.resourceCode }} </sv>
        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
     </div>
@ -92,13 +93,12 @@
    <sv label="接单数量">
      {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
    </sv>
-    <sv label="装货数量">
+    <sv *ngIf="i?.wayBillStatus =='3' || i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="装货数量">
      {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方
    </sv>
-    <sv  label="卸货数量">
+    <sv *ngIf="i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="卸货数量">
      {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
    </sv>
-    
 </sv-container>
 <div class="mt-md">
  <h4 class="text-md">装货卸货信息
@ -154,10 +154,10 @@
      totalObj?.price - attObj?.price | currency
    }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
  </div>
-  <div>车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
 </nz-card> -->
 <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
-  <h2>{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
+  <h2>{{i?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
    <ng-template st-row="price" let-item let-index="index">
@ -176,7 +176,7 @@
      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
    </div>
  </div>
-  <div *ngIf ="i?.payee?.phone && i?.payee?.phone !== i?.driverVo.phone">车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
 </nz-card>

 <nz-card nzTitle="附件信息" #distannce4>
--- a/src/assets/images/oclock.svg
+++ b/src/assets/images/oclock.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="38px" height="38px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1218 -13 )">
+    <path d="M 21.944010416666668 9.72265625  C 22.092447916666668 9.87109375  22.166666666666668 10.060763888888884  22 10.291666666666668  L 22 21.375  C 22.166666666666668 21.605902777777775  22.092447916666668 21.795572916666664  21.944010416666668 21.944010416666664  C 21.795572916666668 22.092447916666664  21.60590277777778 22.166666666666664  21.375 22.166666666666664  L 13.458333333333334 22.166666666666664  C 13.227430555555559 22.166666666666664  13.037760416666666 22.092447916666664  12.889322916666666 21.944010416666664  C 12.740885416666666 21.795572916666664  12.666666666666666 21.605902777777775  12.666666666666666 21.375  L 12.666666666666666 19.791666666666664  C 12.666666666666666 19.56076388888889  12.740885416666666 19.37109375  12.889322916666666 19.22265625  C 13.037760416666666 19.07421875  13.227430555555559 19  13.458333333333334 19  L 19 19  L 19 10.291666666666668  C 19 10.060763888888884  19.07421875 9.87109375  19.22265625 9.72265625  C 19.371093750000004 9.57421875  19.560763888888893 9.5  19.791666666666668 9.5  L 21.375 9.5  C 21.60590277777778 9.5  21.795572916666668 9.57421875  21.944010416666668 9.72265625  Z M 30.65234375 25.75390625  C 31.856336805555557 23.69227430555555  32.45833333333333 21.440972222222225  32.45833333333333 19  C 32.45833333333333 16.559027777777775  31.856336805555557 14.307725694444445  30.65234375 12.24609375  C 29.44835069444445 10.184461805555552  27.81553819444445 8.551649305555552  25.75390625 7.34765625  C 23.692274305555557 6.143663194444444  21.440972222222225 5.541666666666668  19 5.541666666666668  C 16.55902777777778 5.541666666666668  14.307725694444446 6.143663194444444  12.24609375 7.34765625  C 10.184461805555555 8.551649305555552  8.551649305555555 10.184461805555552  7.34765625 12.24609375  C 6.143663194444445 14.307725694444445  5.541666666666667 16.559027777777775  5.541666666666667 19  C 5.541666666666667 21.440972222222225  6.143663194444445 23.69227430555555  7.34765625 25.75390625  C 8.551649305555555 27.81553819444444  10.184461805555555 29.448350694444443  12.24609375 30.65234375  C 14.307725694444446 31.856336805555557  16.55902777777778 32.45833333333333  19 32.45833333333333  C 21.440972222222225 32.45833333333333  23.692274305555557 31.856336805555557  25.75390625 30.65234375  C 27.81553819444445 29.448350694444443  29.44835069444445 27.81553819444444  30.65234375 25.75390625  Z M 35.45182291666667 9.462890625  C 37.150607638888886 12.373914930555552  38 15.552951388888884  38 19  C 38 22.44704861111111  37.150607638888886 25.62608506944444  35.45182291666667 28.537109375  C 33.75303819444445 31.448133680555557  31.448133680555557 33.75303819444444  28.537109375 35.45182291666667  C 25.62608506944445 37.15060763888889  22.44704861111111 38  19 38  C 15.55295138888889 38  12.373914930555555 37.15060763888889  9.462890625 35.45182291666667  C 6.551866319444445 33.75303819444444  4.246961805555556 31.448133680555557  2.5481770833333335 28.537109375  C 0.8493923611111109 25.62608506944444  0 22.44704861111111  0 19  C 0 15.552951388888884  0.8493923611111109 12.373914930555552  2.5481770833333335 9.462890625  C 4.246961805555556 6.551866319444444  6.551866319444445 4.246961805555552  9.462890625 2.548177083333332  C 12.373914930555555 0.8493923611111078  15.55295138888889 0  19 0  C 22.44704861111111 0  25.62608506944445 0.8493923611111078  28.537109375 2.548177083333332  C 31.448133680555557 4.246961805555552  33.75303819444445 6.551866319444444  35.45182291666667 9.462890625  Z " fill-rule="nonzero" fill="#000000" stroke="none" transform="matrix(1 0 0 1 1218 13 )" />
+  </g>
+</svg>
				`@ -0,0 +1,2 @@`
				`<g2-custom delay="100" (render)="render($event)"></g2-custom>`
				`@ -1 +0,0 @@`
				`<g2-custom delay="100" (render)="render($event)"></g2-custom>`