diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index fabd9c40..0ac5eb06 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/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,8 +29,9 @@ const routes: Routes = [ { path: 'financetable', component: DatatableFinancetableComponent }, { path: 'invoicetable', component: DatatableInvoicetableComponent }, { path: 'reporting/fund', component: DatatableFundReportingComponent } -]; - + , + { path: 'fund-info', component: DatatableReportingFundInfoComponent }]; + @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 000615f8..f361242a 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/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[] = [ DatatableDataindexComponent, @@ -35,8 +36,9 @@ const COMPONENTS: Type[] = [ DatatableReportingUploadSettingComponent, DatatableReportingVerifyResultComponent, DatatableFundReportingComponent -] - + , + DatatableReportingFundInfoComponent] + @NgModule({ imports: [ diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html new file mode 100644 index 00000000..4f50f097 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -0,0 +1,15 @@ + + + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+
+
+ + diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts new file mode 100644 index 00000000..09d9ac30 --- /dev/null +++ b/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; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingFundInfoComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingFundInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts new file mode 100644 index 00000000..ee1f57f6 --- /dev/null +++ b/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(); + } + + +} diff --git 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 index 120c6e21..ff637830 100644 --- 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 @@ -322,7 +322,7 @@ export class DatatableOrderReportingComponent implements OnInit { } this.modal.confirm({ nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传,重新上传会覆盖已上传数据,确定要撤回?', + nzContent: '撤回后可以重新上传,重新上传会覆盖已上传数据,确定要撤回?', nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { diff --git 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 index 5136cd37..e155b1bd 100644 --- 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 @@ -7,7 +7,8 @@
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false" + [bordered]="true">
{{item.expenseName}}:{{item.price | currency}}