Merge branch 'warning' of http://39.108.227.113:8001/zhusen/canrd-erp-front into warning

曾国涛
2 parents 1a0e794e 11b8315a
Showing 1 changed file with 9 additions and 5 deletions
src/pages/Order/OrderWarning/index.tsx
@@ -192,7 +192,9 @@ const OrderPage = () =&gt; {
   const [subOrderCount, setSubOrderCount] = useState(0);
   const [sorted] = useState(false);
   const mainTableRef = useRef<ActionType>();
+  const mainTableSecondRef = useRef<ActionType>();
   const mainTableFormRef = useRef<ProFormInstance>();
+  const mainTableSecondFormRef = useRef<ProFormInstance>();
   let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
   console.log(searchParams);
   const [messageApi, contextHolder] = message.useMessage();
@@ -4211,7 +4213,8 @@ const OrderPage = () =&gt; {
   // 监听 calDate 变化，触发请求
   useEffect(() => {
     if (calDate2) {
-      mainTableRef.current?.reload();
+      // mainTableRef.current?.reload();
+      mainTableSecondRef.current?.reload();
     }
   }, [calDate2]);
  
@@ -4235,8 +4238,9 @@ const OrderPage = () =&gt; {
      * 以params中的id为主，如果params没id，则取url中的id
      * 第一次进来这个页面，url带有id的话，会自动填充到查询表单中，但是第一次查询params不会带这个id进来
      */
-    let orderIds = mainTableFormRef.current?.getFieldValue('id');
-    let subOrderId = mainTableFormRef.current?.getFieldValue('subOrderId');
+    let orderIds = mainTableSecondFormRef.current?.getFieldValue('id');
+    let subOrderId =
+      mainTableSecondFormRef.current?.getFieldValue('subOrderId');
     params.id = params.id || orderIds;
     params.subOrderId = params.subOrderId || subOrderId;
     if (params.id !== '') {
@@ -4920,8 +4924,8 @@ const OrderPage = () =&gt; {
             id="main-table"
             // tableStyle={{backgroundColor:'red'}}
  
-            actionRef={mainTableRef}
-            formRef={mainTableFormRef}
+            actionRef={mainTableSecondRef}
+            formRef={mainTableSecondFormRef}
             expandIconColumnIndex={-1}
             columns={mainOrdersColumns}
             rowKey="id"