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-detail/receivable-order-detail.component.html

@@ -13,10 +13,10 @@
                 {{headerInfo?.ltdName}}
             </se>
             <se label="结算客户">
-                {{headerInfo?.cno}}
+                {{headerInfo?.cnoName}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.ltdaccount}}
+                {{headerInfo?.ltdaccountId}}
             </se>
             <se label="核销金额" required>
                 {{headerInfo?.ahxmoney | currency}}
@@ -27,10 +27,10 @@
                 {{headerInfo?.ahxdate}}
             </se>
             <se label="付款人" required>
-                {{headerInfo?.arto}}
+                {{headerInfo?.artoname}}
             </se>
             <se label="付款账户" required>
-                {{headerInfo?.shipperaccount}}
+                {{headerInfo?.arto}}
             </se>
             <se label="应收金额">
                 {{headerInfo?.armoney | currency}}
@@ -38,7 +38,7 @@
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="银行类型">
-                {{headerInfo?.banktypeLabel}}
+                {{headerInfo?.banktype}}
             </se>
             <se label="收款类型" required>
                 {{headerInfo?.arvattype==='1'?'费用款项':''}}

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

@@ -242,10 +242,10 @@ export class ReceivableOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
-      { title: '网络货运人', index: 'ltdName', width: 140 },
+      { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
-      { title: '付款账户', index: 'shipperaccount', width: 120 },
-      { title: '收款账户', index: 'ltdaccountId', width: 120 },
+      { title: '付款账户', index: 'shipperaccount', width: 170 },
+      { title: '收款账户', index: 'ltdaccountId', width: 160 },
       { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
       {
         title: '核销金额',
@@ -266,7 +266,7 @@ export class ReceivableOrderComponent implements OnInit {
       { title: '付款人', index: 'artoname', width: 200 },
       { title: '结算客户', index: 'cnoName', width: 120 },
       { title: '银行水单', index: 'bankreceipt', width: 200 },
-      { title: '创建时间', index: 'createTime', width: 160 },
+      { title: '创建时间', index: 'createTime', width: 180 },
       // { title: '收款人', index: 'driver2IdName', width: 120 },
       // { title: '创建人', index: 'createUserIdLabel', width: 120 },
       { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },