Commit d042058daf1c89174a82e63503718a28f79675ba

Authored by boyang
1 parent 11b8315a

fix: 修复预警页面回款报错

src/pages/Order/OrderWarning/index.tsx
@@ -222,6 +222,12 @@ const OrderPage = () => { @@ -222,6 +222,12 @@ const OrderPage = () => {
222 setSelectedRows([]); 222 setSelectedRows([]);
223 setSelectedSubOrderKeys([]); 223 setSelectedSubOrderKeys([]);
224 }; 224 };
  225 + const refreshTable2 = () => {
  226 + mainTableSecondRef.current?.reload();
  227 + //刷新表格数据的时候,取消选中行
  228 + setSelectedRows([]);
  229 + setSelectedSubOrderKeys([]);
  230 + };
225 231
226 /*useEffect(() => { 232 /*useEffect(() => {
227 let initAfterInvoicingStatus = async () => { 233 let initAfterInvoicingStatus = async () => {
@@ -4091,7 +4097,6 @@ const OrderPage = () => { @@ -4091,7 +4097,6 @@ const OrderPage = () => {
4091 const newDate = new Date(currentDate); 4097 const newDate = new Date(currentDate);
4092 newDate.setDate(currentDate.getDate() - value); 4098 newDate.setDate(currentDate.getDate() - value);
4093 const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss'); 4099 const formattedDate = format(newDate, 'yyyy-MM-dd HH:mm:ss');
4094 - console.log(formattedDate, '5656newdate');  
4095 setCalDate(formattedDate); 4100 setCalDate(formattedDate);
4096 setValue1(value); 4101 setValue1(value);
4097 }; 4102 };
@@ -4126,7 +4131,6 @@ const OrderPage = () => { @@ -4126,7 +4131,6 @@ const OrderPage = () => {
4126 message.success(data.message); 4131 message.success(data.message);
4127 refreshTable(); 4132 refreshTable();
4128 } 4133 }
4129 - console.log('5656confirm');  
4130 }; 4134 };
4131 const [invoiceWarningNum, setInvoiceWarningNum] = useState(0); 4135 const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
4132 const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0); 4136 const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
@@ -4134,7 +4138,6 @@ const OrderPage = () => { @@ -4134,7 +4138,6 @@ const OrderPage = () => {
4134 const res = await postServiceOrderWarningOrderStatistics(); 4138 const res = await postServiceOrderWarningOrderStatistics();
4135 setInvoiceWarningNum(res.data.waitConfirmInvoice); 4139 setInvoiceWarningNum(res.data.waitConfirmInvoice);
4136 setInvoiceRefundWarningNum(res.data.waitConfirmReceipt); 4140 setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
4137 - console.log('56561');  
4138 } 4141 }
4139 useEffect(() => { 4142 useEffect(() => {
4140 //预警订单数 4143 //预警订单数
@@ -4173,7 +4176,6 @@ const OrderPage = () => { @@ -4173,7 +4176,6 @@ const OrderPage = () => {
4173 params.applyTimeLe = calDate; 4176 params.applyTimeLe = calDate;
4174 } 4177 }
4175 params.applyTimeIsNotNull = true; 4178 params.applyTimeIsNotNull = true;
4176 - console.log(params, '5656paramsFlush');  
4177 setSearchParam(params); 4179 setSearchParam(params);
4178 4180
4179 const res = await postServiceOrderQueryServiceOrder({ 4181 const res = await postServiceOrderQueryServiceOrder({
@@ -4982,7 +4984,7 @@ const OrderPage = () => { @@ -4982,7 +4984,7 @@ const OrderPage = () => {
4982 setOrderDrawerVisible(false); 4984 setOrderDrawerVisible(false);
4983 clearOptObject(); 4985 clearOptObject();
4984 if (isSuccess) { 4986 if (isSuccess) {
4985 - refreshTable(); 4987 + refreshTable2();
4986 } 4988 }
4987 }} 4989 }}
4988 orderOptType={orderOptType} 4990 orderOptType={orderOptType}
@@ -5012,7 +5014,7 @@ const OrderPage = () => { @@ -5012,7 +5014,7 @@ const OrderPage = () => {
5012 onClose={() => { 5014 onClose={() => {
5013 clearOptObject(); 5015 clearOptObject();
5014 setCheckVisible(false); 5016 setCheckVisible(false);
5015 - refreshTable(); 5017 + refreshTable2();
5016 }} 5018 }}
5017 /> 5019 />
5018 )} 5020 )}
@@ -5037,7 +5039,7 @@ const OrderPage = () => { @@ -5037,7 +5039,7 @@ const OrderPage = () => {
5037 setApplyForInvoicingVisible(false); 5039 setApplyForInvoicingVisible(false);
5038 setIsMainOrder(false); 5040 setIsMainOrder(false);
5039 clearOptObject(); 5041 clearOptObject();
5040 - refreshTable(); 5042 + refreshTable2();
5041 }} 5043 }}
5042 /> 5044 />
5043 )} 5045 )}
@@ -5058,7 +5060,7 @@ const OrderPage = () => { @@ -5058,7 +5060,7 @@ const OrderPage = () => {
5058 setSelectedRows([]); 5060 setSelectedRows([]);
5059 setNotes(notes); 5061 setNotes(notes);
5060 setNotesType(1); 5062 setNotesType(1);
5061 - refreshTable(); 5063 + refreshTable2();
5062 }} 5064 }}
5063 /> 5065 />
5064 )} 5066 )}
@@ -5078,7 +5080,7 @@ const OrderPage = () => { @@ -5078,7 +5080,7 @@ const OrderPage = () => {
5078 clearOptObject(); 5080 clearOptObject();
5079 setDeliverVisible(false); 5081 setDeliverVisible(false);
5080 setIsSendProduct(false); 5082 setIsSendProduct(false);
5081 - refreshTable(); 5083 + refreshTable2();
5082 }} 5084 }}
5083 /> 5085 />
5084 )} 5086 )}
@@ -5102,7 +5104,7 @@ const OrderPage = () => { @@ -5102,7 +5104,7 @@ const OrderPage = () => {
5102 onClose={() => { 5104 onClose={() => {
5103 setFinancialVisible(false); 5105 setFinancialVisible(false);
5104 clearOptObject(); 5106 clearOptObject();
5105 - refreshTable(); 5107 + refreshTable2();
5106 setIsMainOrder(false); 5108 setIsMainOrder(false);
5107 setIsEdit(false); 5109 setIsEdit(false);
5108 }} 5110 }}
@@ -5120,7 +5122,7 @@ const OrderPage = () => { @@ -5120,7 +5122,7 @@ const OrderPage = () => {
5120 }} 5122 }}
5121 onClose={() => { 5123 onClose={() => {
5122 setFinancialEditVisible(false); 5124 setFinancialEditVisible(false);
5123 - refreshTable(); 5125 + refreshTable2();
5124 setIsMainOrder(false); 5126 setIsMainOrder(false);
5125 clearOptObject(); 5127 clearOptObject();
5126 }} 5128 }}
@@ -5143,7 +5145,7 @@ const OrderPage = () => { @@ -5143,7 +5145,7 @@ const OrderPage = () => {
5143 setOrderPrintVisible(false); 5145 setOrderPrintVisible(false);
5144 clearOptObject(); 5146 clearOptObject();
5145 setIsRePrintOrder(false); 5147 setIsRePrintOrder(false);
5146 - refreshTable(); 5148 + refreshTable2();
5147 }} 5149 }}
5148 /> 5150 />
5149 )} 5151 )}
@@ -5154,7 +5156,7 @@ const OrderPage = () => { @@ -5154,7 +5156,7 @@ const OrderPage = () => {
5154 onClose={() => { 5156 onClose={() => {
5155 setConfirmReceiptVisible(false); 5157 setConfirmReceiptVisible(false);
5156 clearOptObject(); 5158 clearOptObject();
5157 - refreshTable(); 5159 + refreshTable2();
5158 }} 5160 }}
5159 /> 5161 />
5160 )} 5162 )}
@@ -5179,7 +5181,7 @@ const OrderPage = () => { @@ -5179,7 +5181,7 @@ const OrderPage = () => {
5179 <ImportModal 5181 <ImportModal
5180 onClose={() => { 5182 onClose={() => {
5181 setImportModalVisible(false); 5183 setImportModalVisible(false);
5182 - refreshTable(); 5184 + refreshTable2();
5183 }} 5185 }}
5184 /> 5186 />
5185 )} 5187 )}
@@ -5244,7 +5246,7 @@ const OrderPage = () =&gt; { @@ -5244,7 +5246,7 @@ const OrderPage = () =&gt; {
5244 setProcureCheckModalVisible(false); 5246 setProcureCheckModalVisible(false);
5245 clearOptObject(); 5247 clearOptObject();
5246 setIsMainOrder(false); 5248 setIsMainOrder(false);
5247 - refreshTable(); 5249 + refreshTable2();
5248 }} 5250 }}
5249 /> 5251 />
5250 )} 5252 )}
@@ -5262,7 +5264,7 @@ const OrderPage = () =&gt; { @@ -5262,7 +5264,7 @@ const OrderPage = () =&gt; {
5262 onClose={() => { 5264 onClose={() => {
5263 setAfterSalesDrawerVisible(false); 5265 setAfterSalesDrawerVisible(false);
5264 clearOptObject(); 5266 clearOptObject();
5265 - refreshTable(); 5267 + refreshTable2();
5266 }} 5268 }}
5267 /> 5269 />
5268 )} 5270 )}
@@ -5279,7 +5281,7 @@ const OrderPage = () =&gt; { @@ -5279,7 +5281,7 @@ const OrderPage = () =&gt; {
5279 onClose={() => { 5281 onClose={() => {
5280 setProcureConvertModalVisible(false); 5282 setProcureConvertModalVisible(false);
5281 clearOptObject(); 5283 clearOptObject();
5282 - refreshTable(); 5284 + refreshTable2();
5283 }} 5285 }}
5284 /> 5286 />
5285 )} 5287 )}
@@ -5301,7 +5303,7 @@ const OrderPage = () =&gt; { @@ -5301,7 +5303,7 @@ const OrderPage = () =&gt; {
5301 setFinancialMergeDrawerVisible(false); 5303 setFinancialMergeDrawerVisible(false);
5302 setIsMainOrder(false); 5304 setIsMainOrder(false);
5303 clearOptObject(); 5305 clearOptObject();
5304 - refreshTable(); 5306 + refreshTable2();
5305 }} 5307 }}
5306 /> 5308 />
5307 )} 5309 )}
@@ -5318,7 +5320,7 @@ const OrderPage = () =&gt; { @@ -5318,7 +5320,7 @@ const OrderPage = () =&gt; {
5318 onClose={() => { 5320 onClose={() => {
5319 setFinancialReceiptsModalVisible(false); 5321 setFinancialReceiptsModalVisible(false);
5320 setSelectedRows({}); 5322 setSelectedRows({});
5321 - refreshTable(); 5323 + refreshTable2();
5322 }} 5324 }}
5323 /> 5325 />
5324 )} 5326 )}
@@ -5337,7 +5339,7 @@ const OrderPage = () =&gt; { @@ -5337,7 +5339,7 @@ const OrderPage = () =&gt; {
5337 setShippingWarehouseChangeModalVisible(false); 5339 setShippingWarehouseChangeModalVisible(false);
5338 clearOptObject(); 5340 clearOptObject();
5339 setIds([]); 5341 setIds([]);
5340 - refreshTable(); 5342 + refreshTable2();
5341 }} 5343 }}
5342 /> 5344 />
5343 )} 5345 )}
@@ -5357,7 +5359,7 @@ const OrderPage = () =&gt; { @@ -5357,7 +5359,7 @@ const OrderPage = () =&gt; {
5357 onClose={() => { 5359 onClose={() => {
5358 setReissueVisible(false); 5360 setReissueVisible(false);
5359 clearOptObject(); 5361 clearOptObject();
5360 - refreshTable(); 5362 + refreshTable2();
5361 }} 5363 }}
5362 /> 5364 />
5363 )} 5365 )}
@@ -5375,7 +5377,7 @@ const OrderPage = () =&gt; { @@ -5375,7 +5377,7 @@ const OrderPage = () =&gt; {
5375 onClose={() => { 5377 onClose={() => {
5376 setReissueVisibleOld(false); 5378 setReissueVisibleOld(false);
5377 clearOptObject(); 5379 clearOptObject();
5378 - refreshTable(); 5380 + refreshTable2();
5379 }} 5381 }}
5380 /> 5382 />
5381 )} 5383 )}
@@ -5391,7 +5393,7 @@ const OrderPage = () =&gt; { @@ -5391,7 +5393,7 @@ const OrderPage = () =&gt; {
5391 onClose={() => { 5393 onClose={() => {
5392 setProductionTimeModalVisible(false); 5394 setProductionTimeModalVisible(false);
5393 clearOptObject(); 5395 clearOptObject();
5394 - refreshTable(); 5396 + refreshTable2();
5395 }} 5397 }}
5396 /> 5398 />
5397 )} 5399 )}
@@ -5426,7 +5428,7 @@ const OrderPage = () =&gt; { @@ -5426,7 +5428,7 @@ const OrderPage = () =&gt; {
5426 onClose={() => { 5428 onClose={() => {
5427 setUploadPayBillModalVisible(false); 5429 setUploadPayBillModalVisible(false);
5428 clearOptObject(); 5430 clearOptObject();
5429 - refreshTable(); 5431 + refreshTable2();
5430 }} 5432 }}
5431 /> 5433 />
5432 )} 5434 )}
@@ -5448,7 +5450,7 @@ const OrderPage = () =&gt; { @@ -5448,7 +5450,7 @@ const OrderPage = () =&gt; {
5448 setInvoicingDrawerFormVisible(false); 5450 setInvoicingDrawerFormVisible(false);
5449 setIsMainOrder(true); 5451 setIsMainOrder(true);
5450 clearOptObject(); 5452 clearOptObject();
5451 - refreshTable(); 5453 + refreshTable2();
5452 }} 5454 }}
5453 /> 5455 />
5454 )} 5456 )}