Commit 83293a3ad958570752b590694224aa329ba43477
Merge branch 'warning' of http://39.108.227.113:8001/zhusen/canrd-erp-front into warning
Showing
1 changed file
with
27 additions
and
25 deletions
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 | //预警订单数 |
@@ -4174,7 +4177,6 @@ const OrderPage = () => { | @@ -4174,7 +4177,6 @@ const OrderPage = () => { | ||
4174 | params.applyTimeLe = calDate; | 4177 | params.applyTimeLe = calDate; |
4175 | } | 4178 | } |
4176 | params.applyTimeIsNotNull = true; | 4179 | params.applyTimeIsNotNull = true; |
4177 | - console.log(params, '5656paramsFlush'); | ||
4178 | setSearchParam(params); | 4180 | setSearchParam(params); |
4179 | 4181 | ||
4180 | const res = await postServiceOrderQueryServiceOrder({ | 4182 | const res = await postServiceOrderQueryServiceOrder({ |
@@ -4983,7 +4985,7 @@ const OrderPage = () => { | @@ -4983,7 +4985,7 @@ const OrderPage = () => { | ||
4983 | setOrderDrawerVisible(false); | 4985 | setOrderDrawerVisible(false); |
4984 | clearOptObject(); | 4986 | clearOptObject(); |
4985 | if (isSuccess) { | 4987 | if (isSuccess) { |
4986 | - refreshTable(); | 4988 | + refreshTable2(); |
4987 | } | 4989 | } |
4988 | }} | 4990 | }} |
4989 | orderOptType={orderOptType} | 4991 | orderOptType={orderOptType} |
@@ -5013,7 +5015,7 @@ const OrderPage = () => { | @@ -5013,7 +5015,7 @@ const OrderPage = () => { | ||
5013 | onClose={() => { | 5015 | onClose={() => { |
5014 | clearOptObject(); | 5016 | clearOptObject(); |
5015 | setCheckVisible(false); | 5017 | setCheckVisible(false); |
5016 | - refreshTable(); | 5018 | + refreshTable2(); |
5017 | }} | 5019 | }} |
5018 | /> | 5020 | /> |
5019 | )} | 5021 | )} |
@@ -5038,7 +5040,7 @@ const OrderPage = () => { | @@ -5038,7 +5040,7 @@ const OrderPage = () => { | ||
5038 | setApplyForInvoicingVisible(false); | 5040 | setApplyForInvoicingVisible(false); |
5039 | setIsMainOrder(false); | 5041 | setIsMainOrder(false); |
5040 | clearOptObject(); | 5042 | clearOptObject(); |
5041 | - refreshTable(); | 5043 | + refreshTable2(); |
5042 | }} | 5044 | }} |
5043 | /> | 5045 | /> |
5044 | )} | 5046 | )} |
@@ -5059,7 +5061,7 @@ const OrderPage = () => { | @@ -5059,7 +5061,7 @@ const OrderPage = () => { | ||
5059 | setSelectedRows([]); | 5061 | setSelectedRows([]); |
5060 | setNotes(notes); | 5062 | setNotes(notes); |
5061 | setNotesType(1); | 5063 | setNotesType(1); |
5062 | - refreshTable(); | 5064 | + refreshTable2(); |
5063 | }} | 5065 | }} |
5064 | /> | 5066 | /> |
5065 | )} | 5067 | )} |
@@ -5079,7 +5081,7 @@ const OrderPage = () => { | @@ -5079,7 +5081,7 @@ const OrderPage = () => { | ||
5079 | clearOptObject(); | 5081 | clearOptObject(); |
5080 | setDeliverVisible(false); | 5082 | setDeliverVisible(false); |
5081 | setIsSendProduct(false); | 5083 | setIsSendProduct(false); |
5082 | - refreshTable(); | 5084 | + refreshTable2(); |
5083 | }} | 5085 | }} |
5084 | /> | 5086 | /> |
5085 | )} | 5087 | )} |
@@ -5103,7 +5105,7 @@ const OrderPage = () => { | @@ -5103,7 +5105,7 @@ const OrderPage = () => { | ||
5103 | onClose={() => { | 5105 | onClose={() => { |
5104 | setFinancialVisible(false); | 5106 | setFinancialVisible(false); |
5105 | clearOptObject(); | 5107 | clearOptObject(); |
5106 | - refreshTable(); | 5108 | + refreshTable2(); |
5107 | setIsMainOrder(false); | 5109 | setIsMainOrder(false); |
5108 | setIsEdit(false); | 5110 | setIsEdit(false); |
5109 | }} | 5111 | }} |
@@ -5121,7 +5123,7 @@ const OrderPage = () => { | @@ -5121,7 +5123,7 @@ const OrderPage = () => { | ||
5121 | }} | 5123 | }} |
5122 | onClose={() => { | 5124 | onClose={() => { |
5123 | setFinancialEditVisible(false); | 5125 | setFinancialEditVisible(false); |
5124 | - refreshTable(); | 5126 | + refreshTable2(); |
5125 | setIsMainOrder(false); | 5127 | setIsMainOrder(false); |
5126 | clearOptObject(); | 5128 | clearOptObject(); |
5127 | }} | 5129 | }} |
@@ -5144,7 +5146,7 @@ const OrderPage = () => { | @@ -5144,7 +5146,7 @@ const OrderPage = () => { | ||
5144 | setOrderPrintVisible(false); | 5146 | setOrderPrintVisible(false); |
5145 | clearOptObject(); | 5147 | clearOptObject(); |
5146 | setIsRePrintOrder(false); | 5148 | setIsRePrintOrder(false); |
5147 | - refreshTable(); | 5149 | + refreshTable2(); |
5148 | }} | 5150 | }} |
5149 | /> | 5151 | /> |
5150 | )} | 5152 | )} |
@@ -5155,7 +5157,7 @@ const OrderPage = () => { | @@ -5155,7 +5157,7 @@ const OrderPage = () => { | ||
5155 | onClose={() => { | 5157 | onClose={() => { |
5156 | setConfirmReceiptVisible(false); | 5158 | setConfirmReceiptVisible(false); |
5157 | clearOptObject(); | 5159 | clearOptObject(); |
5158 | - refreshTable(); | 5160 | + refreshTable2(); |
5159 | }} | 5161 | }} |
5160 | /> | 5162 | /> |
5161 | )} | 5163 | )} |
@@ -5180,7 +5182,7 @@ const OrderPage = () => { | @@ -5180,7 +5182,7 @@ const OrderPage = () => { | ||
5180 | <ImportModal | 5182 | <ImportModal |
5181 | onClose={() => { | 5183 | onClose={() => { |
5182 | setImportModalVisible(false); | 5184 | setImportModalVisible(false); |
5183 | - refreshTable(); | 5185 | + refreshTable2(); |
5184 | }} | 5186 | }} |
5185 | /> | 5187 | /> |
5186 | )} | 5188 | )} |
@@ -5245,7 +5247,7 @@ const OrderPage = () => { | @@ -5245,7 +5247,7 @@ const OrderPage = () => { | ||
5245 | setProcureCheckModalVisible(false); | 5247 | setProcureCheckModalVisible(false); |
5246 | clearOptObject(); | 5248 | clearOptObject(); |
5247 | setIsMainOrder(false); | 5249 | setIsMainOrder(false); |
5248 | - refreshTable(); | 5250 | + refreshTable2(); |
5249 | }} | 5251 | }} |
5250 | /> | 5252 | /> |
5251 | )} | 5253 | )} |
@@ -5263,7 +5265,7 @@ const OrderPage = () => { | @@ -5263,7 +5265,7 @@ const OrderPage = () => { | ||
5263 | onClose={() => { | 5265 | onClose={() => { |
5264 | setAfterSalesDrawerVisible(false); | 5266 | setAfterSalesDrawerVisible(false); |
5265 | clearOptObject(); | 5267 | clearOptObject(); |
5266 | - refreshTable(); | 5268 | + refreshTable2(); |
5267 | }} | 5269 | }} |
5268 | /> | 5270 | /> |
5269 | )} | 5271 | )} |
@@ -5280,7 +5282,7 @@ const OrderPage = () => { | @@ -5280,7 +5282,7 @@ const OrderPage = () => { | ||
5280 | onClose={() => { | 5282 | onClose={() => { |
5281 | setProcureConvertModalVisible(false); | 5283 | setProcureConvertModalVisible(false); |
5282 | clearOptObject(); | 5284 | clearOptObject(); |
5283 | - refreshTable(); | 5285 | + refreshTable2(); |
5284 | }} | 5286 | }} |
5285 | /> | 5287 | /> |
5286 | )} | 5288 | )} |
@@ -5302,7 +5304,7 @@ const OrderPage = () => { | @@ -5302,7 +5304,7 @@ const OrderPage = () => { | ||
5302 | setFinancialMergeDrawerVisible(false); | 5304 | setFinancialMergeDrawerVisible(false); |
5303 | setIsMainOrder(false); | 5305 | setIsMainOrder(false); |
5304 | clearOptObject(); | 5306 | clearOptObject(); |
5305 | - refreshTable(); | 5307 | + refreshTable2(); |
5306 | }} | 5308 | }} |
5307 | /> | 5309 | /> |
5308 | )} | 5310 | )} |
@@ -5319,7 +5321,7 @@ const OrderPage = () => { | @@ -5319,7 +5321,7 @@ const OrderPage = () => { | ||
5319 | onClose={() => { | 5321 | onClose={() => { |
5320 | setFinancialReceiptsModalVisible(false); | 5322 | setFinancialReceiptsModalVisible(false); |
5321 | setSelectedRows({}); | 5323 | setSelectedRows({}); |
5322 | - refreshTable(); | 5324 | + refreshTable2(); |
5323 | }} | 5325 | }} |
5324 | /> | 5326 | /> |
5325 | )} | 5327 | )} |
@@ -5338,7 +5340,7 @@ const OrderPage = () => { | @@ -5338,7 +5340,7 @@ const OrderPage = () => { | ||
5338 | setShippingWarehouseChangeModalVisible(false); | 5340 | setShippingWarehouseChangeModalVisible(false); |
5339 | clearOptObject(); | 5341 | clearOptObject(); |
5340 | setIds([]); | 5342 | setIds([]); |
5341 | - refreshTable(); | 5343 | + refreshTable2(); |
5342 | }} | 5344 | }} |
5343 | /> | 5345 | /> |
5344 | )} | 5346 | )} |
@@ -5358,7 +5360,7 @@ const OrderPage = () => { | @@ -5358,7 +5360,7 @@ const OrderPage = () => { | ||
5358 | onClose={() => { | 5360 | onClose={() => { |
5359 | setReissueVisible(false); | 5361 | setReissueVisible(false); |
5360 | clearOptObject(); | 5362 | clearOptObject(); |
5361 | - refreshTable(); | 5363 | + refreshTable2(); |
5362 | }} | 5364 | }} |
5363 | /> | 5365 | /> |
5364 | )} | 5366 | )} |
@@ -5376,7 +5378,7 @@ const OrderPage = () => { | @@ -5376,7 +5378,7 @@ const OrderPage = () => { | ||
5376 | onClose={() => { | 5378 | onClose={() => { |
5377 | setReissueVisibleOld(false); | 5379 | setReissueVisibleOld(false); |
5378 | clearOptObject(); | 5380 | clearOptObject(); |
5379 | - refreshTable(); | 5381 | + refreshTable2(); |
5380 | }} | 5382 | }} |
5381 | /> | 5383 | /> |
5382 | )} | 5384 | )} |
@@ -5392,7 +5394,7 @@ const OrderPage = () => { | @@ -5392,7 +5394,7 @@ const OrderPage = () => { | ||
5392 | onClose={() => { | 5394 | onClose={() => { |
5393 | setProductionTimeModalVisible(false); | 5395 | setProductionTimeModalVisible(false); |
5394 | clearOptObject(); | 5396 | clearOptObject(); |
5395 | - refreshTable(); | 5397 | + refreshTable2(); |
5396 | }} | 5398 | }} |
5397 | /> | 5399 | /> |
5398 | )} | 5400 | )} |
@@ -5427,7 +5429,7 @@ const OrderPage = () => { | @@ -5427,7 +5429,7 @@ const OrderPage = () => { | ||
5427 | onClose={() => { | 5429 | onClose={() => { |
5428 | setUploadPayBillModalVisible(false); | 5430 | setUploadPayBillModalVisible(false); |
5429 | clearOptObject(); | 5431 | clearOptObject(); |
5430 | - refreshTable(); | 5432 | + refreshTable2(); |
5431 | }} | 5433 | }} |
5432 | /> | 5434 | /> |
5433 | )} | 5435 | )} |
@@ -5449,7 +5451,7 @@ const OrderPage = () => { | @@ -5449,7 +5451,7 @@ const OrderPage = () => { | ||
5449 | setInvoicingDrawerFormVisible(false); | 5451 | setInvoicingDrawerFormVisible(false); |
5450 | setIsMainOrder(true); | 5452 | setIsMainOrder(true); |
5451 | clearOptObject(); | 5453 | clearOptObject(); |
5452 | - refreshTable(); | 5454 | + refreshTable2(); |
5453 | }} | 5455 | }} |
5454 | /> | 5456 | /> |
5455 | )} | 5457 | )} |