Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less

@@ -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;
-    }
-
-}

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: 'paySerialNumber', width: 180 },
-      { title: '网络货运人', index: 'ltdId', width: 120 },
+      { title: '网络货运人', index: 'ltdName', width: 220 },
-      { title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+      { title: '银行类型', index: 'bankTypeLabel', width: 100 },
-      { title: '资金总账号', index: 'callNo', width: 120 },
+      { title: '资金总账号', index: 'virtualAccount', width: 180 },
-      { title: '充值金额', index: 'rechargeAmount', width: 100 },
+      {
-      { title: '付款账户', index: 'transferBankAccount', width: 100 },
+        title: '充值金额',
-      { title: '付款账号', index: 'transferBankCardNumber', width: 100 },
+        index: 'rechargeAmount',
-      { title: '付款银行', index: 'transferBankOpenName', width: 100 },
+        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: 'remark', width: 100 },
-      { title: '操作人', index: 'rechargeName', width: 90 },
+      { title: '操作人', index: 'rechargeName', width: 140 },
-      { title: '操作时间', index: 'callNo', type: 'date', width: 150 },
+      { title: '操作时间', index: 'callNo', type: 'date', width: 160 },
       { title: '状态', index: 'callNo', width: 90 },
       {
         title: '操作',
@@ -181,8 +188,8 @@ export class AbnormalGoldComponent implements OnInit {
       }
     ];
   }
-      // 导出
+  // 导出
-      exprot() {
+  exprot() {
-        this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
-      }
+  }
 }

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -91,6 +91,16 @@ export class TransactionFlowComponent {
             placeholder: '请输入'
           }
         },
+        orderSn: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         tradeType: {
           type: 'string',
           title: '交易类型',
@@ -216,6 +226,7 @@ export class TransactionFlowComponent {
       { title: '流水号', index: 'transactionNumber', width: 180 },
       { title: '交易类型', index: 'tradeTypeLabel', width: 120 },
       { title: '关联单号', index: 'businessNumber', width: 150 },
+      { title: '订单号', index: 'orderSn', width: 150 },
       { title: '账户类型', index: 'accountTypeLabel', width: 130 },
       { title: '账户名称', index: 'roleName', width: 180 },
       { title: '所属项目', index: 'projectName', width: 140 },
@@ -262,7 +273,6 @@ export class TransactionFlowComponent {
     ];
   }
   exportList() {
-
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage);
-    this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage,);
   }
 }

src/app/routes/financial-management/services/freight-account.service.ts

@@ -173,7 +173,7 @@ export class FreightAccountService extends ShipperBaseService {
     const { bankType, snglFlgCd } = params;
     if (url) {
       if (params?.bankType === '1') {
-        window.open(params?.receiptUrl);
+        window.open(url);
       } else if (params?.bankType === '2') {
         window.open(url);
         // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);