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

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-14 14:39:04
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-25 16:18:21
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payable-order\\payable-order-detail\\payable-order-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'预付核销单'" [logo]="logo">
     <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -16,10 +26,10 @@
                 {{headerInfo?.cno}}
             </se>
             <se label="付款账户" required>
-                {{headerInfo?.shipperaccount}}
+                {{headerInfo?.shipperaccountId}}
             </se>
             <se label="核销金额" required>
-                {{headerInfo?.ahxmoney | currency}}
+                {{headerInfo?.phxmoney | currency}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
@@ -27,10 +37,10 @@
                 {{headerInfo?.phxdate}}
             </se>
             <se label="收款人" required>
-                {{headerInfo?.arto}}
+                {{headerInfo?.driver2IdName}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.ltdaccount}}
+                {{headerInfo?.ltdaccountId}}
             </se>
             <se label="应付金额">
                 {{headerInfo?.prmoney | currency}}
@@ -41,12 +51,12 @@
                 {{headerInfo?.banktype==='1'?'平安':'浦发'}}
             </se>
             <se label="付款类型" required>
-                {{headerInfo?.arvattype==='1'?'费用款项':''}}
+                {{headerInfo?.brmtypeLabel}}
             </se>
             <se label="银行水单">
                 {{headerInfo?.bankreceipt}}
             </se>
-            <se label="收款备注">
+            <se label="付款备注">
                 {{headerInfo?.remarks}}
             </se>
         </div>

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

@@ -252,7 +252,7 @@ export class ReceiptOrderComponent implements OnInit {
       },
       { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' },
       { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' },
-      { title: '收款方式', index: 'brmmodeLabel', width: 150, className: 'text-left' },
+      { title: '收款方式', index: 'brmModeLabel', width: 150, className: 'text-left' },
       { title: '付款人', index: 'artoname', width: 200, className: 'text-left' },
       { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' },

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

@@ -241,7 +241,7 @@ export class ReceivableOrderComponent implements OnInit {
       { title: '网络货运人', index: 'ltdName', width: 140 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
       { title: '付款账户', index: 'shipperaccount', width: 120 },
-      { title: '收款账户', index: 'ltdaccount', width: 120 },
+      { title: '收款账户', index: 'ltdaccountId', width: 120 },
       { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
       {
         title: '核销金额',
@@ -259,11 +259,12 @@ 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: 120 },
-      { title: '结算客户', index: 'cno', width: 120 },
-      { title: '银行水单', index: 'bankreceipt', width: 120 },
+      { title: '付款人', index: 'artoname', width: 200 },
+      { title: '结算客户', index: 'cnoName', width: 120 },
+      { title: '银行水单', index: 'bankreceipt', width: 200 },
       { title: '创建时间', index: 'createTime', width: 160 },
-      { title: '创建人', index: 'createUserId', width: 120 },
+      { title: '收款人', index: 'driver2IdName', width: 120 },
+      { title: '创建人', index: 'createUserIdLabel', width: 120 },
       { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
       { title: '核销备注', index: 'remarks', width: 120 },
       {