fix bug

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
  * @Author       : Shiming
  * @Date         : 2022-01-05 11:01:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 20:22:46
+ * @LastEditTime : 2022-03-30 10:45:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -95,7 +95,9 @@ export class ContractManagementTemplateTextComponent implements OnInit {
                     { label: '订单补充协议', value: '2' },
                     { label: '运单合同', value: '3' },
                     { label: '运单补充协议', value: '4' },
-                    { label: '委托代收合同', value: '5' }
+                    { label: '委托代收合同', value: '5' },
+                    { label: '电子提货单', value: '10' },
+                    { label: '电子卸货单', value: '11' },
                   ];
                   this.sf.getProperty('/contractType')!.schema.enum = this.Types;
                   this.sf.getProperty('/contractType')!.widget.reset(this.Types);

src/app/routes/datatable/components/compliance/index/index.component.ts

@@ -82,14 +82,6 @@ export class DatatableComplianceIndexComponent implements OnInit {
 
   }
 
-  data = [
-    { Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 },
-    { Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 },
-    { Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 },
-    { Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 },
-    { Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 },
-    { Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 }
-  ];
   render(el: ElementRef<HTMLDivElement>) {
     this.ngZone.runOutsideAngular(() => this.init(el.nativeElement));
   }
@@ -102,24 +94,105 @@ export class DatatableComplianceIndexComponent implements OnInit {
     });
     // 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势
 		const data = [
-			{x: '1991', z: 'a', y: 1},
+      { data: '1月', label: '订单合格率', value: 5 },
-			{x: '1991', z: 'b', y: 2},
+      { data: '2月', label: '订单合格率', value: 10 },
-			{x: '1991', z: 'c', y: 3},
+      { data: '3月', label: '订单合格率', value: 25 },
+      { data: '4月', label: '订单合格率', value: 35 },
+      { data: '5月', label: '订单合格率', value: 15 },
+      { data: '6月', label: '订单合格率', value: 5 },
+      { data: '7月', label: '订单合格率', value: 95 },
+      { data: '8月', label: '订单合格率', value: 45 },
 
-			{x: '1992', z: 'a', y: 11},
+      { data: '1月', label: '付款及时率', value: 10 },
-			{x: '1992', z: 'b', y: 22},
+      { data: '2月', label: '付款及时率', value: 15 },
-			{x: '1992', z: 'c', y: 33},
+      { data: '3月', label: '付款及时率', value: 30 },
-			
+      { data: '4月', label: '付款及时率', value: 8 },
-			{x: '1993', z: 'a', y: 1},
+      { data: '5月', label: '付款及时率', value: 9 },
-			{x: '1993', z: 'b', y: 2},
+      { data: '6月', label: '付款及时率', value: 5 },
-			{x: '1993', z: 'c', y: 3}
+      { data: '7月', label: '付款及时率', value: 80 },
-		];
+      { data: '8月', label: '付款及时率', value: 55 },
+
+      { data: '1月', label: '货源占比率', value: 90 },
+      { data: '2月', label: '货源占比率', value: 30 },
+      { data: '3月', label: '货源占比率', value: 45 },
+      { data: '4月', label: '货源占比率', value: 35 },
+      { data: '5月', label: '货源占比率', value: 95 },
+      { data: '6月', label: '货源占比率', value: 35 },
+      { data: '7月', label: '货源占比率', value: 65 },
+      { data: '8月', label: '货源占比率', value: 63 },
+
+      { data: '1月', label: '运费直付占比', value: 30 },
+      { data: '2月', label: '运费直付占比', value: 60 },
+      { data: '3月', label: '运费直付占比', value: 25 },
+      { data: '4月', label: '运费直付占比', value: 35 },
+      { data: '5月', label: '运费直付占比', value: 15 },
+      { data: '6月', label: '运费直付占比', value: 55 },
+      { data: '7月', label: '运费直付占比', value: 50 },
+      { data: '8月', label: '运费直付占比', value: 30 },
+    ];
 
     chart.data(data);
+    //刻度自定义
+    chart.scale({
+      data: {
+        range: [0, 1],
+      },
+      value: {
+        min: 0,
+        nice: true,
+      },
+    });
+    // 图表下方图形文字自定义
+    chart.legend({
+      items:[
+        {
+          name: '订单合格率',
+          value: 'node_load1',
+          marker: {
+            symbol: 'circle',
+            style: {fill: '#6193f7'}
+          },
+        },
+        {
+          name: '付款及时率',
+          value: 'node_load2',
+          marker: {symbol: 'circle',style: {fill: '#58d3a2'}},
+        },
+        {
+          name: '货源占比率',
+          value: 'node_load13',
+          marker: {symbol: 'circle',style: {fill: '#5b6d8f'}},
+        },
+        {
+          name: '运费直付占比',
+          value: 'node_load13',
+          marker: {symbol: 'circle',style: {fill: '#f0b915'}},
+        },
+      ]
+    });
+    // 提示自定义
+    chart.tooltip({
+      showCrosshairs: true,
+      shared: true,
+    });
+    
+    //数据格式化
+    chart.axis('value', {
+      label: {
+        formatter: (val) => {
+          return val + ' %';
+        },
+      },
+    });
 		// 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接
-		chart.line().position('x*y').color('z');
+		chart.line().position('data*value').color('label').tooltip('label*value', (name:any, value:any) => {
+      return {
+        name: name,
+        value: value + '%'
+      };
+    });;
 		// 在x*y的坐标上按z值绘制圆点
-		chart.point().position('x*y').size(4).color('z').shape('circle');
+		chart.point().position('data*value').size(4).color('label').shape('circle');
 		chart.render();
   }
 }

src/app/routes/datatable/components/invoicetable/invoicetable.component.html

@@ -3,12 +3,27 @@
 <nz-card nzTitle="开票数据报表">
   <st
     #st
-    [data]="data"
+    [data]="service.$api_findInvoiceReport"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [res]="{ reName: { list: 'data', total: 'data.total' }}"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loadingDelay]="500"
   >
+  <ng-template st-row="totalInvoicedAmount" let-item let-index="index">
+    {{item.totalInvoicedAmount | currency}}
+  </ng-template>
+  <ng-template st-row="invAmountMonth" let-item let-index="index">
+    {{item.invAmountMonth | currency}}
+  </ng-template>
+  <ng-template st-row="applyWaitInvAmount" let-item let-index="index">
+    {{item.applyWaitInvAmount | currency}}
+  </ng-template>
+  <ng-template st-row="unInvoicedAmountHistory" let-item let-index="index">
+    {{item.unInvoicedAmountHistory | currency}}
+  </ng-template>
+  <ng-template st-row="unInvoicedAmountCurMonth" let-item let-index="index">
+    {{item.unInvoicedAmountCurMonth | currency}}
+  </ng-template>
   </st>
 </nz-card>

src/app/routes/datatable/components/invoicetable/invoicetable.component.ts

