From 14c91d242bac2b22be67bb30c23bd25368f06f1c Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 14 Apr 2022 14:00:32 +0800
Subject: [PATCH] edit

---
 proxy.conf.js                                 |  2 +-
 .../abnormal-gold.component.less              | 37 -----------------
 .../abnormal-gold/abnormal-gold.component.ts  | 41 +++++++++++--------
 3 files changed, 25 insertions(+), 55 deletions(-)
 delete mode 100644 src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less

diff --git a/proxy.conf.js b/proxy.conf.js
index b8983842..72b8c166 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less
deleted file mode 100644
index c5f2b1ea..00000000
--- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less
+++ /dev/null
@@ -1,37 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 0;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .ant-tabs-tab-btn {
-        padding-left : 16px;
-        padding-right: 16px;
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-
-@media (min-width: 1200px) {
-    .expend-options {
-        max-width: 400px;
-        position : absolute;
-        right    : 0;
-        bottom   : 25px;
-    }
-
-}
\ 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 2affe91f..6482bcfa 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
@@ -9,7 +9,7 @@ import { ClearingModalComponent } from './clearing-modal/clearing-modal.componen
 @Component({
   selector: 'app-abnormal-gold',
   templateUrl: './abnormal-gold.component.html',
-  styleUrls: ['./abnormal-gold.component.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class AbnormalGoldComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -101,7 +101,7 @@ export class AbnormalGoldComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
           },
           default: ''
         },
@@ -154,18 +154,25 @@ export class AbnormalGoldComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '银行流水号', index: 'paySerialNumber', width: 150 },
-      { title: '网络货运人', index: 'ltdId', width: 120 },
-      { title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
-      { title: '资金总账号', index: 'callNo', width: 120 },
-      { title: '充值金额', index: 'rechargeAmount', width: 100 },
-      { title: '付款账户', index: 'transferBankAccount', width: 100 },
-      { title: '付款账号', index: 'transferBankCardNumber', width: 100 },
-      { title: '付款银行', index: 'transferBankOpenName', width: 100 },
+      { title: '银行流水号', index: 'paySerialNumber', width: 180 },
+      { title: '网络货运人', index: 'ltdName', width: 220 },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100 },
+      { title: '资金总账号', index: 'virtualAccount', width: 180 },
+      {
+        title: '充值金额',
+        index: 'rechargeAmount',
+        width: 140,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.rechargeAmount }) }
+      },
+      { title: '付款账户', index: 'transferBankAccount', width: 180 },
+      { title: '付款账号', index: 'transferBankCardNumber', width: 180 },
+      { title: '付款银行', index: 'transferBankOpenName', width: 220 },
       { title: '转账时间', index: 'transferDate', type: 'date', width: 150 },
-      { title: '转账备注', index: 'rechargeRemark', width: 100 },
-      { title: '操作人', index: 'rechargeName', width: 90 },
-      { title: '操作时间', index: 'callNo', type: 'date', width: 150 },
+      { title: '转账备注', index: 'remark', width: 100 },
+      { title: '操作人', index: 'rechargeName', width: 140 },
+      { title: '操作时间', index: 'callNo', type: 'date', width: 160 },
       { title: '状态', index: 'callNo', width: 90 },
       {
         title: '操作',
@@ -181,8 +188,8 @@ export class AbnormalGoldComponent implements OnInit {
       }
     ];
   }
-      // 导出
-      exprot() {
-        this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
-      }
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
+  }
 }