From 4a2217b7ede4ab0cbec1f9e0f2b8f2d4d0110bb4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 11:29:06 +0800 Subject: [PATCH 1/4] fix bug --- .../abnormal-gold.component.html | 74 ++++++++++++------- .../abnormal-gold/abnormal-gold.component.ts | 4 + .../services/freight-account.service.ts | 7 +- .../complaint/complaint.component.html | 4 +- .../complaint/complaint.component.ts | 3 +- 5 files changed, 59 insertions(+), 33 deletions(-) diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index cdae9762..708514c3 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -1,35 +1,53 @@ - - - + + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
- - - - - - + + + + + + - - \ No newline at end of file + + diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index f1195aa0..30d986fd 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -189,4 +189,8 @@ export class AbnormalGoldComponent implements OnInit { } ]; } + // 导出 + exprot() { + this.service.exportStart({ ...this.beforeReq, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); + } } diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index e00bb7f9..3ddf3244 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 15:57:44 * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 16:21:52 + * @LastEditTime : 2022-04-11 11:15:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -156,6 +156,11 @@ export class FreightAccountService extends ShipperBaseService { // 导出预收款余额 $api_get_reportYskBla = '/api/fcc/ficoYskBla/reportYskBla'; + // 查询异常入金充值信息 + $api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage'; + // 查询异常入金充值信息 + $api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage'; + constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index 460d650e..45f34597 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 13:44:53 + * @LastEditTime : 2022-04-11 11:28:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,7 +12,7 @@ - + diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index a192c9c1..bf1d3fcc 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -269,9 +269,8 @@ export class OrderManagementComplaintComponent implements OnInit { * 切换投诉与被投诉tab */ selectMainTab(e: any) { - console.log(e); - console.log(this.selectedIndex); this.selectedMainTabStatus = e?.status; + this.resourceStatus = ''; this.initST(); this.initSF(); setTimeout(() => { From a1f2fb4c230c1189e85c1c3be3e79be87145630f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 13:48:59 +0800 Subject: [PATCH 2/4] fix bug --- .../etc-invoiced-requested/etc-invoiced-requested.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 3325a4c2..118b0992 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -57,9 +57,9 @@ export class ETCInvoicedRequestedComponent implements OnInit { .subscribe(res => { if (res) { this.service.msgSrv.success('申请开票成功'); - modal.destroy(); this.st.load(1); } + modal.destroy(); }); return false; From 8c477a6b94d1e257a5bc71ec1532462b6448b828 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 14:01:05 +0800 Subject: [PATCH 3/4] fix bug --- .../components/list/list.component.ts | 3 +++ .../etc-invoiced-requested.component.html | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 e93cd0d5..c3b2ad6c 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -497,7 +497,10 @@ export class insuranceManagementListComponent implements OnInit { ]; } showImg(_record: any) { + // var newUrl=_record.policyUrl.replace('http','https') + // window.open(newUrl,'_self'); window.location.href = `${_record.policyUrl}`; + // this.service.downloadFile(`${_record.policyUrl}`) // const params = { // imgList: [_record.policyUrl], // index: 0 diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index 5c72a373..9a217446 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -1,6 +1,16 @@ + - +
From dd2f87e97bf01413dc970ad6e5b01572e1aa79c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 11 Apr 2022 14:03:34 +0800 Subject: [PATCH 4/4] - --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fb343fa0..3e2e3e8a 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 @@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' }, { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' }, { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' }, + { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '130px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' }, { title: '车牌颜色',