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

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
@@ -181,6 +181,23 @@ export class ReceivableOrderComponent implements OnInit {
             }
           }
         },
+        bankType: {
+          type: 'string',
+          title: '银行类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '平安银行', value: '1' },
+            { label: '浦发银行', value: '2' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          },
+          default: ''
+        },
         ahxdate: {
           title: '核销日期',
           type: 'string',
@@ -245,7 +262,6 @@ export class ReceivableOrderComponent implements OnInit {
       { title: '订单号', index: 'billHCode', type: 'link', width: 140 },
       { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
-      { title: '付款账户', index: 'shipperaccount', width: 170 },
       { title: '收款账户', index: 'ltdaccountId', width: 160 },
       { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
       {
@@ -265,6 +281,7 @@ export class ReceivableOrderComponent implements OnInit {
       { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
       { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
       { title: '付款人', index: 'artoname', width: 200 },
+      { title: '付款账户', index: 'shipperaccount', width: 170 },
       { title: '结算客户', index: 'cnoName', width: 120 },
       { title: '银行水单', index: 'bankreceipt', width: 200 },
       { title: '创建时间', index: 'createTime', width: 180 },

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';
   // 拒绝提现