fix: 添加结算应付实付预付搜索条件

src/locales/en-US/balance.ts

@@ -576,4 +576,8 @@ export default {
   'balance.querenduizhangdan':'Confirm the statement',
   'balance.coupon.amout': 'couponAmount',
   'balance.coupon.couponNo': 'couponNo',
+  'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': 'prePayStartTime',
+  'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': 'prePayEndTime',
+  'balance.accountsReceivable.settlementList.schema.schema.payStartTime': 'payStartTime',
+  'balance.accountsReceivable.settlementList.schema.schema.payEndTime': 'payEndTime',
 }
\ No newline at end of file

src/locales/ko-KR/balance.ts

@@ -577,4 +577,8 @@ export default {
   'balance.querenduizhangdan': '청구서 확인',
   'balance.coupon.amout': '쿠폰 금액',
   'balance.coupon.couponNo': '쿠폰 쿠폰',
+  'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': '시작 시간 선불',
+  'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': '선불 종료 시간',
+  'balance.accountsReceivable.settlementList.schema.schema.payStartTime': '실제 지불 시작 시간',
+  'balance.accountsReceivable.settlementList.schema.schema.payEndTime': '실불 종료 시간',
 }

src/locales/zh-CN/balance.ts

@@ -764,5 +764,8 @@ export default {
   'balance.businessRequestFunds.search.columns.payee' : '收款方',
   'balance.coupon.amout': '优惠券金额',
   'balance.coupon.couponNo': '优惠券券码',
-
+  'balance.accountsReceivable.settlementList.schema.schema.prePayStartTime': '预付开始时间',
+  'balance.accountsReceivable.settlementList.schema.schema.prePayEndTime': '预付开始时间',
+  'balance.accountsReceivable.settlementList.schema.schema.payStartTime': '实付开始时间',
+  'balance.accountsReceivable.settlementList.schema.schema.payEndTime': '实付结束时间',
 }

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

@@ -44,6 +44,10 @@ interface SearchParams {
   isSettlement: number,
   startTime?: Moment,
   endTime?: Moment,
+  prePayStartTime: Moment,
+  prePayEndTime: Moment,
+  payStartTime: Moment,
+  payEndTime: Moment,
   orderType?: number,
   status?: number,
   current: number,
@@ -256,9 +260,12 @@ const SettlementList = () => {
    */
   const handleSearch = (values: SearchParams) => {
     const format = 'YYYY-MM-DD'
+    const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime ? values.endTime.endOf("days").format("YYYY-MM-DD HH:mm:ss") : "";
-    ref.current.reload({ ...values, startTime, endTime });
+    const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
+    const withPayStartTime = payStartTime ? { payStartTime: payStartTime.valueOf(), payEndTime: payEndTime.valueOf() } : {};
+    const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {};
+    ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime });
   }
 
   const handleIhadPay = () => {
@@ -273,6 +280,7 @@ const SettlementList = () => {
           tableProps={{
             rowKey: 'id',
           }}
+          keepAlive={false}
           columns={columns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

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

@@ -53,6 +53,38 @@ export const schema: ISchema = {
                 }
               }
             },
+            /** 预计付款时间 */
+            "[prePayStartTime, prePayEndTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
+              'x-component-props': {
+                allowClear: true,
+                showTime: true,
+                placeholder: [
+                  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',
+              "x-component": 'RangePicker',
+              'x-component-props': {
+                allowClear: true,
+                showTime: true,
+                placeholder: [
+                  intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payStartTime'}), 
+                  intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payEndTime'})
+                ],
+                style: {
+                  minWidth: "320px"
+                }
+              }
+            },
             status: {
               type: 'string',
               enum: [],

src/pages/balance/accountsReceivable/settlementList/index.tsx

@@ -28,6 +28,10 @@ type requestDataType = {
   orderType: string | number,
   startTime?: Moment,
   endTime?: Moment,
+  prePayStartTime: Moment,
+  prePayEndTime: Moment,
+  payStartTime?: Moment,
+  payEndTime?: Moment,
   settlementName: string,
   payName: string,
   settlementNo: number,
@@ -110,9 +114,12 @@ const SettlementList = () => {
    */
   const handleSearch = (values: requestDataType) => {
     const format = 'YYYY-MM-DD'
+    const { payStartTime, payEndTime, prePayStartTime, prePayEndTime, ...rest } = values;
     const startTime = values.startTime?.format(format);
     const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
-    ref.current.reload({ ...values, startTime, endTime });
+    const withPayStartTime = payStartTime ? { payStartTime: payStartTime.valueOf(), payEndTime: payEndTime.valueOf() } : {};
+    const withPrePayEndTime = prePayStartTime ? { prePayStartTime: prePayStartTime.valueOf(), prePayEndTime: prePayEndTime.valueOf() } : {};
+    ref.current.reload({ ...rest, startTime, endTime, ...withPayStartTime, ...withPrePayEndTime });
   }
 
   return (
@@ -122,6 +129,7 @@ const SettlementList = () => {
           tableProps={{
             rowKey: 'id',
           }}
+          keepAlive={false}
           columns={columns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

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

@@ -54,29 +54,37 @@ export const schema: ISchema = {
               }
             },
             /** 预计付款时间 */
-            // "[startTime, endTime]": {
-            //   type: 'object',
-            //   "x-component": 'RangePicker',
-            //   'x-component-props': {
-            //     allowClear: true,
-            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
-            //     style: {
-            //       minWidth: "320px"
-            //     }
-            //   }
-            // },
-            /** 实际付款时间 */
-            // "[startTime, endTime]": {
-            //   type: 'object',
-            //   "x-component": 'RangePicker',
-            //   'x-component-props': {
-            //     allowClear: true,
-            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
-            //     style: {
-            //       minWidth: "320px"
-            //     }
-            //   }
-            // },
+            "[prePayStartTime, prePayEndTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
+              'x-component-props': {
+                allowClear: true,
+                showTime: true,
+                placeholder: [
+                  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',
+              "x-component": 'RangePicker',
+              'x-component-props': {
+                allowClear: true,
+                showTime: true,
+                placeholder: [
+                  intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payStartTime'}), 
+                  intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.payEndTime'})
+                ],
+                style: {
+                  minWidth: "320px"
+                }
+              }
+            },
             status: {
               type: 'string',
               enum: [],

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx

@@ -181,7 +181,7 @@ const Add = () => {
   return (
     <PageHeaderWrapper
       title={renderTitle()}
-      onBack={() => history.goBack()}
+      onBack={() => history.push('/memberCenter/marketingAbility/activityPages/management')}
       backIcon={<ReutrnEle />}
       extra={
         !isView && (