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

2022-03-29 17:59:01 +08:00
parent b91095ed9a 28087d6363
commit bd55b5fd74
37 changed files with 1020 additions and 141 deletions
--- a/src/app/routes/datatable/datatable-routing.module.ts
+++ b/src/app/routes/datatable/datatable-routing.module.ts
@ -12,6 +12,7 @@ import { DatatableFinancetableComponent } from './components/financetable/financ
 import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component';
 import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component';
 import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component';
+import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component';

 const routes: Routes = [
  { path: 'dataindex', component: DatatableDataindexComponent },
@ -26,8 +27,10 @@ const routes: Routes = [
  { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent },
  { path: 'financetable', component: DatatableFinancetableComponent },
  { path: 'invoicetable', component: DatatableInvoicetableComponent },
+  { path: 'reporting/fund', component: DatatableFundReportingComponent }
 ];
  
+
@NgModule({
  imports: [RouterModule.forChild(routes)],
  exports: [RouterModule]
--- a/src/app/routes/datatable/datatable.module.ts
+++ b/src/app/routes/datatable/datatable.module.ts
@ -14,6 +14,9 @@ import { DatatableFinancetableComponent } from './components/financetable/financ
 import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component';
 import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component';
 import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component';
+import { DatatableReportingUploadSettingComponent } from './reporting/components/upload-setting/upload-setting.component';
+import { DatatableReportingVerifyResultComponent } from './reporting/components/verify-result/verify-result.component';
+import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component';

 const COMPONENTS: Type<void>[] = [
  DatatableDataindexComponent,
@ -28,8 +31,12 @@ const COMPONENTS: Type<void>[] = [
  DatatableFinancetableComponent,
  DatatableInvoicetableComponent,
  DatatableComplianceSalesmanComponent,
-  DatatableComplianceCustomerComponent
+  DatatableComplianceCustomerComponent,
+  DatatableReportingUploadSettingComponent,
+  DatatableReportingVerifyResultComponent,
+  DatatableFundReportingComponent
 ]
+ 

@NgModule({
  imports: [
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@ -0,0 +1,57 @@
+<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>
+
+    </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)="uploadSetting()">上传设置</button>
+  </div>
+</ng-template>
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less
@ -0,0 +1,5 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+}
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts
@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DatatableFundReportingComponent } from './fund-reporting.component';
+
+describe('DatatableFundReportingComponent', () => {
+  let component: DatatableFundReportingComponent;
+  let fixture: ComponentFixture<DatatableFundReportingComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DatatableFundReportingComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatatableFundReportingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@ -0,0 +1,445 @@
+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, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { ReportingService } from '../../services/reporting.service';
+import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
+import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
+
+@Component({
+  selector: 'app-datatable-fund-reporting',
+  templateUrl: './fund-reporting.component.html',
+  styleUrls: ['./fund-reporting.component.less']
+})
+export class DatatableFundReportingComponent 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: ReportingService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    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: '请输入',
+          },
+        },
+        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,
+            },
+          }
+        },
+        driverName: {
+          title: '承运司机',
+          type: 'string',
+          ui: {
+            placeholder: '请输入司机姓名/手机号', visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        carNo: {
+          title: '车牌号',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+        serviceType: {
+          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,
+        },
+        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 = {
+      '*': { 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: 'driverStatus', className: 'text-center', width: '120px', },
+      { title: '车辆状态', render: 'carStatus', 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: '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' },
+    ];
+  }
+
+
+
+  /**
+   *撤销
+   * @param record 记录实例
+   */
+  recall() {
+    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.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;
+    }
+  }
+
+
+  /**
+   *
+   * @param params 上传设置
+   */
+  uploadSetting() {
+    const modalRef = this.modal.create({
+      nzTitle: '上传设置',
+      nzWidth: 600,
+      nzContent: DatatableReportingUploadSettingComponent,
+      nzComponentParams: {},
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(res => {
+    })
+  }
+
+  /**
+   * 查看校验结果
+   */
+  viewResult(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '校验结果',
+      nzWidth: 1200,
+      nzContent: DatatableReportingVerifyResultComponent,
+      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,
+    })
+  }
+
+
+}
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@ -29,57 +29,29 @@
    [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="orderSn" let-item let-index="index">
-      <a (click)="view(item)">{{item.billCode}}</a>
+    <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>
+
    </ng-template>
-    <ng-template st-row="freightDetails" let-item>
-      <div *ngFor="let item of item.freightDetails">
-        <div>{{item.expenseName}}:{{item.price | currency}} </div>
-      </div>
+
+    <ng-template st-row="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="loadingPlace" let-item let-index="index">
-      <div *ngFor="let address of item.loadingAddressArr">{{ address }} </div>
-    </ng-template>
-    <ng-template st-row="dischargePlace" let-item let-index="index">
-      <div *ngFor="let address of item.unloadingAddressArr">{{ address }}</div>
-    </ng-template>
-    <ng-template st-row="goodsInfoVOList" let-item>
-      <div *ngFor="let item of item.goodsInfoVOList">
-        <div>货物名称 : {{item.goodsName}}</div>
-        <div>重量/体积 : {{item.weight}}/{{item.volume}}</div>
-        <div>车型/车长 :{{item.carModelLabel}}/{{item.carLengthLabel}}</div>
-      </div>
-    </ng-template>
-    <ng-template st-row="driver" let-item>
-      <div> {{item.driverName}}</div>
-      <div>{{item.driverPhone}}</div>
-      <div>{{item.carNo}}</div>
-    </ng-template>
-    <ng-template st-row="payeeName" let-item>
-      <div>{{item.payeeName}}</div>
-      <div>{{item.payeePhone}}</div>
-    </ng-template>
-    <ng-template st-row="transportInfo" let-item>
-      <div>创建时间:{{item.createTime}}</div>
-      <div>装货时间:{{item.loadTime}}</div>
-      <div>卸货时间:{{item.unloadTime}}</div>
-    </ng-template>
-    <ng-template st-row="billComplianceVOS" let-item>
-      <div *ngFor="let item of item?.billComplianceVOS">{{item?.complianceName}}</div>
-    </ng-template>
-    <ng-template st-row="serviceType" let-item>
-      <div>{{item?.billTypeLabel}} （{{item?.serviceTypeLabel}}） </div>
+    <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="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)="recall()">撤回</button>
    <button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
  </div>
 </ng-template>
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less
@ -0,0 +1,5 @@
+:host {
+  .text-black {
+    color: #000;
+  }
+}
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@ -1,15 +1,17 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
+import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
+import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';

@Component({
  selector: 'app-datatable-order-reporting',
  templateUrl: './order-reporting.component.html',
+  styleUrls: ['./order-reporting.component.less']
 })
 export class DatatableOrderReportingComponent implements OnInit {
  _$expand = false;
@ -226,7 +228,7 @@ export class DatatableOrderReportingComponent implements OnInit {
          ],
          ui: {
            placeholder: '请选择',
-
+            widget: 'select',
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
@ -242,7 +244,7 @@ export class DatatableOrderReportingComponent implements OnInit {
          ],
          ui: {
            placeholder: '请选择',
-
+            widget: 'select',
            visibleIf: {
              _$expand: (value: boolean) => value,
            },
@ -261,11 +263,11 @@ export class DatatableOrderReportingComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      { title: '', type: 'checkbox', className: 'text-center', width: '80px', },
-      { title: '订单状态', index: 'name', className: 'text-center', width: '120px', },
-      { title: '司机状态', index: 'name', className: 'text-center', width: '120px', },
-      { title: '车辆状态', index: 'name', className: 'text-center', width: '120px', },
-      { title: '本地校验', render: 'orderSn', className: 'text-center', width: '180px', },
+      { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
+      { 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: 'billComplianceVOS',
@ -278,71 +280,50 @@ export class DatatableOrderReportingComponent implements OnInit {
        title: '网络货运人',
        render: 'serviceType',
        className: 'text-center',
-        width: '120px',
+        width: '180px',
      },
-      { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' },
-      { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' },
-      { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' },
-      { title: '发货时间', render: 'driver', className: 'text-center', width: '150px' },
-      { title: '收货时间', render: 'payeeName', className: 'text-center', width: '150px' },
+      { 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: '300px' },
-      { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' },
-      { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' },
+      { 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: 'transportInfo', className: 'text-center', width: '250px' },
+      { 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: '250px' },
+      { 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: 'transportInfo', className: 'text-center', width: '180px' },
      { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '250px' },
+      { 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: '250px' },
-      { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '250px' },
-      {
-        title: '操作',
-        width: '200px',
-        className: 'text-center',
-        buttons: [
-          // { text: '编辑', click: (_record: any) => this.appeal(_record) },
-          {
-            text: '申诉',
-            // click: (record) => this.appeal(record),
-            iif: (_record) => _record.representationsStatus === '1',
-            acl: { 'ability': ['RiskOrder-Appeal'] }
-          },
-          {
-            text: '撤销申诉',
-            pop: {
-              title: '是否确定立即撤销申诉？',
-              okType: 'danger',
-            },
-            click: (record) => this.recall(record),
-            iif: (_record) => _record.representationsStatus === '2',
-            acl: { 'ability': ['RiskOrder-CancleAppeal'] }
-          },
-          { text: '详情', click: (_record: any) => this.view(_record), acl: { 'ability': ['RiskOrder-Detail'] } },
-        ],
-      },
+      { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
+      { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
    ];
  }



  /**
-   * 删除单个实例
+   *撤销
   * @param record 记录实例
   */
-  recall(record: STData) {
-    this.service.request(this.service.$api_recall_reporting, { id: record?.id }).subscribe((res: any) => {
+  recall() {
+    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.search({ representationsStatus: '' });
+        this.search();
      }
    })

@ -390,7 +371,10 @@ export class DatatableOrderReportingComponent implements OnInit {
   * 上传
   */
  upload() {
-
+    if (this.selectedRows.length === 0) {
+      this.openWainingModal('请选择需要上传的数据');
+      return;
+    }
  }


@ -399,10 +383,46 @@ export class DatatableOrderReportingComponent implements OnInit {
   * @param params 上传设置
   */
  uploadSetting() {
-
+    const modalRef = this.modal.create({
+      nzTitle: '上传设置',
+      nzWidth: 600,
+      nzContent: DatatableReportingUploadSettingComponent,
+      nzComponentParams: {},
+      nzFooter: null
+    });
+    modalRef.afterClose.subscribe(res => {
+    })
  }

-  search(params = {}) {
+  /**
+   * 查看校验结果
+   */
+  viewResult(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '校验结果',
+      nzWidth: 1200,
+      nzContent: DatatableReportingVerifyResultComponent,
+      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);
  }

@ -413,4 +433,13 @@ export class DatatableOrderReportingComponent implements OnInit {
    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
  }

+  openWainingModal(content: string, title = '提示') {
+    this.modal.warning({
+      nzMask: false,
+      nzTitle: title,
+      nzContent: content,
+    })
+  }
+
+
 }
--- a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html
+++ b/src/app/routes/datatable/reporting/components/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>
--- a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.spec.ts
+++ b/src/app/routes/datatable/reporting/components/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();
+  });
+});
--- a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts
+++ b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts
@ -0,0 +1,109 @@
+import { Component, OnInit } from '@angular/core';
+import { SFSchema, SFUISchema } from '@delon/form';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { ReportingService } from '../../services/reporting.service';
+
+@Component({
+  selector: 'app-datatable-upload-setting',
+  templateUrl: './upload-setting.component.html',
+})
+export class DatatableReportingUploadSettingComponent implements OnInit {
+  record: any = {};
+  i: any = {};
+  schema!: SFSchema;
+  ui!: SFUISchema;
+
+  constructor(
+    private modal: NzModalRef,
+    public service: ReportingService
+  ) { }
+
+  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();
+  }
+}
--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
+++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
@ -0,0 +1,22 @@
+<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">
+      <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>
--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.spec.ts
+++ b/src/app/routes/datatable/reporting/components/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();
+  });
+});
--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
+++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
@ -0,0 +1,85 @@
+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-verify-result',
+  templateUrl: './verify-result.component.html',
+})
+export class DatatableReportingVerifyResultComponent implements OnInit {
+  url = `/user`;
+  searchSchema: SFSchema = {
+    properties: {
+      no: {
+        type: 'string',
+        title: '编号'
+      }
+    }
+  };
+  @ViewChild('st') private readonly st!: STComponent;
+  columns: STColumn[] = [];
+  record: any = {}
+  tabs: any[] = [
+    { name: '订单信息', value: '1' },
+    { name: '司机信息', value: '2' },
+    { name: '车辆信息', value: '3' },
+  ];
+
+  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();
+  }
+
+
+}
--- a/src/app/routes/datatable/reporting/services/reporting.service.ts
+++ b/src/app/routes/datatable/reporting/services/reporting.service.ts
@ -6,9 +6,11 @@ import { BaseService } from '@shared';
 })
 export class ReportingService extends BaseService {

-  $api_order_reporting_page = ``; // 订单上报列表
+  $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);
  }