@@ -1,7 +1,8 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFSchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { DataService } from '../../services/data.service';
 
 @Component({
   selector: 'app-datatable-invoicetable',
@@ -13,7 +14,7 @@ export class DatatableInvoicetableComponent implements OnInit {
   columns!: STColumn[];
 
   data=[{name1:1111}]
-  constructor(private http: _HttpClient, private modal: ModalHelper) { }
+  constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { }
 
   /**
    * 查询参数
@@ -23,48 +24,48 @@ export class DatatableInvoicetableComponent implements OnInit {
   }
   ngOnInit(): void { 
     this.initST();
+    
   }
   initST() {
     this.columns = [
       {
         title: '运营主体',
-        index: 'name1'
+        index: 'operationName'
       },
       {
         title: '已开票总金额',
-        index: 'name1'
+        index: 'totalInvoicedAmount',
+        render: 'totalInvoicedAmount',
       },
       {
         title: '当月已开票金额',
-        index: 'name1'
+        index: 'invAmountMonth',
+        render: 'invAmountMonth',
+      },
+      {
+        title: '当月已开票张数',
+        index: 'numInvAmountMonth',
       },
       {
         title: '已申请待开金额',
-        index: 'name1'
+        index: 'applyWaitInvAmount',
+        render: 'applyWaitInvAmount',
+      },
+      {
+        title: '申请待开客户',
+        index: 'applyWaitCustomer',
       },
       {
         title: '未申请开票金额（历史）',
-        index: 'name1'
+        index: 'unInvoicedAmountHistory',
+        render: 'unInvoicedAmountHistory',
       },
       {
         title: '未申请开票金额（当月）',
-        index: 'name1'
+        index: 'unInvoicedAmountCurMonth',
+        render: 'unInvoicedAmountCurMonth',
       },
-      {
-        title: '当月发票张数',
-        index: 'name1'
-      },
-      {
-        title: '剩余发票张数',
-        index: 'name1'
-      },
-      
     ];
   }
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
-  }
 
 }

src/app/routes/datatable/datatable-routing.module.ts

@@ -16,6 +16,7 @@ import { DatatableMancustomtableComponent } from './components/customtable/mancu
 import { DatatablePartnertableComponent } from './components/customtable/partnertable/partnertable.component';
 import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component';
 import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
+import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
 
 const routes: Routes = [
   { path: 'dataindex', component: DatatableDataindexComponent },
@@ -33,8 +34,10 @@ const routes: Routes = [
   { path: 'invoicetable', component: DatatableInvoicetableComponent },
   { path: 'reporting/fund', component: DatatableFundReportingComponent },
   { path: 'busitable/busiindex', component: DatatableBusiindexComponent },
-  { path: 'busitable/mantable', component: DatatableMantableComponent }];
+  { path: 'busitable/mantable', component: DatatableMantableComponent },
-  
+  { path: 'reporting/fund', component: DatatableFundReportingComponent },
+  { path: 'fund-info', component: DatatableReportingFundInfoComponent }];
+
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],

src/app/routes/datatable/datatable.module.ts

@@ -23,6 +23,7 @@ import { DatatableBusiindexComponent } from './components/busitable/busiindex/bu
 import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
 import { busitableCurveComponent } from './components/busitable/busiindex/curve/curve.component';
 import { busitablePillarComponent } from './components/busitable/busiindex/pillar/pillar.component';
+import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
 
 const COMPONENTS: Type<void>[] = [
   DatatableDataindexComponent,
@@ -46,9 +47,10 @@ const COMPONENTS: Type<void>[] = [
   DatatableBusiindexComponent,
   DatatableMantableComponent,
   busitableCurveComponent,
-  busitablePillarComponent
+  busitablePillarComponent,
-]
+  DatatableFundReportingComponent,
- 
+  DatatableReportingFundInfoComponent]
+
 
 @NgModule({
   imports: [

src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html

@@ -0,0 +1,15 @@
+<nz-spin [nzSpinning]="service.http.loading"></nz-spin>
+<st #st [scroll]="{x:'1000px'}" [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: 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>
+
+<div class="modal-footer">
+  <button nz-button type="submit" nzType="primary" (click)="close()">确定</button>
+</div>

src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts

@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableReportingFundInfoComponent } from './fund-info.component';
+
+describe('DatatableReportingFundInfoComponent', () => {
+  let component: DatatableReportingFundInfoComponent;
+  let fixture: ComponentFixture<DatatableReportingFundInfoComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DatatableReportingFundInfoComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableReportingFundInfoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts

@@ -0,0 +1,74 @@
+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';
+
+@Component({
+  selector: 'app-datatable-fund-info',
+  templateUrl: './fund-info.component.html',
+})
+export class DatatableReportingFundInfoComponent implements OnInit {
+  url = `/user`;
+  searchSchema!: SFSchema;
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [];
+  record: any = {}
+
+
+  get reqParams() {
+    return {};
+  }
+  constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
+
+  }
+
+  ngOnInit(): void {
+    this.initST();
+  }
+
+  /**
+ * 初始化数据列表
+ */
+  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: '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', },
+    ]
+  }
+
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+  selectTab(e: any) {
+
+  }
+
+  update() {
+    if (this.record?.billType === '1') {
+      window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
+
+    } else if (this.record.billType === '2') {
+      window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
+    }
+
+
+  }
+  close(): void {
+    this.modalRef.destroy();
+  }
+
+
+}

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html

@@ -42,6 +42,9 @@
     <ng-template st-row="amount" let-item let-index="index">
       <div class="text-right">{{item?.amount | currency :' '}}</div>
     </ng-template>
+    <ng-template st-row="total" let-item let-index="index">
+      <div class="text-right">{{item?.amount | currency :' '}}</div>
+    </ng-template>
   </st>
 </nz-card>
 <ng-template #extraTemplate>
@@ -52,6 +55,5 @@
     </div>
     <button nz-button nzType="primary" (click)="upload()">上传</button>
     <button nz-button nzType="primary" (click)="recall()">撤回</button>
-    <button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
   </div>
 </ng-template>

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts

@@ -102,26 +102,12 @@ export class DatatableFundReportingComponent implements OnInit {
             placeholder: '请输入',
           },
         },
-        enterpriseInfoId: {
+        resourceCode1: {
-          title: '网络货运人',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
-
-            allowClear: true
-          }
-        },
-        externalResourceCode: {
-          title: '货主',
           type: 'string',
+          title: '流水单号',
           ui: {
             placeholder: '请输入',
-            visibleIf: {
+          },
-              _$expand: (value: boolean) => value,
-            },
-          }
         },
         driverName: {
           title: '承运司机',
@@ -143,6 +129,17 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           }
         },
+        carNo1: {
+          title: '车队长',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
         serviceType: {
           title: '上传状态',
           type: 'string',
@@ -169,6 +166,41 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           }
         },
