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

src/app/routes/financial-management/components/receipt-order/receipt-order.component.html

@@ -33,10 +33,10 @@
         </div>
     </div>
 
-    <st #st [data]="service.$api_get_payment_page" [columns]="columns"
+    <st #st [data]="service.$api_get_receipt_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '450px' }" (change)="stChange($event)">
     </st>
 </nz-card>

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

@@ -31,6 +31,14 @@ export class ReceiptOrderComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value
       });
+      if (this.sf.value.brmdate) {
+        Object.assign(requestOptions.body, {
+          brmdate: {
+            start: this.sf.value.brmdate?.[0] || '',
+            end: this.sf.value.brmdate?.[1] || ''
+          }
+        });
+      }
     }
     return requestOptions;
   };
@@ -48,12 +56,12 @@ export class ReceiptOrderComponent implements OnInit {
       this.service.msgSrv.warning('请选择收款单');
       return;
     }
-    const modal = this.nzModalService.create({
-      nzTitle: '收款单',
-      nzContent: AddCollectionInvoiceModalComponent,
-      nzComponentParams: { i: { userId: 0 } },
-      nzFooter: null
-    });
+    // const modal = this.nzModalService.create({
+    //   nzTitle: '收款单',
+    //   nzContent: AddCollectionInvoiceModalComponent,
+    //   nzComponentParams: { i: { userId: 0 } },
+    //   nzFooter: null
+    // });
   }
 
   /**
@@ -81,7 +89,7 @@ export class ReceiptOrderComponent implements OnInit {
             hidden: true
           }
         },
-        paycodes: {
+        brmcode: {
           type: 'string',
           title: '收款单号',
           ui: {
@@ -100,7 +108,7 @@ export class ReceiptOrderComponent implements OnInit {
           },
           default: null
         },
-        paycod1es: {
+        bankreceipt: {
           type: 'string',
           title: '银行水单',
           ui: {
@@ -108,7 +116,7 @@ export class ReceiptOrderComponent implements OnInit {
             placeholder: '请选择'
           }
         },
-        paytype: {
+        brmtype: {
           type: 'string',
           title: '收款类型',
           ui: {
@@ -119,7 +127,7 @@ export class ReceiptOrderComponent implements OnInit {
             }
           }
         },
-        paymode: {
+        brmmode: {
           type: 'string',
           title: '收款方式',
           ui: {
@@ -141,7 +149,7 @@ export class ReceiptOrderComponent implements OnInit {
             }
           }
         },
-        orderS2n: {
+        sts: {
           type: 'string',
           title: '收款状态',
           ui: {
@@ -153,7 +161,7 @@ export class ReceiptOrderComponent implements OnInit {
             }
           }
         },
-        paydate: {
+        brmdate: {
           title: '到账日期',
           type: 'string',
           ui: {
@@ -164,7 +172,7 @@ export class ReceiptOrderComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        createTi1me: {
+        createTime: {
           title: '创建时间',
           type: 'string',
           ui: {
@@ -175,7 +183,7 @@ export class ReceiptOrderComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        billHCodes: {
+        billHCode: {
           type: 'string',
           title: '订单号',
           ui: {
@@ -213,47 +221,49 @@ export class ReceiptOrderComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '', index: 'key', type: 'checkbox' },
-      { title: '收款单号', index: 'paycode', type: 'link' },
-      { title: '网络货运人', index: 'ltdId' },
-      { title: '到账日期', index: 'paydate', type: 'date', width: 140 },
-      { title: '收款账户', index: 'call1N2o' },
+      { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' },
+      { title: '收款单号', index: 'brmcode', type: 'link', width: 140 },
+      { title: '网络货运人', index: 'ltdId', width: 140 },
+      { title: '到账日期', index: 'brmdate', type: 'date', width: 140 },
+      { title: '收款账户', index: 'ltdaccountId', width: 140 },
       {
         title: '到账金额',
-        index: 'paymoney',
+        index: 'brmmoney',
         width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) }
       },
       {
         title: '核销金额',
-        index: 'paytype',
+        index: 'armoney',
         width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
       },
       {
         title: '预收金额',
-        index: 'paytype',
+        index: 'yskmoney',
         width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }
       },
-      { title: '银行类型', index: 'paytype' },
-      { title: '收款类型', index: 'paymode' },
-      { title: '收款方式', index: 'paymode' },
-      { title: '付款人', index: 'hrto' },
-      { title: '银行水单', index: 'callNo' },
-      { title: '创建时间', index: 'createTime', type: 'date' },
-      { title: '创建人', index: 'createUserId' },
-      { title: '收款状态', index: 'payremarks' },
-      { title: '收款备注', index: 'payremarks' },
+      { title: '银行类型', index: 'paybanktype', width: 120 },
+      { title: '收款类型', index: 'brmtype', width: 120 },
+      { title: '收款方式', index: 'brmmode', width: 120 },
+      { title: '付款人', index: 'artoname', width: 120 },
+      { title: '银行水单', index: 'bankreceipt', width: 140 },
+      { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '创建人', index: 'createUserId', width: 120 },
+      { title: '收款状态', index: 'sts', width: 120 },
+      { title: '收款备注', index: 'remarks', width: 180 },
       {
         title: '操作',
         width: '90px',
+        fixed: 'right',
+        className: 'text-center',
         buttons: [
           {
             text: '浏览',

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

@@ -83,6 +83,9 @@ export class FreightAccountService extends ShipperBaseService {
   // 查询付款单明细
   $api_get_payment_detail = '/api/fcc/ficoPayL/list/page';
 
+  // 查询收款单抬头
+  $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
+
   constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }