Merge branch 'bugfix-0804' into bugfix-invoicestatus

柏杨
2 parents e4d140c0 6aeca069
Showing 2 changed files with 79 additions and 76 deletions
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/OrderWarning/index.tsx
@@ -4872,8 +4872,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     if (paramsNew) {
       setNewParams(paramsNew);
       console.log(newParams);
+      refreshTable();
     }
-    // refreshTable();
   }, [paramsNew]);
   return (
     <div className="order-page-container">
@@ -5,26 +5,26 @@ import {
 import { downloadFile } from '@/services/order';
 import { getSalesCodeOptions } from '@/utils/order';
 import { getUserInfo } from '@/utils/user';
-import {
-  ActionType,
-  ProFormInstance,
-  ProFormSelect,
-} from '@ant-design/pro-components';
+import { ActionType, ProFormSelect } from '@ant-design/pro-components';
 import { Badge, Button, Radio, message } from 'antd';
 import { format } from 'date-fns';
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import OrderList from '../OrderList/OrderList';
 import './index.less';
 // import { useParams } from '@umijs/max';
  
+// 定义参数类型
+interface ParamsType {
+  [key: string]: any;
+}
+
 const OrderPage = () => {
-  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
-  const [salesCodeSelect, setSalesCodeSelect] = useState();
+  const [salesCodeOptions, setSalesCodeOptions] = useState<any[]>([]);
+  const [salesCodeSelect, setSalesCodeSelect] = useState<string>();
   const userInfo = getUserInfo();
  
   const mainTableRef = useRef<ActionType>();
-  const mainTableFormRef = useRef<ProFormInstance>();
-  let [searchParams] = useState(Object); //表格的查询条件存储
+  let [searchParams] = useState<ParamsType>({}); //表格的查询条件存储
   console.log(searchParams);
   const [messageApi] = message.useMessage();
   console.log(messageApi);
@@ -92,7 +92,8 @@ const OrderPage = () =&gt; {
   //选择天数
   const [calDate, setCalDate] = useState<string | null>(null);
   const [value1, setValue1] = useState(0);
-  const radioOnChange1 = ({ target: { value } }) => {
+  const radioOnChange1 = (e: any) => {
+    const { value } = e.target;
     const currentDate = new Date();
     // 创建一个新的日期对象，并在当前日期的基础上加上 daysToAdd 天
     const newDate = new Date(currentDate);
@@ -101,7 +102,7 @@ const OrderPage = () =&gt; {
     setCalDate(formattedDate);
     setValue1(value);
   };
-  function setOriginTime(value) {
+  function setOriginTime(value: number) {
     const currentDate = new Date();
     // 创建一个新的日期对象，并在当前日期的基础上加上 daysToAdd 天
     const newDate = new Date(currentDate);
@@ -214,12 +215,70 @@ const OrderPage = () =&gt; {
     const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss');
     setCalDate(formattedDate);
   }, [activeTabKey]);
+
+  // 使用 useMemo 让参数能够响应状态变化
+  const paramsNew = useMemo(() => {
+    // 初始化参数
+    let initialParams: ParamsType = {};
+    initialParams.isDeleteQueryOrderNow = false;
+    initialParams.salesCode = userInfo.username;
+    if (salesCodePermission) {
+      if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
+        initialParams.salesCode = salesCodeSelect;
+      } else {
+        initialParams.salesCode = userInfo.username;
+      }
+    }
+    // 根据activeTabKey动态扩展参数
+    if (activeTabKey === 1) {
+      initialParams = {
+        ...initialParams,
+        orderStatus: 'SHIPPED',
+        warningStatus: 'waitConfirmReicept',
+        statusDatetimeLe: calDate,
+      };
+    } else if (activeTabKey === 2) {
+      initialParams = {
+        ...initialParams,
+        warningStatus: 'invoicingWarning',
+        confirmReceiptDatetimeLe: calDate,
+      };
+    } else if (activeTabKey === 3) {
+      initialParams = {
+        ...initialParams,
+        warningStatus: 'waitFeedbackWarning',
+        confirmReceiptDatetimeLe: calDate,
+      };
+    } else if (activeTabKey === 4) {
+      initialParams = {
+        ...initialParams,
+        warningStatus: 'invoiceConfirmWarning',
+        invoicingEndTime: calDate,
+      };
+    } else if (activeTabKey === 5) {
+      initialParams = {
+        ...initialParams,
+        warningStatus: 'paymentReceiptStatusWarning',
+        paymentNotReceipt: true,
+        applyTimeLe: calDate,
+      };
+    }
+    // 返回完整的参数对象
+    return initialParams;
+  }, [
+    activeTabKey,
+    calDate,
+    salesCodeSelect,
+    salesCodePermission,
+    userInfo.username,
+  ]);
+
   //biaojidown2
   //取消单选，将时间设为null
   const handleSetNull = () => {
     setCalDate(null); // 这应该会触发 useEffect
   };
-  const selectSalesCode = (value) => {
+  const selectSalesCode = (value: string) => {
     setSalesCodeSelect(value); // 这应该会触发 useEffect
   };
   const warningOptions = [
@@ -310,10 +369,8 @@ const OrderPage = () =&gt; {
               <Radio
                 key={option.value}
                 value={option.value}
-                onClick={(e) => {
-                  radioOnChange1(
-                    e as unknown as React.ChangeEvent<HTMLInputElement>,
-                  );
+                onClick={(e: any) => {
+                  radioOnChange1(e);
                   handleSetNull();
                 }}
               >
@@ -331,15 +388,13 @@ const OrderPage = () =&gt; {
             <ProFormSelect
               name="salesCode"
               key="salesCode"
-              width="200px"
-              actionRef={mainTableRef}
-              formRef={mainTableFormRef}
+              width={200}
               initialValue={userInfo.username}
               showSearch
               label="销售代表"
               placeholder="请输入销售代表"
               options={salesCodeOptions}
-              onChange={(_, option) => {
+              onChange={(_, option: any) => {
                 if (option === undefined) {
                   selectSalesCode(userInfo.username);
                 }
@@ -365,7 +420,7 @@ const OrderPage = () =&gt; {
           <Button
             key="out"
             onClick={() => {
-              let initialParams = {};
+              let initialParams: ParamsType = {};
               initialParams.isDeleteQueryOrder = false;
               initialParams.flag = 50;
               initialParams.current = 1;
@@ -454,59 +509,7 @@ const OrderPage = () =&gt; {
         }}
         searchShow={false}
         toolbarShow={false} /> */}
-      <OrderList
-        paramsNew={(function () {
-          // 初始化参数
-          let initialParams = {};
-          initialParams.isDeleteQueryOrderNow = false;
-          initialParams.salesCode = userInfo.username;
-          if (salesCodePermission) {
-            if (salesCodeSelect !== undefined && salesCodeSelect !== null) {
-              initialParams.salesCode = salesCodeSelect;
-            } else {
-              initialParams.salesCode = userInfo.username;
-            }
-          }
-          // 根据activeTabKey动态扩展参数
-          if (activeTabKey === 1) {
-            initialParams = {
-              ...initialParams,
-              orderStatus: 'SHIPPED',
-              warningStatus: 'waitConfirmReicept',
-              statusDatetimeLe: calDate,
-            };
-          } else if (activeTabKey === 2) {
-            initialParams = {
-              ...initialParams,
-              warningStatus: 'invoicingWarning',
-              confirmReceiptDatetimeLe: calDate,
-            };
-          } else if (activeTabKey === 3) {
-            initialParams = {
-              ...initialParams,
-              warningStatus: 'waitFeedbackWarning',
-              confirmReceiptDatetimeLe: calDate,
-            };
-          } else if (activeTabKey === 4) {
-            initialParams = {
-              ...initialParams,
-              warningStatus: 'invoiceConfirmWarning',
-              invoicingEndTime: calDate,
-            };
-          } else if (activeTabKey === 5) {
-            initialParams = {
-              ...initialParams,
-              warningStatus: 'paymentReceiptStatusWarning',
-              paymentNotReceipt: true,
-              applyTimeLe: calDate,
-            };
-          }
-          // 返回完整的参数对象
-          return initialParams;
-        })()}
-        searchShow={false}
-        toolbarShow={false}
-      />
+      <OrderList paramsNew={paramsNew} searchShow={false} toolbarShow={false} />
     </div>
   );
 };