From 472849e5321189ca6e0a0c4d001892885425d0e5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:43:17 +0800 Subject: [PATCH 1/8] fix bug --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 0e0794fd..e11afb2a 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -329,7 +329,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { } let params: any[] = []; this.selectedRows.forEach(item => { - params.push(item.id); + params.push(item.billId); }); this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { if (res) { From 57d87a6bcaf003a42b2e50d3039b766dc376f06a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:46:27 +0800 Subject: [PATCH 2/8] fix bug --- .../individual-collect/individual-collect.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 491fd41c..ed4066bb 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -129,9 +129,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - } } as SFDateWidgetSchema }, sbrq: { From 0690582b2cdf4692a739276a6284ca677ffe1db9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:49:00 +0800 Subject: [PATCH 3/8] fix bug --- .../withdrawals-record/withdrawals-record.component.html | 2 +- .../withdrawals-record/withdrawals-record.component.ts | 6 +++++- .../services/freight-account.service.ts | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index 98ac1a5e..a4db6171 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -32,7 +32,7 @@
- +
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 6a9facb9..0ae727c7 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; @@ -23,13 +23,21 @@ export class DatatableReportingVerifyResultComponent implements OnInit { get reqParams() { return { subjectType: this.subjectType, - subjectId: this.record?.orderId + subjectId: this.record?.orderId, + }; } + constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { } + beforeReq(requestOptions: STRequestOptions) { + delete requestOptions?.body?.pageSize; + delete requestOptions?.body?.pageIndex; + return requestOptions; + } + ngOnInit(): void { this.initST(); } From 0e48a7ead2775516f5b5272b5cff62914b45f008 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 19:28:11 +0800 Subject: [PATCH 8/8] fix bug --- .../bulk-detail-change/bulk-detail-change.component.ts | 4 +++- .../vehicle-detail-change/vehicle-detail-change.component.ts | 4 +++- .../components/bulk-publish/bulk-publish.component.ts | 2 ++ .../bulk-release-publish/bulk-release-publish.component.ts | 2 ++ .../components/onecar-publish/onecar-publish.component.ts | 2 ++ .../components/release-publish/release-publish.component.ts | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 812a4377..450ff038 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 19:03:20 + * @LastEditTime : 2022-04-11 19:26:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -621,8 +621,10 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { this.totalTime = res?.time; }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index e236a17f..0bc13d3a 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 19:03:47 + * @LastEditTime : 2022-04-11 19:26:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -592,8 +592,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { this.totalTime = res?.time; }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 04ccd7c2..722bb487 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -870,8 +870,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.totalTime = res.time; }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index bc6d3798..d7383ec2 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -754,8 +754,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.totalTime = res.time; }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index def5f8dc..107e87f5 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1114,8 +1114,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.getInsurersPrice(); // 计算保费金额 }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index a52ee428..4b8b2798 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -1030,8 +1030,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.getInsurersPrice(); // 计算保费金额 }); } + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') + return false } } });