edit

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -119,9 +119,9 @@ export class ReceivableOrderComponent implements OnInit {
         brmtype: {
           type: 'string',
           title: '收款类型',
-          enum: [{ value: '1', label: '费用款项' }],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'driverrecord:receive:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -131,9 +131,9 @@ export class ReceivableOrderComponent implements OnInit {
         arvattype: {
           type: 'string',
           title: '付款类型',
-          enum: [{ value: '1', label: '费用款项' }],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'pay:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html

@@ -73,7 +73,7 @@
                     </button>
                 </div>
             </div>
-            <st #inputST [data]="service.$api_get_advance_collection_detail" [columns]="columns"
+            <st #inputST [data]="service.$api_get_refund_detail_page" [columns]="columns"
                 [page]="{ show: false }" [req]="{  process: beforeReq }" [res]="{ reName: { list: 'data' } }"
                 [loading]="false" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
                 <ng-template st-row="no" let-item let-index="index" let-column="column">

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts

@@ -33,11 +33,12 @@ export class WithdrawalsDetailComponent implements OnInit {
   ngOnInit(): void {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
-    if (this.inputSF.value) {
+    if (this.inputSF?.value) {
       Object.assign(requestOptions.body, {
         ...this.inputSF.value
       });
     }
+    Object.assign(requestOptions.body, { refundApplicationId: this.route.snapshot.params.id });
     return requestOptions;
   };
 

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -254,7 +254,7 @@ export class WithdrawalsRecordComponent {
       { title: '提现单号', index: 'refundApplyCode', width: 120 },
       { title: '网络货运人', index: 'ltdName', width: 140 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
-      { title: '账户类型', index: 'accountType', width: 100 },
+      { title: '账户类型', index: 'accountTypeLabel', width: 100 },
       { title: '账户名称', index: 'bankAccountName', width: 140 },
       { title: '虚拟账户', index: 'virtualAccount', width: 100 },
       {

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

@@ -50,6 +50,8 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_refund_page = '/api/fcc/refundApplicationOBC/list/page';
   // 获取提现申请表详情
   $api_get_refund_detail = '/api/fcc/refundApplicationOBC/get';
+  // 获取提现支付详情
+  $api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/payList';
   // 同意提现
   $api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund';
   // 拒绝提现

src/app/shared/components/dict-select/dict-select.component.ts

@@ -11,27 +11,25 @@ import { DictSelectService } from './dict-select.service';
     {
       provide: NG_VALUE_ACCESSOR,
       useExisting: forwardRef(() => DictSelectComponent),
-      multi: true,
+      multi: true
-    },
+    }
   ],
-  changeDetection: ChangeDetectionStrategy.OnPush,
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DictSelectComponent implements OnInit, ControlValueAccessor {
-
   private onChangeFn?: (val: string) => void;
   private onTouchedFn?: () => void;
 
   defaultUrl = `/api/mdc/pbc/dictItems/getDictValue`;
   @Input() value: any = '' || []; // 默认选中值
   @Input() url: string = ''; // 获取字典数据的地址
-  @Input() params = {};// 请求参数
+  @Input() params = {}; // 请求参数
 
   dictList: any[] = [];
   @Input() containsAllLabel = true; // 是否包含全部这一选项
   @Input() mode: 'multiple' | 'tags' | 'default' = 'default';
 
-
+  constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) {}
-  constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) { }
 
   writeValue(geo: string): void {
     if (geo == null) {
@@ -55,9 +53,10 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
     this.service.getDictList(this.url || this.defaultUrl, this.params).subscribe(res => {
       if (res) {
         this.dictList = res || [];
-        if (this.dictList.length > 0 && this.containsAllLabel) {
+        if (this.dictList.length > 0 && this.containsAllLabel !== false) {
           const obj = { label: '全部', value: '' };
           this.dictList.unshift(obj);
+          console.log(this.dictList);
         }
         this.cdr.markForCheck();
       }
@@ -70,5 +69,4 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor {
   isEmpty(val: any) {
     return val === undefined || val === null || val === '';
   }
-
 }