From f158c94cca516d26249b999f4d6db5c95606a392 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 26 Jan 2022 14:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receivable-order-detail.component.ts | 2 +- .../components/list/list.component.html | 4 ++-- .../components/list/list.component.ts | 6 +++--- .../components/set/set.component.html | 2 +- .../insurance-management.module.ts | 3 ++- src/app/shared/components/insurance-table/index.ts | 5 +++-- src/app/shared/shared.module.ts | 12 ++++++++++++ 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts index f80e40e9..3f3a30bf 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts @@ -147,7 +147,7 @@ export class ReceivableOrderDetailComponent implements OnInit { // { title: '费用类型', index: 'cnoName', width: 90 }, // { title: '订单费用科目', index: 'feeSubId', width: 100 }, { title: '费用科目', index: 'feeSubId', width: 140 }, - { title: '结算客户', index: 'cno', width: 100 }, + { title: '结算客户', index: 'cnoName', width: 100 }, { title: '已收金额', index: 'ahxmoney', diff --git a/src/app/routes/insurance-management/components/list/list.component.html b/src/app/routes/insurance-management/components/list/list.component.html index 392ee879..e4f1f678 100644 --- a/src/app/routes/insurance-management/components/list/list.component.html +++ b/src/app/routes/insurance-management/components/list/list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 20:01:20 + * @LastEditTime : 2022-01-26 11:08:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -105,7 +105,7 @@
-
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index 59cc68d1..acf45810 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -442,7 +442,7 @@ export class insuranceManagementListComponent implements OnInit { }, { text: '退保费', - click: _record => this.changeOrder(_record), + click: _record => this.changeOrder(), } ] } @@ -472,7 +472,7 @@ export class insuranceManagementListComponent implements OnInit { } // 修改订单 - changeOrder(value: any) { - this.router.navigate(['/insurance-management/list-set', value.id]); + changeOrder() { + this.router.navigate(['/insurance-management/list-set', 1]); } } diff --git a/src/app/routes/insurance-management/components/set/set.component.html b/src/app/routes/insurance-management/components/set/set.component.html index 26789bfa..e803c987 100644 --- a/src/app/routes/insurance-management/components/set/set.component.html +++ b/src/app/routes/insurance-management/components/set/set.component.html @@ -16,5 +16,5 @@ - + diff --git a/src/app/routes/insurance-management/insurance-management.module.ts b/src/app/routes/insurance-management/insurance-management.module.ts index b88a4556..74ffcc31 100644 --- a/src/app/routes/insurance-management/insurance-management.module.ts +++ b/src/app/routes/insurance-management/insurance-management.module.ts @@ -16,7 +16,8 @@ import { insuranceManagementSetComponent } from './components/set/set.component' import { InsuranceManagementRoutingModule } from './insurance-management-routing.module'; const COMPONENTS: Type[] = [ insuranceManagementListComponent, - insuranceManagementSetComponent + insuranceManagementSetComponent, + ]; @NgModule({ diff --git a/src/app/shared/components/insurance-table/index.ts b/src/app/shared/components/insurance-table/index.ts index 2264f1be..cdfd4bca 100644 --- a/src/app/shared/components/insurance-table/index.ts +++ b/src/app/shared/components/insurance-table/index.ts @@ -4,9 +4,10 @@ * @Author : Shiming * @Date : 2022-01-25 20:20:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 20:28:47 + * @LastEditTime : 2022-01-26 11:05:44 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\index.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ export * from './insurance-table.module' -export * from './insurance-table.service' \ No newline at end of file +export * from './insurance-table.service' +export * from './insurance-table.component' \ No newline at end of file diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index acc0ede9..e972b229 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-13 15:10:17 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-26 11:07:31 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\shared.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ /* eslint-disable import/order */ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; @@ -27,6 +37,7 @@ import { ImageListModule } from './components/imagelist'; import { DictSelectComponent } from './components/dict-select'; import { PipeModule } from './pipes'; import { AccountDetailComponent } from './components/account-detail/account-detail.component'; +import { InsuranceTableModule } from './components/insurance-table'; const MODULES = [ AddressModule, @@ -41,6 +52,7 @@ const MODULES = [ AmapModule, ImageListModule, PipeModule, + InsuranceTableModule, ...PRO_SHARED_MODULES ]; // #endregion