From 267bf8a69346c353a576c364dbefdd4f40d30f9e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 16:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment-order-detail.component.html                     | 6 +++---
 .../components/payment-order/payment-order.component.ts     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
index d90549fd..06cd3368 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-19 16:54:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 16:22:55
+ * @LastEditTime : 2022-01-20 16:40:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -40,7 +40,7 @@
                 {{headerInfo?.payBankTypeLabel}}
             </se>
             <se label="确认日期" required>
-                {{headerInfo?.payDate2}}
+                {{headerInfo?.payDate}}
             </se>
             <se label="付款备注">
                 {{headerInfo?.payRemarks}}
@@ -51,7 +51,7 @@
                 {{headerInfo?.payModeLabel}}
             </se>
             <se label="付款类型" required>
-                {{headerInfo?.payTypeLabel}}
+                {{headerInfo?.payType}}
             </se>
             <se label="付款金额" required>
                 {{headerInfo?.payMoney |currency}}
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
index f937ddb9..2fc3b452 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@@ -237,12 +237,12 @@ export class PaymentOrderComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) }
       },
-      { title: '付款类型', index: 'payTypeLabel', width: 130 },
+      { title: '付款类型', index: 'payType', width: 130 },
       { title: '付款方式', index: 'payModeLabel', width: 130 },
       { title: '结算客户', index: 'shipperId', width: 160 },
       { title: '收款人', index: 'hrToName', width: 150 },
       { title: '应付已核销', index: 'callNo', width: 150 },
-      { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
+      { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       { title: '创建人', index: 'createUserId', width: 160 },
       { title: '付款备注', index: 'payRemarks', width: 200 },