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

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

@@ -13,6 +13,7 @@ import { DatatableInvoicetableComponent } from './components/invoicetable/invoic
 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';
+import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
 
 const routes: Routes = [
   { path: 'dataindex', component: DatatableDataindexComponent },
@@ -28,7 +29,8 @@ const routes: Routes = [
   { path: 'financetable', component: DatatableFinancetableComponent },
   { path: 'invoicetable', component: DatatableInvoicetableComponent },
   { path: 'reporting/fund', component: DatatableFundReportingComponent }
-];
+  ,
+  { path: 'fund-info', component: DatatableReportingFundInfoComponent }];
 
 
 @NgModule({

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

@@ -17,6 +17,7 @@ import { DatatableComplianceCustomerComponent } from './components/compliance/cu
 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';
+import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
 
 const COMPONENTS: Type<void>[] = [
   DatatableDataindexComponent,
@@ -35,7 +36,8 @@ const COMPONENTS: Type<void>[] = [
   DatatableReportingUploadSettingComponent,
   DatatableReportingVerifyResultComponent,
   DatatableFundReportingComponent
-]
+  ,
+  DatatableReportingFundInfoComponent]
 
 
 @NgModule({

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/order-reporting/order-reporting.component.ts

@@ -322,7 +322,7 @@ export class DatatableOrderReportingComponent implements OnInit {
     }
     this.modal.confirm({
       nzTitle: '撤回提示',
-      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
+      nzContent: '撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOnOk: () => {

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>