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

src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+
 import { FreightAccountService } from '../../../services/freight-account.service';
 
 @Component({
@@ -134,6 +135,24 @@ export class PlatformAccountDetailComponent implements OnInit {
           },
           default: ''
         },
+        channelSource: {
+          type: 'string',
+          title: '账户类型',
+          enum: [
+            { value: '', label: '全部' },
+            { value: '1', label: '货主账户' },
+            { value: '2', label: '司机账户' },
+            { value: '3', label: '运营商账户' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          },
+          default: ''
+        },
         incomeType: {
           type: 'string',
           title: '收支类型',

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

@@ -1,10 +1,11 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { CurrencyPipe } from '@angular/common';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
+
 import { FreightAccountService } from '../../services/freight-account.service';
-import { CurrencyPipe } from '@angular/common';
 
 @Component({
   selector: 'app-transaction-flow',
@@ -12,7 +13,7 @@ import { CurrencyPipe } from '@angular/common';
   styleUrls: ['./transaction-flow.component.less'],
   providers: [CurrencyPipe]
 })
-export class TransactionFlowComponent implements OnInit {
+export class TransactionFlowComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
   @ViewChild('sf', { static: false })
@@ -29,8 +30,6 @@ export class TransactionFlowComponent implements OnInit {
     private currencyPipe: CurrencyPipe
   ) {}
 
-  ngOnInit(): void {}
-
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
@@ -162,7 +161,7 @@ export class TransactionFlowComponent implements OnInit {
             }
           }
         },
-        orderSn221f: {
+        projectId: {
           type: 'string',
           title: '所属项目',
           ui: {