Commit 967ee14e84d1d9d801eb4e9b08fa20141298fe90

Authored by boyang
1 parent 6e61e86c

fix: 修改回款bug

src/pages/Order/OrderWarning/index.tsx
@@ -197,8 +197,10 @@ const OrderPage = () => { @@ -197,8 +197,10 @@ const OrderPage = () => {
197 const mainTableSecondRef = useRef<ActionType>(); 197 const mainTableSecondRef = useRef<ActionType>();
198 const mainTableFormRef = useRef<ProFormInstance>(); 198 const mainTableFormRef = useRef<ProFormInstance>();
199 const mainTableSecondFormRef = useRef<ProFormInstance>(); 199 const mainTableSecondFormRef = useRef<ProFormInstance>();
200 - let [setSearchParam] = useState(Object); //表格的查询条件存储  
201 - const [contextHolder] = message.useMessage(); 200 + let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
  201 + console.log(searchParams);
  202 + const [messageApi, contextHolder] = message.useMessage();
  203 + console.log(messageApi);
202 const [ 204 const [
203 shippingWarehouseChangeModalVisible, 205 shippingWarehouseChangeModalVisible,
204 setShippingWarehouseChangeModalVisible, 206 setShippingWarehouseChangeModalVisible,
@@ -416,6 +418,7 @@ const OrderPage = () =&gt; { @@ -416,6 +418,7 @@ const OrderPage = () =&gt; {
416 // if (!curretnOptSubId) { 418 // if (!curretnOptSubId) {
417 //如果有选中子订单,那么取选中的子订单为操作对象,否则取当前主订单的全部子订单为操作对象 419 //如果有选中子订单,那么取选中的子订单为操作对象,否则取当前主订单的全部子订单为操作对象
418 let currentOptSubOrders = subOrderSelectedMap.get(currentOptMainId); 420 let currentOptSubOrders = subOrderSelectedMap.get(currentOptMainId);
  421 +
419 if ( 422 if (
420 currentOptSubOrders === null || 423 currentOptSubOrders === null ||
421 currentOptSubOrders === undefined || 424 currentOptSubOrders === undefined ||
@@ -640,6 +643,8 @@ const OrderPage = () =&gt; { @@ -640,6 +643,8 @@ const OrderPage = () =&gt; {
640 * @param optRecord 643 * @param optRecord
641 */ 644 */
642 function getOrderStatusTag(optRecord: any): import('react').ReactNode { 645 function getOrderStatusTag(optRecord: any): import('react').ReactNode {
  646 + console.log(optRecord);
  647 +
643 const orderStatus = optRecord.orderStatus; 648 const orderStatus = optRecord.orderStatus;
644 const paymentMethod = optRecord.paymentMethod; 649 const paymentMethod = optRecord.paymentMethod;
645 let orderStatusTagText = enumValueToLabel( 650 let orderStatusTagText = enumValueToLabel(
@@ -2836,6 +2841,7 @@ const OrderPage = () =&gt; { @@ -2836,6 +2841,7 @@ const OrderPage = () =&gt; {
2836 onClick={() => { 2841 onClick={() => {
2837 setCurrentMainId(record.id); 2842 setCurrentMainId(record.id);
2838 setReissueVisibleOld(true); 2843 setReissueVisibleOld(true);
  2844 + console.log(reissueVisible);
2839 }} 2845 }}
2840 > 2846 >
2841 重新开票(旧) 2847 重新开票(旧)