Merge branch 'fix-v2-220418' into 'v2-220418'

src/pages/balance/accountsPayable/settlementList/hooks/useHandleSettlementList.tsx

@@ -211,7 +211,7 @@ function useHandleSettlementList() {
           value: 6
         }
       ],
-      // onFilter: (value: number, record: any) => record.orderType === value,
+      onFilter: (value: number, record: any) => record.orderType === value,
     },
     {
       title: intl.formatMessage({id: 'balance.jiesuanjine'}),

src/pages/balance/accountsPayable/settlementList/schema/index.tsx

@@ -32,30 +32,25 @@ export const schema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'flex-layout',
+          'x-component': 'mega-layout',
           'x-component-props': {
-            rowStyle: {
-              justifyContent: "flex-start",
-            },
-            colStyle: {
-              marginRight: 20,
-            },
+            grid: true,
+            full: true,
+            autoRow: true,
+            columns: 6,
           },
           properties: {
             "[startTime, endTime]": {
-              type: 'object',
+              type: 'string',
               "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
                 placeholder: [intl.formatMessage({id: 'balance.accountsPayable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsPayable.settlementList.schema.schema.endTime'})],
-                style: {
-                  minWidth: "320px"
-                }
               }
             },
             /** 预计付款时间 */
             "[prePayStartTime, prePayEndTime]": {
-              type: 'object',
+              type: 'string',
               "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
@@ -64,14 +59,11 @@ export const schema: ISchema = {
                   intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime'}), 
                   intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime'})
                 ],
-                style: {
-                  minWidth: "320px"
-                }
               }
             },
             /** 实际付款时间 */
             "[payStartTime, payEndTime]": {
-              type: 'object',
+              type: 'string',
               "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
@@ -80,9 +72,6 @@ export const schema: ISchema = {
                   intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payStartTime'}), 
                   intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payEndTime'})
                 ],
-                style: {
-                  minWidth: "320px"
-                }
               }
             },
             status: {