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

2022-04-08 13:35:03 +08:00
parent 5c9ba7b7f1 8c167c313a
commit 210a6d51a5
25 changed files with 565 additions and 454 deletions
--- a/proxy.conf.js
+++ b/proxy.conf.js
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 09:51:21
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 16:45:43
+ * @LastEditTime : 2022-04-08 11:16:53
 * @FilePath     : \\tms-obc-web\\proxy.conf.js
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -20,7 +20,7 @@ module.exports = {
  // }
  '//api': {
    target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
      protocol: 'https:',
      port: 443
    },
--- 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/datascreen.component.html
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-04-06 10:57:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 16:57:05
+ * @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.
 -->
@ -43,15 +43,7 @@
      </nz-row>
    </nz-card>
    <nz-card nzTitle="本月交易趋势" >
-      <g2-timeline repaint='true'
-        [data]="monthData2"
-        #timeline
-        [titleMap]="{ y1: '订单数', y2: '运单数' }"
-        [height]="200"
-        [delay]='200' 
-        mask="MM月DD日"
-        [slider]="false"
-      ></g2-timeline>
+      <app-financetable-curve-min  #curve [chartData]='chartData2'></app-financetable-curve-min>
    </nz-card>
    <nz-card nzTitle="实时货源">
      <st
@ -173,6 +165,9 @@
        [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>
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 * @Author       : Shiming
 * @Date         : 2022-04-06 10:57:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 16:58:19
+ * @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,11 @@ 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 { 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({
  selector: 'app-datatable-datascreen',
@ -29,10 +30,12 @@ export class DatatableDatascreenComponent implements OnInit {
  @ViewChild('orderSt') private readonly orderSt!: STComponent;
  @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent;
  @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;
@ -40,7 +43,7 @@ export class DatatableDatascreenComponent implements OnInit {
  todayTime: string = '';

  monthData: G2TimelineData[] = [];
-  monthData2: Array<any> = this.genData2();
+  monthData2:G2TimelineData[] =[];
  salesData2: Array<any> = this.genData();
  constructor(public service: DataService) {}
  ngOnChanges(changes: any): void {
@ -102,16 +105,6 @@ export class DatatableDatascreenComponent implements OnInit {
      }
    });
  }
-  // initLineData() {
-  //   this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
-  //     this.monthData = res;
-  //     if (this.timeline) {
-  //       console.log(this.timeline);
-  //       // 等待组件渲染
-  //       setTimeout(() => this.timeline.changeData(), 100);
-  //     }
-  //   });
-  // }
  public genData(): G2MiniAreaData[] {
    let value: any = [];
    this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
@ -126,24 +119,8 @@ export class DatatableDatascreenComponent implements OnInit {
    console.log(value);
    return value;
  }
-  private genData2(): G2TimelineData[] {
-    let ress: G2TimelineData[] = [];
-    this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
-      if (res) {
-        res.forEach((element: any) => {
-          ress.push({
-            time: element.time,
-            y1: element.billQuantity,
-            y2: element.wayBillQuantity
-          });
-        });
-        console.log(ress);
-      }
-    });
-    if(!ress) {
-      setTimeout(() => {},100)
-    }
-    return ress;
+  initPillarData(){
+        this.curve.reRender()
  }
  /**
   * 初始化数据列表
@ -159,10 +136,11 @@ export class DatatableDatascreenComponent implements OnInit {
  }
  initOrderST() {
    this.orderColumns = [
-      { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' },
+      { 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: 'warningType', className: 'text-center', width: '90px' }
+      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
    ];
  }

--- a/src/app/routes/datatable/components/datascreen/curve/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/curve/map.component.html
@ -4,8 +4,8 @@
 * @Author       : Shiming
 * @Date         : 2022-04-06 17:57:07
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 15:48:36
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\map.component.html
+ * @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
@ -87,16 +87,27 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
      });

    // 可视化用户数据
-    this.userData = [
-      { name: '山东', value: 21 },
-      { name: '山东', value: 22},
-      { name: '广东', value: 20, },
-      { 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', ['#c7daf3', '#1779f3']).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
@ -4,7 +4,7 @@
 * @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,8 @@ 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>[] = [
@ -76,6 +77,7 @@ const COMPONENTS: Type<void>[] = [
  BusitableCurveComponent,
  DatatableCustomindexCurveComponent,
  DatatableCustomindexMapComponent,
+  DatatableCustomindexCurveMinComponent,
  DatatableReportingvViewTrackComponent
 ]

--- 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 11:42:40
 * @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">
--- 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/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/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>
--- 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,48 +82,55 @@ 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
            }
-          }
          },
-        serviceType3: {
-          title: '申报结果',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
+          default: ''
        },
-        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',
          ui: {
@ -153,7 +143,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            }
          }
        },
-        createTime: {
+        taxDate: {
          title: '税款所属期',
          type: 'string',
          ui: {
@ -165,7 +155,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        createTime3: {
+        declareDate: {
          title: '申报日期',
          type: 'string',
          ui: {
@ -177,7 +167,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        enterpriseInfoId: {
+        ltdId: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -187,15 +177,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 +190,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 +346,12 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
   * @param params 更新数据
   */
  uploadSetting() {
-    if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
-      return;
+    this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('更新成功');
+        this.search();
      }
-    // 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);
+    });
  }

  search() {
@ -409,16 +365,7 @@ 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;
  }
--- 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,39 @@
 * @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_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/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-07 15:02:55
+ * @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
@ -93,10 +93,10 @@
    <sv label="接单数量">
      {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
    </sv>
-    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
+    <sv *ngIf="i?.wayBillStatus =='3' || i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="装货数量">
      {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方
    </sv>
-    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
+    <sv *ngIf="i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="卸货数量">
      {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
    </sv>
 </sv-container>
				`@ -0,0 +1,2 @@`
				`<g2-custom delay="100" (render)="render($event)"></g2-custom>`