666

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

@@ -29,9 +29,20 @@ export class PaymentOrderComponent implements OnInit {
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, {
-        ...this.sf.value
-      });
+      let params = {...this.sf.value}; 
+      if(params.payDate){
+        const payDate  = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]}
+        params.payDate  = payDate;
+      }
+      if(params.payDate2){
+        const payDate2  = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]}
+        params.payDate2  = payDate2;
+      }
+      if(params.createTime){
+        const createTime  = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]}
+        params.createTime  = createTime;
+      }
+      Object.assign(requestOptions.body,params );
     }
     return requestOptions;
   };
@@ -82,7 +93,7 @@ export class PaymentOrderComponent implements OnInit {
             hidden: true
           }
         },
-        paycodes: {
+        paycode: {
           type: 'string',
           title: '付款单号',
         },
@@ -111,9 +122,10 @@ export class PaymentOrderComponent implements OnInit {
           type: 'string',
           title: '付款类型',
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            containsAllLable: true,
+            params: { dictKey: 'pay:type' },
             placeholder: '请选择',
-            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -123,9 +135,10 @@ export class PaymentOrderComponent implements OnInit {
           type: 'string',
           title: '付款方式',
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            containsAllLable: true,
+            params: { dictKey: 'pay:mode' },
             placeholder: '请选择',
-            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -143,7 +156,7 @@ export class PaymentOrderComponent implements OnInit {
             }
           }
         },
-        billHCodes: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
@@ -155,7 +168,7 @@ export class PaymentOrderComponent implements OnInit {
             }
           }
         },
-        paydate: {
+        payDate: {
           title: '要求付款日期',
           type: 'string',
           ui: {
@@ -166,7 +179,7 @@ export class PaymentOrderComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        createTi1me: {
+        payDate2: {
           title: '确认日期',
           type: 'string',
           ui: {
@@ -177,25 +190,19 @@ export class PaymentOrderComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        waybillHCodes: {
+        waybillCode: {
           type: 'string',
           title: '运单号',
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        feeHCodes: {
+        feeCode: {
           type: 'string',
           title: '费用号',
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -212,7 +219,7 @@ export class PaymentOrderComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        remarks: {
+        payRemarks: {
           type: 'string',
           title: '付款备注',
           ui: {
@@ -240,7 +247,7 @@ export class PaymentOrderComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) }
       },
-      { title: '付款类型', index: 'payType', width: 130 },
+      { title: '付款类型', index: 'payTypeLabel', width: 130 },
       { title: '付款方式', index: 'payModeLabel', width: 130 },
       { title: '结算客户', index: 'cnoName', width: 160 },
       { title: '收款人', index: 'hrToLabel', width: 150 },