fix: 结算能力搜索结束时间添加时分秒

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

@@ -22,6 +22,7 @@ import { Moment } from 'moment';
 import { payStatus } from '../../common';
 import { fetchOptions } from '../../common'
 
+const { RangePicker } = DatePicker;
 const formActions = createFormActions();
 // 应付账款 - 付款方查看凭证,  能力中心
 const PAYABLE_PAYER = 1;
@@ -126,8 +127,6 @@ const SettlementList = () => {
    * @param params
    */
   const handleUploadVoucher = (params: any) => {
-    console.log(params);
-    ///settle/accounts/member/settlement/pay
     PublicApi.postSettleAccountsMemberSettlementPay({id: params.id, proveList: params.fileList})
     .then((data) => {
       if(data.code === 1000) {
@@ -143,7 +142,7 @@ const SettlementList = () => {
   const handleSearch = (values: SearchParams) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format("YYYY-MM-DD") + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
   }
 
@@ -160,7 +159,7 @@ const SettlementList = () => {
           controlRender={
             <NiceForm
               actions={formActions}
-              components={{DatePicker}}
+              components={{RangePicker}}
               expressionScope={{}}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect($, actions, 'megaLayout.settlementName', FORM_FILTER_PATH);

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

@@ -32,7 +32,7 @@ interface infoType {
   payName: string, // 付款方
   orderTypeName: string, // 结算单据类型名称
   totalCount: number, // 总单数
-  amount: number, // 结算金额 
+  amount: number, // 结算金额
   statusName: string // 结算状态名称
 }
 
@@ -82,9 +82,9 @@ const logisticsDetail: React.FC = () => {
     console.log(values);
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
-  } 
+  }
 
   return (
     <PageHeaderWrapper
@@ -94,21 +94,21 @@ const logisticsDetail: React.FC = () => {
             style={{ padding: '0' }}
             onBack={() => history.goBack()}
             title={
-              <AvatarWrap 
+              <AvatarWrap
                 info={{
                   aloneTxt: '单',
                   name: "结算单号："
-                }} 
+                }}
                 extra={(
                   <span style={{ fontSize: 12, fontWeight: 'normal' }}>{infoDetail?.settlementNo}</span>
                 )}
               />
             }
           >
-            <Descriptions 
-              column={3} 
-              style={{ 
-                padding: '0 32px', 
+            <Descriptions
+              column={3}
+              style={{
+                padding: '0 32px',
               }}
             >
               <Descriptions.Item label="结算日期">{infoDetail?.settlementDate}</Descriptions.Item>
@@ -131,7 +131,7 @@ const logisticsDetail: React.FC = () => {
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}
           controlRender={
-            <NiceForm 
+            <NiceForm
               components={{RangePicker}}
               actions={formActions}
               expressionScope={{
@@ -159,4 +159,4 @@ const logisticsDetail: React.FC = () => {
   )
 }
 
-export default logisticsDetail
\ No newline at end of file
+export default logisticsDetail

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

@@ -81,10 +81,9 @@ const  ProductNoticeSettlementDetail: React.FC = () => {
     console.log(values);
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     const receiveStartTime = values.receiveStartTime?.format(format);
-    const receiveEndTime = values.receiveEndTime?.format(format);
-
+    const receiveEndTime = values.receiveEndTime ? values.receiveEndTime?.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime, receiveStartTime, receiveEndTime});
   }
 

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

@@ -28,29 +28,22 @@ export const schema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'mega-layout',
+          'x-component': 'flex-layout',
           'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
+            rowStyle: {
+              justifyContent: "flex-start",
+            },
+            colStyle: {
+              marginRight: 20,
+            },
           },
           properties: {
-            startTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: "结算时间（开始时间）"
-              }
-            },
-            endTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
+            "[startTime, endTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
-                placeholder: "结算时间（结束时间）"
-
+                placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
               }
             },
             status: {

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

@@ -152,9 +152,9 @@ const SettlementList = () => {
   const handleSearch = (values) => {
     const format = 'YYYY-MM-DD'
     const payStartTime = values.payStartTime?.format(format);
-    const payEndTime = values.payEndTime?.format(format);
+    const payEndTime = values.payEndTime ? values.payEndTime.format(format) + " 23:59:59" : "";
     const orderStartTime = values.orderStartTime?.format(format);
-    const orderEndTime = values.orderEndTime?.format(format);
+    const orderEndTime = values.orderEndTime ? values.orderEndTime?.format(format) + " 23:59:59" : ""; ;
     ref.current.reload({...values, payStartTime, payEndTime, orderStartTime,  orderEndTime});
   }
 

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

@@ -20,6 +20,7 @@ import StatusTag from '../../components/StatusTag';
 import EyePreview from '@/components/EyePreview';
 import { payStatus } from '../../common';
 import { fetchOptions } from '../../common';
+const { RangePicker } = DatePicker;
 
 const formActions = createFormActions();
 // 应收账款管理-收款方查看凭证， 能力中心
@@ -137,7 +138,7 @@ const SettlementList = () => {
   const handleSearch = (values: any) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format("YYYY-MM-DD") + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
   }
 
@@ -153,7 +154,7 @@ const SettlementList = () => {
           fetchTableData={(params: any) => fetchListData(params)}
           controlRender={
             <NiceForm
-              components={{DatePicker}}
+              components={{RangePicker}}
               actions={formActions}
               expressionScope={{}}
               effects={($, actions) => {

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

@@ -80,7 +80,7 @@ const logisticsDetail: React.FC = () => {
   const handleSearch = (values) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime});
   }
 

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

@@ -82,9 +82,9 @@ const  ProductNoticeSettlementDetail: React.FC = () => {
     console.log(values);
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime?.format(format);
+    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
     const receiveStartTime = values.receiveStartTime?.format(format);
-    const receiveEndTime = values.receiveEndTime?.format(format);
+    const receiveEndTime = values.receiveEndTime ? values.receiveEndTime?.format(format) + " 23:59:59" : "";
     ref.current.reload({...values, startTime, endTime, receiveStartTime, receiveEndTime});
   }
 

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

@@ -28,29 +28,22 @@ export const schema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'mega-layout',
+          'x-component': 'flex-layout',
           'x-component-props': {
-            grid: true,
-            full: true,
-            autoRow: true,
-            columns: 6,
+            rowStyle: {
+              justifyContent: "flex-start",
+            },
+            colStyle: {
+              marginRight: 20,
+            },
           },
           properties: {
-            startTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
-              'x-component-props': {
-                allowClear: true,
-                placeholder: '结算日期（开始时间）'
-              }
-            },
-            endTime: {
-              type: 'string',
-              'x-component': 'DatePicker',
+            "[startTime, endTime]": {
+              type: 'object',
+              "x-component": 'RangePicker',
               'x-component-props': {
                 allowClear: true,
-                placeholder: '结算日期（开始时间）'
-
+                placeholder: ["结算时间（开始时间）", "结算时间（结束时间）"],
               }
             },
             status: {

src/pages/balance/components/UploadPayVoucher/index.tsx

@@ -42,10 +42,9 @@ const UploadPayVoucher: React.FC<Iprops> = (props) => {
    */
   useEffect(() => {
     async function getAccountInfo() {
-      ///settle/accounts/corporate/account/config
-      const { data, code } = await PublicApi.getSettleAccountsCorporateAccountConfig({
+      const { data, code } = await PublicApi.getSettleAccountsGetMemberAccountConfig({
         memberId: props.id.toString(),
-        memberRoleId: props.roleId.toString(),
+        roleId: props.roleId.toString(),
       });
       if(code == 1000) {
         setAccountInfo(data);