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

曾国涛
2 parents 8cb4c8d1 d042058d
Showing 1 changed file with 27 additions and 25 deletions
src/pages/Order/OrderWarning/index.tsx
@@ -222,6 +222,12 @@ const OrderPage = () =&gt; {
     setSelectedRows([]);
     setSelectedSubOrderKeys([]);
   };
+  const refreshTable2 = () => {
+    mainTableSecondRef.current?.reload();
+    //刷新表格数据的时候,取消选中行
+    setSelectedRows([]);
+    setSelectedSubOrderKeys([]);
+  };
  
   /*useEffect(() => {
     let initAfterInvoicingStatus = async () => {
@@ -4091,7 +4097,6 @@ const OrderPage = () =&gt; {
     const newDate = new Date(currentDate);
     newDate.setDate(currentDate.getDate() - value);
     const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss');
-    console.log(formattedDate, '5656newdate');
     setCalDate(formattedDate);
     setValue1(value);
   };
@@ -4126,7 +4131,6 @@ const OrderPage = () =&gt; {
       message.success(data.message);
       refreshTable();
     }
-    console.log('5656confirm');
   };
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
@@ -4134,7 +4138,6 @@ const OrderPage = () =&gt; {
     const res = await postServiceOrderWarningOrderStatistics();
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
-    console.log('56561');
   }
   useEffect(() => {
     //预警订单数
@@ -4174,7 +4177,6 @@ const OrderPage = () =&gt; {
       params.applyTimeLe = calDate;
     }
     params.applyTimeIsNotNull = true;
-    console.log(params, '5656paramsFlush');
     setSearchParam(params);
  
     const res = await postServiceOrderQueryServiceOrder({
@@ -4983,7 +4985,7 @@ const OrderPage = () =&gt; {
                 setOrderDrawerVisible(false);
                 clearOptObject();
                 if (isSuccess) {
-                  refreshTable();
+                  refreshTable2();
                 }
               }}
               orderOptType={orderOptType}
@@ -5013,7 +5015,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 clearOptObject();
                 setCheckVisible(false);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5038,7 +5040,7 @@ const OrderPage = () =&gt; {
                 setApplyForInvoicingVisible(false);
                 setIsMainOrder(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5059,7 +5061,7 @@ const OrderPage = () =&gt; {
                 setSelectedRows([]);
                 setNotes(notes);
                 setNotesType(1);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5079,7 +5081,7 @@ const OrderPage = () =&gt; {
                 clearOptObject();
                 setDeliverVisible(false);
                 setIsSendProduct(false);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5103,7 +5105,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setFinancialVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
                 setIsMainOrder(false);
                 setIsEdit(false);
               }}
@@ -5121,7 +5123,7 @@ const OrderPage = () =&gt; {
               }}
               onClose={() => {
                 setFinancialEditVisible(false);
-                refreshTable();
+                refreshTable2();
                 setIsMainOrder(false);
                 clearOptObject();
               }}
@@ -5144,7 +5146,7 @@ const OrderPage = () =&gt; {
                 setOrderPrintVisible(false);
                 clearOptObject();
                 setIsRePrintOrder(false);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5155,7 +5157,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setConfirmReceiptVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5180,7 +5182,7 @@ const OrderPage = () =&gt; {
             <ImportModal
               onClose={() => {
                 setImportModalVisible(false);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5245,7 +5247,7 @@ const OrderPage = () =&gt; {
                 setProcureCheckModalVisible(false);
                 clearOptObject();
                 setIsMainOrder(false);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5263,7 +5265,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setAfterSalesDrawerVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5280,7 +5282,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setProcureConvertModalVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5302,7 +5304,7 @@ const OrderPage = () =&gt; {
                 setFinancialMergeDrawerVisible(false);
                 setIsMainOrder(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5319,7 +5321,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setFinancialReceiptsModalVisible(false);
                 setSelectedRows({});
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5338,7 +5340,7 @@ const OrderPage = () =&gt; {
                 setShippingWarehouseChangeModalVisible(false);
                 clearOptObject();
                 setIds([]);
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5358,7 +5360,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setReissueVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5376,7 +5378,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setReissueVisibleOld(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5392,7 +5394,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setProductionTimeModalVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5427,7 +5429,7 @@ const OrderPage = () =&gt; {
               onClose={() => {
                 setUploadPayBillModalVisible(false);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}
@@ -5449,7 +5451,7 @@ const OrderPage = () =&gt; {
                 setInvoicingDrawerFormVisible(false);
                 setIsMainOrder(true);
                 clearOptObject();
-                refreshTable();
+                refreshTable2();
               }}
             />
           )}