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

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

@@ -6,7 +6,6 @@ import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
 import { DatatableReportingFundInfoComponent } from '../fund-info/fund-info.component';
-import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
 
 @Component({
   selector: 'app-datatable-fund-reporting',
@@ -353,21 +352,7 @@ export class DatatableFundReportingComponent implements OnInit {
   }
 
 
-  /**
-   *
-   * @param params 上传设置
-   */
-  uploadSetting() {
-    const modalRef = this.modal.create({
-      nzTitle: '上传设置',
-      nzWidth: 600,
-      nzContent: DatatableReportingUploadSettingComponent,
-      nzComponentParams: {},
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(res => {
-    })
-  }
+
 
   /**
    * 查看校验结果

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

@@ -7,7 +7,7 @@
   <div style="width: 90%;">
     <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', total: 'data.total' } }" [page]="{ show: false,showSize:false}" [loading]="false"
+      [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
       [bordered]="true">
       <ng-template st-row="checkStatus" let-item>
         <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>

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

@@ -23,7 +23,7 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   get reqParams() {
     return {
       subjectType: this.subjectType,
-      subjectId: this.record?.id
+      subjectId: this.record?.orderId
     };
   }
   constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {