修改结算以及首页

src/layouts/BasicLayout.tsx

@@ -15,6 +15,7 @@ import logo from '../../mockStatic/logo.png'
 import MenuSlider from './components/MenuSlider'
 import { getMatchMenu } from '@umijs/route-utils';
 import { useGlobal } from '@/models/useGlobal';
+import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons';
 
 export interface BasicLayoutProps extends ProLayoutProps {
   breadcrumbNameMap: {
@@ -71,9 +72,13 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   const [collapsed, setCollapsed] = useState(false)
   const [selectedKeys, setSelectedKeys] = useState<string[] | undefined>([]);
   // 获取全局状态
-  const [globalState, globalDispatch] = useGlobal()
+  const [globalState, globalDispatch] = useGlobal();
+  const isHome = location.pathname === '/memberCenter/home'
 
   const handleMenuCollapse = (payload: boolean): void => {
+    if(isHome) {
+      return ;
+    }
     setCollapsed(payload)
     if (payload) {
       setOpenKeys([])
@@ -131,17 +136,24 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
   }, [currentRouter, collapsed])
 
   useLayoutEffect(() => {
-    if(location.pathname === '/memberCenter/home') {
+    if(isHome) {
       setCollapsed(true)
     } else {
       setCollapsed(false);
     }
   }, [location.pathname])
 
+  const prolayoutStyle = isHome
+    ? {
+        minHeight: '100vh',
+        minWidth: '1280px'
+      }
+    : {}
+
   return (
     <ProLayout
       pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
-      style={{ minHeight: '100vh', minWidth: "1500px" }}
+      style={prolayoutStyle}
       logo={logo}
       formatMessage={formatMessage}
       menuHeaderRender={(logoDom, titleDom) => (
@@ -151,6 +163,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
         </Link>
       )}
       collapsed={collapsed}
+      collapsedButtonRender={(flag) => (isHome ? null : flag ? <MenuUnfoldOutlined /> : <MenuFoldOutlined/>) }
       onCollapse={handleMenuCollapse}
       disableContentMargin={currentRouter?.noMargin !== undefined}
       breadcrumbRender={(routers = []) => [

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

@@ -159,6 +159,10 @@ const SettlementList = () => {
               }}
               schema={schema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
             />
           }
         />

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

@@ -40,14 +40,17 @@ export const schema: ISchema = {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: "结算时间（开始时间）"
               }
             },
             endTime: {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: "结算时间（结束时间）"
+
               }
             },
             status: {

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

@@ -183,6 +183,7 @@ const SettlementList = () => {
               }}
               schema={schema}
               onSubmit={reload}
+
             />
           }
         />

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

@@ -170,6 +170,10 @@ const SettlementList = () => {
               }}
               schema={schema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
             />
           }
         />

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

@@ -148,6 +148,10 @@ const logisticsDetail: React.FC = () => {
               }}
               schema={logisticsDetailSchema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
             />
           }
         />

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

@@ -152,6 +152,12 @@ const  ProductNoticeSettlementDetail: React.FC = () => {
               }}
               schema={detailSchema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+                formActions.setFieldValue('receiveStartTime', null);
+                formActions.setFieldValue('receiveEndTime', null);
+              }}
             />
           }
         />

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

@@ -40,14 +40,17 @@ export const schema: ISchema = {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（开始时间）'
               }
             },
             endTime: {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（开始时间）'
+
               }
             },
             status: {

src/pages/balance/platformSettlement/accountReceivable/index.tsx

@@ -167,6 +167,10 @@ const AccountReceivable = () => {
               }}
               schema={schema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
             />
           }
         />

src/pages/balance/platformSettlement/accountReceivable/schema/index.tsx

@@ -36,14 +36,16 @@ export const schema: ISchema = {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（开始时间）'
               }
             },
             endTime: {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（结束时间）'
               }
             },
             status: {

src/pages/balance/platformSettlement/integral/index.tsx

@@ -168,6 +168,10 @@ const Integral: React.FC = () => {
               }}
               schema={schema}
               onSubmit={handleSearch}
+              onReset={() => {
+                formActions.setFieldValue('startTime', null);
+                formActions.setFieldValue('endTime', null);
+              }}
             />
           }
         />

src/pages/balance/platformSettlement/integral/schema/index.tsx

@@ -41,14 +41,16 @@ export const schema: ISchema = {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（开始时间）'
               }
             },
             endTime: {
               type: 'string',
               'x-component': 'DatePicker',
               'x-component-props': {
-                allowClear: true
+                allowClear: true,
+                placeholder: '结算日期（结束时间）'
               }
             },
             status: {

src/pages/balance/settleRules/memberSettle/index.tsx

@@ -73,6 +73,9 @@ const MemberSettle: React.FC<{}> = () => {
     {
       title: '操作',
       render: (text, record) => {
+        if(record.status == 1) {
+          return null
+        }
         return (
           <Space>
             <Link to={`/memberCenter/balance/settleRules/memberSettleList/edit?id=${record.id}`}>修改</Link>