-

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

@@ -10,7 +10,7 @@
       <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
         acl [acl-ability]="['RiskOrder-Search']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button (click)="resetSF()">导出</button>
+      <button nz-button (click)="export()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -30,19 +30,17 @@
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"
     (change)="changeSt($event)">
-    <ng-template st-row="orderCheckStatus" let-item let-index="index">
+    <ng-template st-row="billPutStatus" let-item let-index="index">
-      <a *ngIf="item?.orderCheckStatus === 2"
+      <a *ngIf="item?.billPutStatus === 2" (click)="viewAuditResult(item)">{{filterStatus(item?.billPutStatus)}}</a>
-        (click)="viewAuditResult(item)">{{filterStatus(item?.orderCheckStatus)}}</a>
+      <span *ngIf="item?.billPutStatus !== 2">{{filterStatus(item?.billPutStatus)}}</span>
-      <span *ngIf="item?.orderCheckStatus !== 2">{{filterStatus(item?.orderCheckStatus)}}</span>
     </ng-template>
-    <ng-template st-row="driverCheckStatus" let-item let-index="index">
+    <ng-template st-row="driverPutStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)"
+      <a (click)="viewAuditResult(item)" *ngIf="item?.driverPutStatus === 2">{{filterStatus(item?.driverPutStatus)}}</a>
-        *ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}}</a>
+      <span *ngIf="item?.driverPutStatus !== 2">{{filterStatus(item?.driverPutStatus)}}</span>
-      <span *ngIf="item?.driverCheckStatus !== 2">{{filterStatus(item?.driverCheckStatus)}}</span>
     </ng-template>
-    <ng-template st-row="carCheckStatus" let-item let-index="index">
+    <ng-template st-row="carPutStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === 2">{{filterStatus(item?.carCheckStatus)}}</a>
+      <a (click)="viewAuditResult(item)" *ngIf="item?.carPutStatus === 2">{{filterStatus(item?.carPutStatus)}}</a>
-      <span *ngIf="item?.carCheckStatus !== 2">{{filterStatus(item?.carCheckStatus)}}</span>
+      <span *ngIf="item?.carPutStatus !== 2">{{filterStatus(item?.carPutStatus)}}</span>
     </ng-template>
 
     <ng-template st-row="checkStatus" let-item let-index="index">

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

@@ -277,10 +277,10 @@ export class DatatableOrderReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '订单状态', render: 'orderCheckStatus', className: 'text-center', width: '120px', },
+      { title: '订单状态', render: 'billPutStatus', className: 'text-center', width: '120px', },
-      { title: '司机状态', render: 'driverCheckStatus', className: 'text-center', width: '120px', },
+      { title: '司机状态', render: 'driverPutStatus', className: 'text-center', width: '120px', },
 
-      { title: '车辆状态', render: 'carCheckStatus', className: 'text-center', width: '120px', },
+      { title: '车辆状态', render: 'carPutStatus', className: 'text-center', width: '120px', },
 
       { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
       {
@@ -518,7 +518,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   * 异步导出
   */
   export() {
-    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
+    this.service.exportStart(this.sf?.value, this.service.$api_export_reporting_order);
   }
 
   openWainingModal(content: string, title = '提示') {

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

@@ -14,6 +14,7 @@ export class ReportingService extends BaseService {
   $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置
   $api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果
   $api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据
+  $api_export_reporting_order = `/api/sdc/regulation/asyncExportBillReportList`; // 订单上报导出
 
   $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表
   $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传