资金上报

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

@@ -3,10 +3,8 @@
   <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_fund_valid_result" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams,process: beforeReq }"
     [res]="{ reName: { list: 'data' } }" [page]="{ show: false,showSize:false}" [loading]="false" [bordered]="true">
-    <ng-template st-row="freightDetails" let-item>
+    <ng-template st-row="checkStatus" let-item>
-      <div *ngFor="let item of item.freightDetails">
+      <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
-        <div>{{item.expenseName}}:{{item.price | currency}} </div>
-      </div>
     </ng-template>
   </st>
 </div>

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

@@ -51,16 +51,17 @@ export class DatatableReportingFundInfoComponent implements OnInit {
         width: '10%',
         type: 'enum',
         enum: {
-          '0': '非必填',
+          0: '否',
-          '1': '必填',
+          1: '是',
         },
       },
       { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', },
       {
         title: '本地校验',
-        index: 'checkStatus',
+        render: 'checkStatus',
         className: 'text-center',
         type: 'enum',
+
         enum: {
           '0': '校验中',
           '1': '通过',
@@ -97,6 +98,19 @@ export class DatatableReportingFundInfoComponent implements OnInit {
     this.modalRef.destroy();
   }
 
+  filterCheckStatus(status: number) {
+    switch (status) {
+      case 0:
+        return '校验中';
+      case 1:
+        return '通过';
+      case 2:
+        return '不通过';
+      default:
+        return '';
+
+    }
+  }
 
 
 }

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

@@ -116,7 +116,7 @@ export class DatatableFundReportingComponent implements OnInit {
           title: '承运司机',
           type: 'string',
           ui: {
-            placeholder: '请输入司机姓名/手机号', visibleIf: {
+            placeholder: '请输入司机姓名', visibleIf: {
               _$expand: (value: boolean) => value,
             },
           }
@@ -169,7 +169,7 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           }
         },
-        enterpriseInfoId: {
+        ltdId: {
           title: '网络货运人',
           type: 'string',
           ui: {

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

@@ -31,24 +31,25 @@
     [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"
     (change)="changeSt($event)">
     <ng-template st-row="orderCheckStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)"
+      <a *ngIf="item?.orderCheckStatus === 2"
-        *ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
+        (click)="viewAuditResult(item)">{{filterStatus(item?.orderCheckStatus)}}</a>
-      <span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
+      <span *ngIf="item?.orderCheckStatus !== 2">{{filterStatus(item?.orderCheckStatus)}}</span>
     </ng-template>
     <ng-template st-row="driverCheckStatus" let-item let-index="index">
       <a (click)="viewAuditResult(item)"
-        *ngIf="item?.driverCheckStatus === '2'">{{filterStatus(item?.driverCheckStatus)}}</a>
+        *ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}}</a>
-      <span *ngIf="item?.driverCheckStatus !== '2'">{{filterStatus(item?.driverCheckStatus)}}</span>
+      <span *ngIf="item?.driverCheckStatus !== 2">{{filterStatus(item?.driverCheckStatus)}}</span>
     </ng-template>
     <ng-template st-row="carCheckStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === '2'">{{filterStatus(item?.carCheckStatus)}}</a>
+      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === 2">{{filterStatus(item?.carCheckStatus)}}</a>
-      <span *ngIf="item?.carCheckStatus !== '2'">{{filterStatus(item?.carCheckStatus)}}</span>
+      <span *ngIf="item?.carCheckStatus !== 2">{{filterStatus(item?.carCheckStatus)}}</span>
     </ng-template>
 
     <ng-template st-row="checkStatus" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterCheckStatus(item?.checkStatus)}}</a>
+      <a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
+      <span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
     </ng-template>
+
     <ng-template st-row="billCode" let-item>
       <span class="text-red-dark">{{item?.billCode}}</span>
     </ng-template>

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

@@ -29,8 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit {
     { name: '异常', value: '4' },
     { name: '全部', value: '' }
   ];
-  selectedIndex = ''; //选择的项目
+  selectedIndex = '1';
-  serviceTel = '';
   isLoading: boolean = false;
   selectedRows: any[] = [];
   constructor(
@@ -54,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
    */
   get reqParams() {
     const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex,
+      putStatus: this.selectedIndex,
     });
     delete params._$expand;
     return { ...params };
@@ -407,7 +406,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   }
 
   selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    this.selectedIndex = item?.value || '';
     setTimeout(() => {
       this.selectedRows = [];
       this.st.load(1);
@@ -555,7 +554,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       return;
     }
     const ids = this.selectedRows.map(i => i?.id);
-    this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => {
+    this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
       if (res) {
         this.selectedRows = [];
         this.st.reload();
@@ -567,11 +566,11 @@ export class DatatableOrderReportingComponent implements OnInit {
   filterStatus(status: number) {
     switch (status) {
       case 0:
-        return '校验中';
+        return '待上传';
       case 1:
-        return '通过';
+        return '已上传';
       case 2:
-        return '不通过';
+        return '上传异常';
       default:
         return '';
 

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

@@ -5,14 +5,12 @@
     </nz-tabset>
   </div>
   <div style="width: 90%;">
-    <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
+    <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
-      [bordered]="true">
+      [loading]="false" [bordered]="true">
-      <ng-template st-row="freightDetails" let-item>
+      <ng-template st-row="checkStatus" let-item>
-        <div *ngFor="let item of item.freightDetails">
+        <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
-          <div>{{item.expenseName}}:{{item.price | currency}} </div>
-        </div>
       </ng-template>
     </st>
   </div>

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

@@ -1,8 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STColumn, STComponent } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
 
@@ -11,26 +9,22 @@ import { ReportingService } from '../../services/reporting.service';
   templateUrl: './verify-result.component.html',
 })
 export class DatatableReportingVerifyResultComponent implements OnInit {
-  url = `/user`;
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
   @ViewChild('st') private readonly st!: STComponent;
   columns: STColumn[] = [];
-  record: any = {}
+  record: any = {};
-  tabs: any[] = [
-    { name: '订单信息', value: '1' },
-    { name: '司机信息', value: '2' },
-    { name: '车辆信息', value: '3' },
-  ];
 
+  tabs: any[] = [
+    { name: '订单信息', value: 3 },
+    { name: '司机信息', value: 2 },
+    { name: '车辆信息', value: 4 },
+  ];
+  subjectType = 3;
+  subjectId = '';
   get reqParams() {
-    return {};
+    return {
+      subjectType: this.subjectType,
+      subjectId: this.record?.id
+    };
   }
   constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
 
@@ -46,13 +40,31 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '序号', type: 'no', className: 'text-center', width: '60px', },
-      { title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', },
+      { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', },
-      { title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', },
+      { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', },
       { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
+      {
-      { title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', },
+        title: '是否必填',
-      { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
+        index: 'requiredStatus',
-      { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
+        className: 'text-center',
+        width: '100px',
+        type: 'enum',
+        enum: {
+          0: '否',
+          1: '是'
+        }
+      },
+      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
+      {
+        title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
+        type: 'enum',
+        enum: {
+          0: '校验中',
+          1: '通过',
+          2: '不通过'
+        }
+      },
+      { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
     ]
   }
 
@@ -64,7 +76,10 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   }
 
   selectTab(e: any) {
-
+    setTimeout(() => {
+      this.subjectType = e?.value;
+      this.st.load(1);
+    })
   }
 
   update() {
@@ -77,9 +92,23 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
 
 
   }
+
+
   close(): void {
     this.modalRef.destroy();
   }
+  filterCheckStatus(status: number) {
+    switch (status) {
+      case 0:
+        return '校验中';
+      case 1:
+        return '通过';
+      case 2:
+        return '不通过';
+      default:
+        return '';
 
+    }
+  }
 
 }

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

@@ -6,12 +6,14 @@ import { BaseService } from '@shared';
 })
 export class ReportingService extends BaseService {
 
-  $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报列表
+  $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表
   $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报
   $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置
   $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置
+  $api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果
+  $api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据
 
   $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表
   $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传