From fa6fd671573f83ff6070726bf5758bed269454b7 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 10 Mar 2022 10:13:58 +0800
Subject: [PATCH] edit

---
 .../payment-order.component.html              |  3 +--
 .../payment-order/payment-order.component.ts  | 27 +++++++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html
index 19dea04f..8de592aa 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html
@@ -8,8 +8,7 @@
                 [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
-            [class.expend-options]="_$expand">
+        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
             <!-- <button nz-button nzType="primary" > 导出</button>
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 95454878..b061cfc1 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
@@ -108,16 +108,16 @@ export class PaymentOrderComponent implements OnInit {
           },
           default: null
         },
-        orderS2n: {
-          type: 'string',
-          title: '付款状态',
-          ui: {
-            widget: 'dict-select',
-            containsAllLable: true,
-            params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择'
-          }
-        },
+        // orderS2n: {
+        //   type: 'string',
+        //   title: '付款状态',
+        //   ui: {
+        //     widget: 'dict-select',
+        //     containsAllLable: true,
+        //     params: { dictKey: 'refund:apply:status' },
+        //     placeholder: '请选择'
+        //   }
+        // },
         paytype: {
           type: 'string',
           title: '付款类型',
@@ -126,9 +126,6 @@ export class PaymentOrderComponent implements OnInit {
             containsAllLable: true,
             params: { dictKey: 'pay:type' },
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         paymode: {
@@ -237,7 +234,7 @@ export class PaymentOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
       { title: '付款单号', index: 'payCode', type: 'link', width: 180 },
-      { title: '网络货运人', index: 'ltdName', width: 160 },
+      { title: '网络货运人', index: 'ltdName', width: 180 },
       { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       {
         title: '付款金额',
@@ -252,7 +249,7 @@ export class PaymentOrderComponent implements OnInit {
       { title: '结算客户', index: 'cnoName', width: 160 },
       { title: '收款人', index: 'hrToLabel', width: 150 },
       { title: '应付已核销', index: 'ishrhxLabel', width: 150 },
-      { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
+      { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
       { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       { title: '创建人', index: 'createUserIdLabel', width: 160 },
       { title: '付款备注', index: 'payRemarks', width: 200 },