+        enterpriseInfoId: {
+          title: '网络货运人',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'select',
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
+
+            allowClear: true
+          }
+        },
+        externalResourceCode: {
+          title: '货主',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+
+
+        createTime1: {
+          title: '交易时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
         createTime: {
           title: '上传时间',
           type: 'string',
@@ -181,75 +213,6 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        createTime1: {
-          title: '运单生成时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-        createTime2: {
-          title: '发货时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-        createTime3: {
-          title: '收货时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-
-        loadingPlace: {
-          title: '车辆轨迹',
-          type: 'string',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '有', value: '1' },
-            { label: '无', value: '0' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          }
-        },
-        loadingPlace1: {
-          title: '司机轨迹',
-          type: 'string',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '有', value: '1' },
-            { label: '无', value: '0' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          }
-        },
       },
     };
     this.ui = {
@@ -264,10 +227,9 @@ export class DatatableFundReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
+      { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
-      { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
       { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
+      { title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', },
       {
         title: '订单号',
         render: 'billComplianceVOS',
@@ -282,28 +244,19 @@ export class DatatableFundReportingComponent implements OnInit {
         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: '实际承运人证件号码', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
-      { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
+      { title: '车牌号', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
-      { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
+      { title: '车牌颜色', render: 'driver', className: 'text-center', width: '180px' },
-      { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
+      { title: '总金额', render: 'amount', className: 'text-center', width: '250px' },
-      { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
+
-      { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '付款方式', render: 'payeeName', className: 'text-center', width: '180px' },
-      { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
+      { title: '车队长', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
+      { title: '收款账户', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '收款银行', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
-      { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
+      { title: '银行流水号', render: 'driver', className: 'text-center', width: '150px' },
-      { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '实际支付金额', render: 'total', className: 'text-center', width: '150px' },
-      { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
+      { title: '交易时间', render: 'payeeName', className: 'text-center', width: '150px' },
-      { 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: '车辆轨迹', 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' },
     ];
@@ -320,12 +273,21 @@ export class DatatableFundReportingComponent implements OnInit {
       this.openWainingModal('请选择需要撤回的数据');
       return;
     }
-
+    this.modal.confirm({
-    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      nzTitle: '撤回提示',
-      if (res) {
+      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-        this.search();
+      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();
+          }
+        })
       }
-    })
+    });
+
 
   }
 
@@ -375,6 +337,12 @@ export class DatatableFundReportingComponent 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();
+      }
+    })
   }
 
 

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html

@@ -28,7 +28,7 @@
   <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">
+    [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>
@@ -42,6 +42,13 @@
     <ng-template st-row="amount" let-item let-index="index">
       <div class="text-right">{{item?.amount | currency :' '}}</div>
     </ng-template>
+
+    <ng-template st-row="car" let-item let-index="index">
+      <a (click)="viewAuditResult(item)">查看轨迹</a>
+    </ng-template>
+    <ng-template st-row="driver" let-item let-index="index">
+      <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">查看轨迹</a>
+    </ng-template>
   </st>
 </nz-card>
 <ng-template #extraTemplate>

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -285,12 +285,12 @@ export class DatatableOrderReportingComponent implements OnInit {
       { 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: 'driver2', 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: 'driver1', 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' },
@@ -302,8 +302,8 @@ export class DatatableOrderReportingComponent implements OnInit {
       { 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: 'car', className: 'text-center', width: '250px' },
-      { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
       { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
       { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
     ];
@@ -320,12 +320,20 @@ export class DatatableOrderReportingComponent implements OnInit {
       this.openWainingModal('请选择需要撤回的数据');
       return;
     }
-
+    this.modal.confirm({
-    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      nzTitle: '撤回提示',
-      if (res) {
+      nzContent: '撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-        this.search();
+      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();
+          }
+        })
       }
-    })
+    });
 
   }
 
@@ -375,6 +383,12 @@ export class DatatableOrderReportingComponent 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();
+      }
+    })
   }
 
 

src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html

@@ -7,7 +7,8 @@
   <div style="width: 90%;">
     <st #st [scroll]="{x:'1000px'}" [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: false}" [loading]="false">
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: 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>

src/app/routes/datatable/services/data.service.ts

@@ -31,6 +31,10 @@ export class DataService extends BaseService {
   $api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`;
   // 业绩报表柱状图
   $api_performanceReportHistogram = `/api/sdc/report/performanceReportHistogram`;
+
+  // 查询开票数据报表
+  $api_findInvoiceReport = `/api/fcc/invoiceReport/findInvoiceReport`;
+
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/download/components/list/list.component.ts

@@ -8,7 +8,7 @@ import { DownloadService } from '../../services/download.service';
 
 @Component({
   selector: 'app-download-center-components-list',
-  templateUrl: './list.component.html',
+  templateUrl: './list.component.html'
 })
 export class DownloadComponentsListComponent implements OnInit {
   ui: SFUISchema = {};
@@ -24,7 +24,7 @@ export class DownloadComponentsListComponent implements OnInit {
   get reqParams() {
     const params = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { ...params };
+    return { ...params, createTime: params?.createTime?.start, applyEndTime: params?.createTime?.end };
   }
 
   /**
@@ -49,23 +49,18 @@ export class DownloadComponentsListComponent implements OnInit {
       properties: {
         _$expand: {
           type: 'boolean',
-          ui: { hidden: true },
+          ui: { hidden: true }
         },
-        applyStartTime: {
+        createTime: {
           type: 'string',
           title: '创建时间',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to',
-            format: 'yyyy-MM-dd',
+            type: 'date',
-            end: 'applyEndTime',
+            format: 'yyyy-MM-dd'
-          } as SFDateWidgetSchema,
+          } as SFDateWidgetSchema
-        },
+        }
-        applyEndTime: {
+      }
-          type: 'string',
-          title: '',
-          ui: { widget: 'date', end: 'end' } as SFDateWidgetSchema,
-        },
-      },
     };
     this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } };
   }
@@ -87,8 +82,8 @@ export class DownloadComponentsListComponent implements OnInit {
         enum: {
           0: '生成中',
           1: '已完成',
-          2: '失败',
+          2: '失败'
-        },
+        }
       },
       { title: '下载次数', index: 'downloadCount', width: '120px', className: 'text-center' },
       { title: '创建时间', index: 'createTime', width: '120px', className: 'text-center' },
@@ -98,10 +93,8 @@ export class DownloadComponentsListComponent implements OnInit {
         fixed: 'right',
         width: '170px',
         className: 'text-center',
-        buttons: [
+        buttons: [{ text: '下载', click: _record => this.download(_record) }]
-          { text: '下载', click: (_record) => this.download(_record)},
+      }
-        ],
-      },
     ];
   }
 
@@ -115,12 +108,12 @@ export class DownloadComponentsListComponent implements OnInit {
       nzTitle: '<i>删除确认</i>',
       nzContent: `<b>即将删除 当前行数据,请仔细核对,避免误操作！<br>是否删除？</br>`,
       nzOnOk: () =>
-        this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe((res) => {
+        this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe(res => {
           if (res) {
             this.service.msgSrv.success('数据删除成功！');
             this.st?.reload();
           }
-        }),
+        })
     });
   }
   download(record: STData) {
@@ -129,7 +122,7 @@ export class DownloadComponentsListComponent implements OnInit {
       this.service.encodeUrlHeader(this.service.$api_download_file, headers),
       {},
       { fileKey: record.fileUniqueKey },
-      'POST',
+      'POST'
     );
   }
 }

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 14:30:12
+ * @LastEditTime : 2022-03-30 09:35:49
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -222,7 +222,7 @@
     </ng-template>
   </div>
 </nz-card>
-<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
+<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset >
     <nz-tab nzTitle="风险异常检测">
       <button nz-button nzType="primary"[disabled]="">申 诉</button>

src/app/routes/order-management/components/complaint/complaint.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 16:13:40
+ * @LastEditTime : 2022-03-30 13:44:53
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -54,6 +54,10 @@
     <ng-template st-row="complaintCode" let-item let-index="index">
       <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
     </ng-template>
+    <ng-template st-row="complaintCauseLabel" let-item let-index="index">
+     <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
+     <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
+    </ng-template>
     </st>
   </div>
 </nz-card>

src/app/routes/order-management/components/complaint/complaint.component.ts

@@ -23,15 +23,15 @@ export class OrderManagementComplaintComponent implements OnInit {
   _$expand = false;
   channelId: any;
   resourceStatus: any;
-  selectedMainTabStatus = '1';
+  selectedMainTabStatus = '2';
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
   selectedIndex: number = 0;
   mainTabs = [
-    { name: '司机投诉', status: '1' },
+    { name: '司机投诉', status: '2' },
-    { name: '货主投诉', status: '2' },
+    { name: '货主投诉', status: '1' },
   ]
   tabs = [  {
     name: '全部',
@@ -54,11 +54,14 @@ export class OrderManagementComplaintComponent implements OnInit {
     public service: OrderManagementService,
     private modal: NzModalService,
     private router: Router
-     ) {     if (this.selectedIndex === 0) {
+     ) {   
-      this.selectedMainTabStatus = '1';
+    //    console.log(this.selectedIndex);
-    } else if (this.selectedIndex === 1) {
+    //   if (this.selectedIndex === 0) {
-      this.selectedMainTabStatus = '2';
+    //   this.selectedMainTabStatus = '2';
-    }}
+    // } else if (this.selectedIndex === 1) {
+    //   this.selectedMainTabStatus = '1';
+    // }
+  }
 
   /**
  * 查询参数
@@ -69,10 +72,8 @@ export class OrderManagementComplaintComponent implements OnInit {
       a.complaintStatus = this.resourceStatus 
     }
     if(this.selectedMainTabStatus) {
-      a.complaintType = this.selectedMainTabStatus
+      a.complainantParty = this.selectedMainTabStatus
     }
-    console.log( this.sf?.value);
-    
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
@@ -156,7 +157,7 @@ export class OrderManagementComplaintComponent implements OnInit {
         title: '投诉原因',
         className: 'text-center',
         width: '170px',
-        index: 'complaintCauseLabel'
+        render: 'complaintCauseLabel'
       },
       {
         title: '投诉状态',
@@ -264,6 +265,7 @@ export class OrderManagementComplaintComponent implements OnInit {
    * 切换投诉与被投诉tab
    */
      selectMainTab(e: any) {
+       console.log(e);
       console.log(this.selectedIndex);
       this.selectedMainTabStatus = e?.status;
       this.initST();

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -544,16 +544,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
       nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
       nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
       nzOnOk: () =>
-        this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => {
+        // this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => {
-          if (res === true) {
+        //   if (res === true) {
-            this.service.msgSrv.success('操作成功！');
+        //     this.service.msgSrv.success('操作成功！');
-            this.st?.reload(1);
+        //     this.st?.reload(1);
-            this.getGoodsSourceStatistical();
+        //     this.getGoodsSourceStatistical();
-            this.initST();
+        //     this.initST();
-          }
+        //   }
-          this.st?.reload(1);
+        //   this.st?.reload(1);
-          this.getGoodsSourceStatistical();
+        //   this.getGoodsSourceStatistical();
-        })
+        // })
+    {   
+       this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params})
+
+       
+       this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})}
+        
     });
   }
    // 获取所属项目

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-03-28 20:31:30
+ * @LastEditTime : 2022-03-30 09:36:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -229,7 +229,7 @@
     </ng-template>
   </div>
 </nz-card>
-<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
+<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset >
     <nz-tab nzTitle="风险异常检测">
       <button nz-button nzType="primary"[disabled]="">申 诉</button>

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-28 11:07:48
+ * @LastEditTime : 2022-03-30 16:08:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -163,6 +163,15 @@ export class OrderManagementService extends ShipperBaseService {
   // 异常预警
   public $api_getAbnormalWarningByBillId = '/api/sdc/abnormalWarning/getAbnormalWarningByBillId';
 
+  // 生成卸货单
+  public $api_createBillDischargeGoods = '/api/sdc/billOperate/createBillDischargeGoods';
+  // 生成提货单
+  public $api_createBillTakeGoods = '/api/sdc/billOperate/createBillTakeGoods';
+  // 生成卸货单-页面展示
+  public $api_getBillDischargeGoodsVO = '/api/sdc/billOperate/getBillDischargeGoodsVO';
+  // 生成提货单-页面展示
+  public $api_getBillTakeGoodsVO = '/api/sdc/billOperate/getBillTakeGoodsVO';
+
   getDictByKey(dictKey: string) {
     const params = { dictKey: dictKey };
     return this.request(this.$api_getDictValue, params);

src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html

@@ -0,0 +1,13 @@
+<h2>转移客户数：{{changeST?.total}}</h2>
+<st #changeST [data]="service.$api_get_partner_change_list" [columns]="columns.changeColumn"
+    [req]="{params:{id:id ,type:1}}" [loading]="service.http.loading" bordered size="small"
+    [page]="{ show: false }" [scroll]="{ x: '750px' }">
+</st>
+<h2>不转移客户数：{{noChangeST?.total}}</h2>
+<st #noChangeST [data]="service.$api_get_partner_change_list" [columns]="columns.beChangeColumn"
+    [req]="{params:{id:id ,type:2}}" [res]="{reName: { list: 'data' }}"
+    [loading]="service.http.loading" bordered size="small" [page]="{ show: false }" [scroll]="{ x: '750px' }">
+</st>
+<p>
+    客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
+</p>

src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts

@@ -0,0 +1,34 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { STColumn } from '@delon/abc/st';
+import { PartnerListService } from '../../services/partner-list.service';
+
+@Component({
+  selector: 'app-channel-log-modal',
+  templateUrl: './channel-log-modal.component.html'
+})
+export class ChannelLogModalComponent implements OnInit {
+  columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
+  id = '';
+  constructor(public service: PartnerListService, public route: ActivatedRoute) {}
+
+  ngOnInit(): void {}
+
+  private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
+    return {
+      changeColumn: [
+        { title: '客户名称', index: 'payCode', width: 180 },
+        { title: '合伙人', index: 'ltdName', width: 160 },
+        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
+        { title: 'CRM审核状态', index: 'payDate', width: 150 },
+        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+      ],
+      beChangeColumn: [
+        { title: '客户名称', index: 'payCode', width: 180 },
+        { title: '合伙人', index: 'ltdName', width: 160 },
+        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
+        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+      ]
+    };
+  }
+}

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html

@@ -269,7 +269,6 @@
     </sv>
   </sv-container>
   <nz-divider></nz-divider>
-  <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>渠道销售信息</sv-title>
     <sv label="姓名"> {{ detailData?.channelName }} </sv>
@@ -282,7 +281,7 @@
   <sv-container col="3" class="mt16">
     <sv-title>修改渠道销售记录</sv-title>
     <sv label="">
-      <st #st [data]="service.$api_get_personal_channel_list" [columns]="columns.logsColumn"
+      <st #st [data]="service.$api_get_personal_channel_list" [columns]="columns"
         [req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small"
         [page]="{ show: false }" [scroll]="{ x: '1200px' }">
       </st>
@@ -317,19 +316,3 @@
     </div>
   </nz-upload>
 </ng-template>
-
-<ng-template #logModal>
-  <h2>转移客户数：{{changeST?.total}}</h2>
-  <st #changeST [data]="service.$api_get_partner_change_list" [columns]="columns.changeColumn"
-    [req]="{params:{partnerId:route.snapshot.params.id ,type:1}}" [loading]="service.http.loading" bordered size="small"
-    [page]="{ show: false }" [scroll]="{ x: '750px' }">
-  </st>
-  <h2>不转移客户数：{{noChangeST?.total}}</h2>
-  <st #noChangeST [data]="service.$api_get_partner_change_list" [columns]="columns.beChangeColumn"
-    [req]="{params:{partnerId:route.snapshot.params.id ,type:2}}" [res]="{reName: { list: 'data' }}"
-    [loading]="service.http.loading" bordered size="small" [page]="{ show: false }" [scroll]="{ x: '750px' }">
-  </st>
-  <p>
-    客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
-  </p>
-</ng-template>

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts

@@ -9,6 +9,7 @@ import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
 import { Subscription, fromEvent } from 'rxjs';
 
 import { PartnerListService } from '../../services/partner-list.service';
+import { ChannelLogModalComponent } from '../channel-log-modal/channel-log-modal.component';
 import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
 
 @Component({
@@ -18,12 +19,10 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit
   providers: [DatePipe]
 })
 export class PartnerDetailComponent implements OnInit, OnDestroy {
-  @ViewChild('logModal')
-  logModal: any;
   @ViewChild('areaTreeSelect')
   areaTreeSelect!: NzTreeSelectComponent;
 
-  columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
+  columns: STColumn[] = this.initST();
 
   detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } };
   tempalateData = { ...this.detailData };
@@ -145,16 +144,6 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
     });
   }
 
-  showChangeDetail() {
-    const modal = this.nzModalService.create({
-      nzTitle: '详情',
-      nzContent: this.logModal,
-      nzNoAnimation: true,
-      nzWidth: 700,
-      nzFooter: null
-    });
-  }
-
   ratify() {
     this.isEdit = true;
     // 搜索展开省份并选中节点
@@ -365,41 +354,26 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
     });
   }
 
-  private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
+  private initST(): STColumn[] {
-    return {
+    return [
-      logsColumn: [
+      { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 },
-        { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 },
+      { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 },
-        { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 },
+      { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
-        { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
+      { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
-        { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
+      { title: '备注', index: 'remark', className: 'text-center', width: 150 },
-        { title: '备注', index: 'remark', className: 'text-center', width: 150 },
+      { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' },
-        { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' },
+      { title: '操作人', index: 'modifyUserIdLabel', width: 180 },
-        { title: '操作人', index: 'modifyUserIdLabel', width: 180 },
+      {
-        {
+        title: '操作',
-          title: '操作',
+        fixed: 'right',
-          fixed: 'right',
+        width: '140px',
-          width: '140px',
+        buttons: [
-          buttons: [
+          {
-            {
+            text: '详情',
-              text: '详情',
+            click: (item) => this.service.showChangeDetail(item.id)
-              click: () => this.showChangeDetail()
+          }
-            }
+        ]
-          ]
+      }
-        }
+    ];
-      ],
-      changeColumn: [
-        { title: '客户名称', index: 'payCode', width: 180 },
-        { title: '合伙人', index: 'ltdName', width: 160 },
-        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
-        { title: 'CRM审核状态', index: 'payDate', width: 150 },
-        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
-      ],
-      beChangeColumn: [
-        { title: '客户名称', index: 'payCode', width: 180 },
-        { title: '合伙人', index: 'ltdName', width: 160 },
-        { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
-        { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
-      ]
-    };
   }
 }

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html

@@ -151,6 +151,25 @@
       </ng-template>
     </sv>
   </sv-container>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>渠道销售信息</sv-title>
+    <sv label="姓名"> {{ detailData?.channelName }} </sv>
+    <sv label="手机号"> {{ detailData?.channelMobile }} </sv>
+    <sv label="绑定时间"> {{ detailData?.bindChannelTime }} </sv>
+  </sv-container>
+</nz-card>
+
+<nz-card>
+  <sv-container col="3" class="mt16">
+    <sv-title>修改渠道销售记录</sv-title>
+    <sv label="">
+      <st #st [data]="service.$api_get_personal_channel_list" [columns]="columns"
+        [req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small"
+        [page]="{ show: false }" [scroll]="{ x: '1200px' }">
+      </st>
+    </sv>
+  </sv-container>
 </nz-card>
 
 <ng-template #PopconfirmTempalte let-title="title" let-content="content">

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

@@ -21,6 +21,8 @@ export class PersonalPartnerDetailComponent implements OnInit {
   @ViewChild('areaTreeSelect')
   areaTreeSelect!: NzTreeSelectComponent;
 
+  columns: STColumn[] = this.initST();
+
   detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } };
   tempalateData = { ...this.detailData };
 
@@ -35,7 +37,7 @@ export class PersonalPartnerDetailComponent implements OnInit {
 
   constructor(
     public service: PartnerListService,
-    private route: ActivatedRoute,
+    public route: ActivatedRoute,
     private nzModalService: NzModalService,
     private datePipe: DatePipe
   ) {}
@@ -266,4 +268,27 @@ export class PersonalPartnerDetailComponent implements OnInit {
       }
     });
   }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 },
+      { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 },
+      { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
+      { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
+      { title: '备注', index: 'remark', className: 'text-center', width: 150 },
+      { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' },
+      { title: '操作人', index: 'modifyUserIdLabel', width: 180 },
+      {
+        title: '操作',
+        fixed: 'right',
+        width: '140px',
+        buttons: [
+          {
+            text: '详情',
+            click: (item) => this.service.showChangeDetail(item.id)
+          }
+        ]
+      }
+    ];
+  }
 }

src/app/routes/partner/partner-list/services/partner-list.service.ts

@@ -2,6 +2,7 @@ import { Injectable, Injector } from '@angular/core';
 import { BaseService, EACacheService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ImageViewComponent } from 'src/app/shared/components/imagelist';
+import { ChannelLogModalComponent } from '../components/channel-log-modal/channel-log-modal.component';
 
 @Injectable()
 export class PartnerListService extends ShipperBaseService {
@@ -34,7 +35,7 @@ export class PartnerListService extends ShipperBaseService {
   // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改
   $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck';
   // 根据手机号查询实名信息
-  $api_get_identityInfo_by_mobile= '/api/mdc/cuc/identityInfo/getByMobile';
+  $api_get_identityInfo_by_mobile = '/api/mdc/cuc/identityInfo/getByMobile';
   // 渠道销售修改详情
   $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList';
   // 冻结/启用企业业
@@ -60,4 +61,15 @@ export class PartnerListService extends ShipperBaseService {
     };
     this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
   }
+
+  showChangeDetail(id: string) {
+    const modal = this.nzModalService.create({
+      nzTitle: '详情',
+      nzContent: ChannelLogModalComponent,
+      nzComponentParams: { id },
+      nzNoAnimation: true,
+      nzWidth: 800,
+      nzFooter: null
+    });
+  }
 }

src/app/routes/partner/partner.module.ts

@@ -62,6 +62,7 @@ import { PersonalPartnerDetailComponent } from './partner-list/components/person
 import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
 import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component';
+import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -113,7 +114,8 @@ const COMPONENTS: any[] = [
   PersonalPartnerDetailComponent,
   ParterAdviceFeedbackListComponent,
   ParterAdviceFeedbackDetailComponent,
-  ParterRebateManageMentAddPartnerListComponent
+  ParterRebateManageMentAddPartnerListComponent,
+  ChannelLogModalComponent
 ];
 
 @NgModule({

src/app/routes/routes-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-13 19:22:47
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 17:24:24
+ * @LastEditTime : 2022-03-30 14:09:00
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -75,7 +75,9 @@ const routes: Routes = [
         path: 'download',
         loadChildren: () => import('./download/download.module').then(m => m.DownloadModule)
       },
-      { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },]
+      { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },
+      { path: 'tax', loadChildren: () => import('./tax-management/taxmanagement.module').then((m) => m.TaxManagementModule) },
+    ]
   },
   // passport
   {

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -528,7 +528,7 @@ export class NetworkFreightComponent implements OnInit {
   }
   // 应用设置
   settingApp(item?: any) {
-    this.nzModalService.create({
+    const modalRef = this.nzModalService.create({
       nzTitle: '应用设置',
       nzContent: DynamicSettingModalComponent,
       nzWidth: 900,
@@ -539,6 +539,12 @@ export class NetworkFreightComponent implements OnInit {
       },
       nzFooter: null
     });
+    modalRef.afterClose.subscribe((res: boolean) => {
+      if (res) {
+        this.resetSF;
+        this.st.load();
+      }
+    })
   }
   // 重置账户
   settingPay(item?: any) {

src/app/routes/tax-management/components/individual-income/individual-income.component.html

@@ -0,0 +1,91 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:00:43
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 15:55:06
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+
+<nz-card>
+  <!-- 搜索表单 -->
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [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]="false"
+        (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()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+  <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>
+</nz-card>
+<ng-template #extraTemplate>
+  <div class="d-flex align-items-center">
+    <div class="mr-md">
+      已选择
+      <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)="resetData()">修改起征点</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
+  </div>
+</ng-template>
+
+<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+  <ng-container *nzModalContent>
+    <div> 司机姓名：张三/13812345678 </div>
+    <div> 是否确认要将该司机的起征点同步调整为超过15万？ </div>
+  </ng-container>
+  <ng-template #nzModalFooterEvaluate>
+    <button nz-button nzType="default" (click)="handleCancel()">取消</button>
+    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+  </ng-template>
+</nz-modal>

src/app/routes/tax-management/components/individual-income/individual-income.component.less

@@ -0,0 +1,5 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+}

src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts

@@ -0,0 +1,34 @@
+/*
+ * @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();
+  });
+});

src/app/routes/tax-management/components/individual-income/individual-income.component.ts

@@ -0,0 +1,423 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { 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']
+})
+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;
+  tabs: any[] = [
+    { name: '待申报', value: '1' },
+    { name: '待审核', value: '2' },
+    { name: '已通过', value: '3' },
+    { name: '不通过', value: '4' },
+    { 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
+  ) {}
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {}, {
+      representationsStatus: this.selectedIndex
+    });
+    delete params._$expand;
+    return { ...params };
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item: any) => item.checked) || [];
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+  /**
+   * 程序初始化入口
+   */
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  /**
+   * 初始化查询表单
+   */
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
+        resourceCode: {
+          type: 'string',
+          title: '联系电话',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        driverName: {
+          title: '证件号码',
+          type: 'string',
+          ui: {
+            placeholder: '请输入证件号码'
+          }
+        },
+        serviceType2: {
+          title: '申报状态',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            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
+            }
+          }
+        },
+        serviceType1: {
+          title: '是否逾期',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '税款所属期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTime3: {
+          title: '申报日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        }
+      }
+    };
+    this.ui = {
+      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
+      $time: { grid: { span: 24 } }
+    };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  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',
+        className: 'text-center',
+        width: '150px'
+      },
+      { title: '税款所属期止', render: 'freightDetails', 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: '税率', 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' },
+    ];
+  }
+
+  /**
+   *撤销
+   * @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();
+          }
+        });
+      }
+    });
+  }
+  /**
+   *撤销
+   * @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();
+          }
+        });
+      }
+    });
+  }
+
+  selectChange(item: any) {
+    this.selectedIndex = item?.representationsStatus || '';
+    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('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('申报成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+  /**
+   *
+   * @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);
+  }
+
+  search() {
+    this.st.load(1);
+  }
+
+  /**
+   * 异步导出
+   */
+  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
+    });
+  }
+  handleOK() {
+
+  }
+  handleCancel() {
+      this.isVisible = false;
+  }
+}

src/app/routes/tax-management/components/order-reporting/order-reporting.component.html

@@ -0,0 +1,69 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:00:43
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 15:29:14
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="''"></page-header-wrapper>
+
+<nz-card>
+  <!-- 搜索表单 -->
+  <div nz-row nzGutter="8">
+    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <sf #sf [schema]="schema" [ui]="ui" [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]="false" (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()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
+</nz-card>
+<nz-card>
+  <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>
+</nz-card>
+<ng-template #extraTemplate>
+  <div class="d-flex align-items-center">
+    <div class="mr-md">
+      已选择
+      <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)="resetData()">更新数据</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()">税务设置</button>
+  </div>
+</ng-template>

src/app/routes/tax-management/components/order-reporting/order-reporting.component.less

@@ -0,0 +1,14 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+  .icon {
+    display: inline-block;
+    width: 1em;
+    height: 1em;
+    stroke-width: 0;
+    stroke: currentColor;
+    /* stylelint-disable-next-line order/properties-order */
+    fill: currentColor;
+  }
+}

src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts

@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableOrderReportingComponent } from './order-reporting.component';
+
+describe('DatatableOrderReportingComponent', () => {
+  let component: DatatableOrderReportingComponent;
+  let fixture: ComponentFixture<DatatableOrderReportingComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DatatableOrderReportingComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableOrderReportingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -0,0 +1,473 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { 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 { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component';
+import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component';
+// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
+// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
+
+@Component({
+  selector: 'app-tax-management-order-reporting',
+  templateUrl: './order-reporting.component.html',
+  styleUrls: ['./order-reporting.component.less']
+})
+export class TaxManagementOrderReportingComponent 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: '' }
+  ];
+  selectedIndex = ''; //选择的项目
+  serviceTel = '';
+  constructor(
+    public service: TaxManagementService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    public shipperservice: ShipperBaseService,
+    private modal: NzModalService,
+    public shipperSrv: ShipperBaseService
+  ) {
+  }
+
+  /**
+   * 查询字段个数
+   */
+  get queryFieldCount(): number {
+    return Object.keys(this.schema?.properties || {}).length;
+  }
+
+  /**
+   * 查询参数
+   */
+  get reqParams() {
+    const params = Object.assign({}, this.sf?.value || {}, {
+      representationsStatus: this.selectedIndex,
+    });
+    delete params._$expand;
+    return { ...params };
+  }
+
+  /**
+   * 选中行
+   */
+  get selectedRows() {
+    return this.st?.list.filter((item: any) => item.checked) || [];
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+  /**
+   * 程序初始化入口
+   */
+  ngOnInit() {
+    this.initSF();
+    this.initST();
+  }
+
+  /**
+   * 初始化查询表单
+   */
+  initSF() {
+    this.schema = {
+      properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
+        billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
+        resourceCode: {
+          type: 'string',
+          title: '运单号',
+          ui: {
+            placeholder: '请输入',
+          },
+        },
+        shipperAppUserId: {
+          type: 'string',
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            allowClear: true,
+            onSearch: (q: any) => {
+              let str =q.replace(/^\s+|\s+$/g,"");
+              if (str) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: str })
+                  .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+          
+          } as SFSelectWidgetSchema
+        },
+        driverName: {
+          title: '承运司机',
+          type: 'string',
+          ui: {
+            placeholder: '请输入司机姓名/手机号', visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        carNo: {
+          title: '车牌号',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        carNo3: {
+          title: '收款人',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+      
+        serviceType2: {
+          title: '上传状态',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        serviceType1: {
+          title: '本地校验',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        },
+        createTime: {
+          title: '上传时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
+        createTime3: {
+          title: '结束时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
+      },
+    };
+    this.ui = {
+      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
+      $time: { grid: { span: 24 } },
+    };
+  }
+
+  /**
+   * 初始化数据列表
+   */
+  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',
+        className: 'text-center',
+        width: '150px',
+      },
+      { title: '运单号', render: 'freightDetails', 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: '货物信息', 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' },
+    ];
+  }
+
+
+
+  /**
+   *撤销
+   * @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();
+          }
+        })
+      }
+    });
+
+  }
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  resetData() {
+    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();
+      }
+    })
+  }
+  /**
+   *撤销
+   * @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();
+          }
+        })
+      }
+    });
+
+  }
+
+  selectChange(item: any) {
+    this.selectedIndex = item?.representationsStatus || '';
+    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('请选择需要上传的数据');
+      return;
+    }
+    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+    //   if (res) {
+    //     this.service.msgSrv.success('上传成功');
+    //     this.search();
+    //   }
+    // })
+  }
+
+
+  /**
+   *
+   * @param params 上传设置
+   */
+  uploadSetting() {
+    const modalRef = this.modal.create({
+      nzTitle: '税务上传设置',
+      nzWidth: 600,
+      nzContent: TaxManagementUploadSettingComponent,
+      nzComponentParams: {},
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(res => {
+    })
+  }
+
+  /**
+   * 查看校验结果
+   */
+  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);
+  }
+
+  /**
+  * 异步导出
+  */
+  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,
+    })
+  }
+
+
+}

src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.html

@@ -0,0 +1,8 @@
+<nz-spin [nzSpinning]="!i"></nz-spin>
+<sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
+  <div class="modal-footer">
+    <button nz-button type="button" (click)="close()">取消</button>
+    <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
+      [nzLoading]="service.http.loading">修改</button>
+  </div>
+</sf>

src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.spec.ts

@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableReportingUploadSettingComponent } from './upload-setting.component';
+
+describe('DatatableReportingUploadSettingComponent', () => {
+  let component: DatatableReportingUploadSettingComponent;
+  let fixture: ComponentFixture<DatatableReportingUploadSettingComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DatatableReportingUploadSettingComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableReportingUploadSettingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.ts

@@ -0,0 +1,110 @@
+import { Component, OnInit } from '@angular/core';
+import { SFSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { TaxManagementService } from '../../../services/tax-management.service';
+
+
+@Component({
+  selector: 'app-datatable-upload-setting',
+  templateUrl: './upload-setting.component.html',
+})
+export class TaxManagementUploadSettingComponent implements OnInit {
+  record: any = {};
+  i: any = {};
+  schema!: SFSchema;
+  ui!: SFUISchema;
+
+  constructor(
+    private modal: NzModalRef,
+    public service: TaxManagementService
+  ) { }
+
+  ngOnInit(): void {
+    this.initSF();
+    // this.loadData();
+  }
+
+  /**
+ * 初始化查询表单
+ */
+  initSF() {
+    this.schema = {
+      properties: {
+        no: {
+          type: 'string',
+          title: '订单数据',
+          enum: [
+            {
+              label: '手动上传',
+              value: '1'
+            },
+            {
+              label: '自动上传',
+              value: '2'
+            }
+          ],
+          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
+          ui: {
+            widget: 'radio',
+
+          }
+        },
+        owner: {
+          type: 'string',
+          title: '资金数据',
+          enum: [
+            {
+              label: '手动上传',
+              value: '1'
+            },
+            {
+              label: '自动上传',
+              value: '2'
+            }
+          ],
+          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
+          ui: {
+            widget: 'radio',
+
+          }
+        },
+      },
+      required: ['owner', 'no'],
+    }
+    this.ui = {
+      '*': {
+        spanLabelFixed: 100,
+        grid: { span: 24 },
+      },
+    };
+  }
+
+  /**
+   * 获取设置数据
+   */
+  loadData() {
+    this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => {
+      if (res) {
+        this.i = res;
+
+      }
+    })
+  }
+
+  /**
+   * 修改
+   * @param value
+   */
+  save(value: any): void {
+    this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('保存成功');
+        this.modal.close(true);
+      }
+    })
+  }
+
+  close(): void {
+    this.modal.destroy();
+  }
+}

src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html

@@ -0,0 +1,23 @@
+<div nz-row>
+  <div style="width: 10%;">
+    <nz-tabset [nzTabPosition]="'left'" style="height: 100%;">
+      <nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
+    </nz-tabset>
+  </div>
+  <div style="width: 90%;">
+    <st #st [scroll]="{x:'1000px'}" [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: 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>
+  </div>
+</div>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">取消</button>
+  <button nz-button type="submit" nzType="primary" (click)="update()" [nzLoading]="service.http.loading">修改</button>
+</div>

src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts

@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableReportingVerifyResultComponent } from './verify-result.component';
+
+describe('DatatableReportingVerifyResultComponent', () => {
+  let component: DatatableReportingVerifyResultComponent;
+  let fixture: ComponentFixture<DatatableReportingVerifyResultComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DatatableReportingVerifyResultComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableReportingVerifyResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts

@@ -0,0 +1,94 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 14:26:01
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 14:28:54
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+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 { TaxManagementService } from '../../../services/tax-management.service';
+
+@Component({
+  selector: 'app-tax-management-order-reporting-verify-result',
+  templateUrl: './verify-result.component.html',
+})
+export class TaxManagementOrderVerifyResultComponent 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' },
+    { name: '订单信息', value: '4' },
+  ];
+
+  get reqParams() {
+    return {};
+  }
+  constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
+
+  }
+
+  ngOnInit(): void {
+    this.initST();
+  }
+
+  /**
+ * 初始化数据列表
+ */
+  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: 'orderStatus', className: 'text-center', width: '120px', },
+      { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
+      { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
+    ]
+  }
+
+
+  add(): void {
+    // this.modal
+    //   .createStatic(FormEditComponent, { i: { id: 0 } })
+    //   .subscribe(() => this.st.reload());
+  }
+
+  selectTab(e: any) {
+
+  }
+
+  update() {
+    if (this.record?.billType === '1') {
+      window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
+
+    } else if (this.record.billType === '2') {
+      window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
+    }
+
+
+  }
+  close(): void {
+    this.modalRef.destroy();
+  }
+
+
+}

src/app/routes/tax-management/services/tax-management.service.ts

@@ -0,0 +1,35 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2021-12-27 10:30:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 14:18:01
+ * @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';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TaxManagementService extends BaseService {
+  // 获取货主企业列表
+  public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
+  // 查询运营报表
+  $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
+  $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
+  $api_recall_reporting = ``; // 撤回
+  $api_async_export_order_reporting_list = ``; // 导出订单上报
+  $api_get_upload_setting = ``; // 修改上传设置
+  $api_upload_setting_save = ``; // 修改上传设置
+  constructor(public injector: Injector) {
+    super(injector);
+  }
+}

src/app/routes/tax-management/tax-management-routing.module.ts

@@ -0,0 +1,27 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 13:58:28
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 15:33:48
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\tax-management-routing.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
+import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
+
+
+const routes: Routes = [
+  { path: 'orderReport', component: TaxManagementOrderReportingComponent },
+  { path: 'income', component: TaxManagementIndividualIncomeComponent },
+];
+  
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TaxManagementModuleRoutingModule { }

src/app/routes/tax-management/taxmanagement.module.ts

@@ -0,0 +1,36 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-30 13:58:28
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-30 14:35:17
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\taxmanagement.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { NgModule, Type } from '@angular/core';
+import { SharedModule, SHARED_G2_MODULES } from '@shared';
+import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
+import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
+import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
+import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
+import { TaxManagementModuleRoutingModule } from './tax-management-routing.module';
+
+
+const COMPONENTS: Type<void>[] = [
+  TaxManagementOrderReportingComponent,
+  TaxManagementOrderVerifyResultComponent,
+  TaxManagementUploadSettingComponent,
+  TaxManagementIndividualIncomeComponent
+]
+ 
+
+@NgModule({
+  imports: [
+    SharedModule,
+    TaxManagementModuleRoutingModule,
+    SHARED_G2_MODULES
+  ],
+  declarations: COMPONENTS,
+})
+export class TaxManagementModule { }

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html

@@ -12,7 +12,7 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <!-- <button nz-button> 导出</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -65,7 +65,7 @@
                 <p style="margin: 0;">开户行： {{openInfo?.artobank}}</p>
             </se>
             <se [col]="1" label="服务名称" class="mb-sm">
-                {{openInfo?.vatnameLable}}
+                {{openInfo?.vatnameLabel}}
             </se>
             <se [col]="1" label="发票备注栏" class="mb-sm">
                 {{openInfo?.vatremarks}}

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -99,7 +99,7 @@
         <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
           <button nz-button nzType="primary" [nzLoading]="false" (click)="costST?.load(1)">查询</button>
           <button nz-button (click)="resetSF(2)">重置</button>
-          <button nz-button> 导出</button>
+          <!-- <button nz-button> 导出</button> -->
         </div>
       </div>
 

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html

@@ -83,7 +83,7 @@
             class="text-right">
             <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <!-- <button nz-button> 导出</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -50,6 +50,8 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   }
 
   beforeReq = (requestOptions: STRequestOptions) => {
+    this.totalCallNo = '0';
+    this.selectedRows = [];
     Object.assign(requestOptions.body, { vatappHId: this.id });
     if (this.sf) {
       Object.assign(requestOptions.body, { ...this.sf.value });
@@ -58,7 +60,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   };
 
   afterRes = (data: any[], rawData?: any) => {
-    this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2);
+    // this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2);
     return data.map(item => ({
       ...item
     }));

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html

@@ -20,7 +20,7 @@
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
       <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button> 导出</button>
+      <!-- <button nz-button> 导出</button> -->
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts

@@ -119,17 +119,18 @@ export class InvoiceRequestedComponent {
       this.service.msgSrv.warning('请选择开票申请');
       return;
     }
-    if (item.find(item => item.sts !== '1')) {
+    // if (item.find(item => item.sts !== '1')) {
-      this.service.msgSrv.warning('请勿选择非待处理订单');
+    //   this.service.msgSrv.warning('请勿选择非待处理订单');
-      return;
+    //   return;
-    }
+    // }
     const modal = this.nzModalService.create({
       nzTitle: '修改地址',
       nzContent: UpdateAddressModalComponent,
       nzOkLoading: this.service.http.loading,
       nzOnOk: component => {
         if (!component.sf.valid) {
-          this.service.msgSrv.warning('表单校验错误');
+          component.sf.validator({ emitError: true });
+          // this.service.msgSrv.warning('表单校验错误');
           return false;
         }
         this.service

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -334,7 +334,7 @@
         {{ userIdentityDetail?.name }}
       </se>
       <se [col]="1" label="备注" required>
-        <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion"></textarea>
+        <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion" placeholder="请输入驳回原因"></textarea>
       </se>
     </div>
   </div>

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -23,7 +23,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   detailData: any;
   userDetail: any;
   contencarModel: any;
-  changeSub = new Subject<string>();
   facetext: any;
   faceStatus: any = 0;
   userIdentityDetail: any = {};
@@ -76,7 +75,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   ngOnInit() {
     this.initData();
     this.initDetailByCode();
-    this.changeEndKmAction()
   }
   initData() {
     // 获取司机头部信息
@@ -191,6 +189,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       nzContent: this.redectModal,
       nzOnOk: () => {
         if (!this.approvalOpinion) {
+          this.service.msgSrv.warning('请填写备注');
           return false;
         }
         this.adjuctUser(
@@ -209,25 +208,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
 
   /** 审核通过驾驶员信息 */
   approveDriver() {
+    
     this.nzModalService.confirm({
       nzTitle: '审核通过',
       nzContent: `<p>驾驶证号：${this.driverDetail?.licenseNo}</p><p>从业资格证号：${this.licenseDetail?.licenseNo}</p><p>是否确认通过审核`,
       nzOnOk: () => {
-        this.changeEndKmAction()
+        this.adjuctDriverLicense(
+          {
+            approvalStatus: 20,
+            appUserId: this.userDetail?.appUserId
+          },
+          '审核成功'
+        );
       }
     });
   }
-  changeEndKmAction() {
+ 
-    this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
-      this.adjuctDriverLicense(
-        {
-          approvalStatus: 20,
-          appUserId: this.userDetail?.appUserId
-        },
-        '审核成功'
-      );
-    })
-  }
   /** 驳回驾驶员信息 */
   rejectedDriver() {
     this.approvalOpinion = '';
@@ -331,16 +327,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         return;
       }
     }
-    if (!driverDetail.licenseNo  || !driverDetail.driverModel || !driverDetail.validStartTime || !driverDetail.signingOrganization || !driverDetail.certificatePhotoWatermark) {
+    if (
+      !driverDetail.licenseNo ||
+      !driverDetail.driverModel ||
+      !driverDetail.validStartTime ||
+      !driverDetail.signingOrganization ||
+      !driverDetail.certificatePhotoWatermark
+    ) {
       this.service.msgSrv.warning('请完善驾驶证信息');
       return;
     }
 
-    if (!licenseDetail.licenseNo  || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
+    if (!licenseDetail.licenseNo || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
       this.service.msgSrv.warning('请完善从业资格证信息');
       return;
     }
- 
+
     const params: any = {
       userId: this.route.snapshot.params.id,
       mobile: this.userDetail?.phone,

src/app/routes/vehicle/components/list/carauth/carauth.component.ts

@@ -717,6 +717,8 @@ export class CarSettleCarauthComponent implements OnInit {
     params.roadTransportPhoto = this.detailData.roadTransportPhoto
     delete params.titleA
     delete params.titleB
+    console.log(params);
+    
     this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('添加成功')

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-03-24 13:51:41
+ * @LastEditTime : 2022-03-30 17:31:38
  * @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,7 +30,6 @@
         <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>
@@ -93,12 +92,13 @@
     <sv label="接单数量">
       {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
     </sv>
-    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
+    <sv label="装货数量">
       {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方
     </sv>
-    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
+    <sv  label="卸货数量">
       {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
     </sv>
+    
 </sv-container>
 <div class="mt-md">
   <h4 class="text-md">装货卸货信息

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-29 11:10:08
+ * @LastEditTime : 2022-03-30 17:16:40
  * @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\\vehicle-detail\\vehicle-detail.component.html
@@ -30,7 +30,6 @@
         <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>

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 16:03:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 16:17:28
+ * @LastEditTime : 2022-03-30 16:50:35
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -100,7 +100,7 @@
                                 </ng-container>
                                 <!-- 开关选项 -->
                                 <ng-container *ngSwitchCase="10">
-                                    <nz-switch [ngModel]="item.itemValue" style="margin-left: 26px;"></nz-switch>
+                                    <nz-switch [(ngModel)]="item.itemValue" style="margin-left: 26px;"></nz-switch>
                                 </ng-container>
                                 <!-- 下拉单选 -->
                                 <ng-container *ngSwitchCase="11">

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 16:03:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 19:59:59
+ * @LastEditTime : 2022-03-30 16:50:00
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

src/assets/mocks/menu-data.json

@@ -672,6 +672,21 @@
               "link": "/datatable/invoicetable"
             }
         ]
+        },
+        {
+          "text": "税务管理",
+          "icon": "iconfont icon-hetong-copy",
+          "group": true,
+          "children": [
+            {
+              "text": "订单上报",
+              "link": "/tax/orderReport"
+            },
+            {
+              "text": "个税明细",
+              "link": "/tax/income"
+            }
+        ]
         }
       ]
     }]