From b026363af3bfb1e5d467f0c7c80e4fbe94654b6d Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 11 Apr 2022 14:57:35 +0800
Subject: [PATCH] fix bug

---
 .../receivable-order/receivable-order.component.ts        | 8 ++++----
 .../components/refund-record/refund-record.component.html | 2 +-
 .../components/refund-record/refund-record.component.ts   | 7 +++++--
 .../services/freight-account.service.ts                   | 2 ++
 .../components/network-freight/new/new.component.html     | 4 ++--
 .../components/network-freight/new/new.component.ts       | 5 ++++-
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
index db51a496..3732bc49 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@@ -41,16 +41,16 @@ export class ReceivableOrderComponent implements OnInit {
       if (this.sf.value?.createTime) {
         Object.assign(requestOptions.body, {
           createTime: {
-            start: this.sf.value.createTime?.[0] || null,
-            end: this.sf.value.createTime?.[1] || null
+            start: this.sf.value.createTime?.[0] || '',
+            end: this.sf.value.createTime?.[1] || ''
           }
         });
       }
       if (this.sf.value?.ahxdate) {
         Object.assign(requestOptions.body, {
           ahxdate: {
-            start: this.sf.value.ahxdate?.[0] || null,
-            end: this.sf.value.ahxdate?.[1] || null
+            start: this.sf.value.ahxdate?.[0] || '',
+            end: this.sf.value.ahxdate?.[1] || ''
           }
         });
       }
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
index 34a9cad4..251eff68 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
@@ -12,7 +12,7 @@
             class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <button nz-button (click)="exprot()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
index 32dcf8ab..6074f36b 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
@@ -27,8 +27,7 @@ export class RefundRecordComponent implements OnInit {
 
   constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
 
-  ngOnInit(): void {
-  }
+  ngOnInit(): void {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null });
@@ -287,4 +286,8 @@ export class RefundRecordComponent implements OnInit {
       }
     ];
   }
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportBillRefundApplicationList);
+  }
 }
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 5d9c9914..f252d6e2 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -160,6 +160,8 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage';
   // 异步导出运营后台异常入金列表
   $api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage';
+  // 异步导出运营后台退款记录列表
+  $api_get_asyncExportBillRefundApplicationList = '/api/fcc/billRefundApplication/asyncExportBillRefundApplicationList';
   // 异步导出运营后台支付记录列表
   $api_get_asyncExportBillPaymentApplicationList = '/api/fcc/billPaymentApplicationOBC/asyncExportBillPaymentApplicationList';
 
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html
index 6b065ba9..2a2358b8 100644
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-17 15:01:33
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 11:17:30
+ * @LastEditTime : 2022-04-11 14:50:05
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -17,7 +17,7 @@
           <dt>正面照</dt>
           <dd>示例</dd>
         </dl>
-        <div class="pa2"> <app-imagelist [imgList]="['./assets/images/company.png']"></app-imagelist></div>
+        <div class="pa2"> <app-imagelist style="height: 102px;" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
       </div>
     </ng-template>
     <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
index f5b4d4bf..00b3ccd8 100644
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
@@ -8,6 +8,7 @@ import {
   SFComponent,
   SFDateWidgetSchema,
   SFSchema,
+  SFStringWidgetSchema,
   SFTextareaWidgetSchema,
   SFUISchema,
   SFUploadWidgetSchema
@@ -620,10 +621,12 @@ export class NetworkFreightNewComponent implements OnInit {
         costRate: {
           title: '成本费率',
           type: 'string',
+          addOnAfter: '%',
           ui: {
+          addOnAfter: '%',
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
             placeholder: '请输入成本费率'
-          }
+           } 
         }
       },
       required: ['website', 'costRate']