fix: 排查回款bug

boyang
1 parent de4ea95b
Showing 2 changed files with 40 additions and 7 deletions
dist.zip
src/pages/Order/OrderWarning/index.tsx
@@ -188,7 +188,9 @@ const OrderPage = () =&gt; {
   const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map key：主订单id value：主订单数据
   const [subOrderSelectedMap, setSubOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
   const [currentOptMainId, setCurrentMainId] = useState<any>(undefined); //当前操作对象的主订单id
+  // const [currentOptMainId, setCurrentMainId] = useState<any>(undefined); //当前操作对象的主订单id
   const [curretnOptSubId, setCurretnOptSubId] = useState<any>(undefined); //当前操作对象的子订单id
+  // const [curretnOptSubId, setCurretnOptSubId] = useState<any>(undefined); //当前操作对象的子订单id
   const [subOrderCount, setSubOrderCount] = useState(0);
   const [sorted] = useState(false);
   const mainTableRef = useRef<ActionType>();
@@ -331,8 +333,10 @@ const OrderPage = () =&gt; {
    * @param mainId
    */
   function createOptObject(subId: any, mainId: any) {
+    console.log(currentOptMainId, '5656createOptObject1', curretnOptSubId);
     setCurrentMainId(mainId);
     setCurretnOptSubId(subId);
+    console.log(currentOptMainId, '5656createOptObject2', curretnOptSubId);
   }
  
   /**
@@ -381,7 +385,12 @@ const OrderPage = () =&gt; {
    * 返回当前操作的主订单数据
    */
   function buildMainOrder() {
-    if (currentOptMainId === undefined || currentOptMainId === null) {
+    console.log(
+      currentOptMainId,
+      '5656buildMainOrder currentOptMainId/curretnOptSubId',
+      curretnOptSubId,
+    );
+    if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
     }
@@ -390,14 +399,14 @@ const OrderPage = () =&gt; {
     let matchedData = data.filter((item) => {
       return item.id === currentOptMainId;
     });
+    console.log(data, '5656buildMainOrder2 data/matchedData', matchedData);
     if (matchedData.length > 0) {
       mainOrderClone = cloneDeep(matchedData[0]);
     }
-
-    if (mainOrderClone === null) {
+    console.log(mainOrderClone, '5656buildMainOrder mainOrderClone');
+    if (!mainOrderClone) {
       message.error('页面错误：当前操作的主订单数据不存在，请联系系统管理员');
     }
-
     return mainOrderClone;
   }
  
@@ -405,7 +414,12 @@ const OrderPage = () =&gt; {
    * 返回当前操作的子订单集合
    */
   function buildSubOrders() {
-    if (currentOptMainId === undefined || currentOptMainId === null) {
+    console.log(
+      curretnOptSubId,
+      '5656buildSubOrders currentOptMainId/currentOptMainId',
+      currentOptMainId,
+    );
+    if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
     }
@@ -414,8 +428,14 @@ const OrderPage = () =&gt; {
  
     //如果没有传当前操作的子订单id，说明是操作主订单
     if (curretnOptSubId === undefined || curretnOptSubId === null) {
+      // if (!curretnOptSubId) {
       //如果有选中子订单，那么取选中的子订单为操作对象，否则取当前主订单的全部子订单为操作对象
       let currentOptSubOrders = subOrderSelectedMap.get(currentOptMainId);
+      console.log(
+        subOrderSelectedMap,
+        '5656buildSubOrders subOrderSelectedMap/currentOptSubOrders',
+        currentOptSubOrders,
+      );
       if (
         currentOptSubOrders === null ||
         currentOptSubOrders === undefined ||
@@ -435,6 +455,11 @@ const OrderPage = () =&gt; {
       }
     } else {
       //操作的是子订单
+      console.log(
+        subOrderSelectedMap,
+        '5656buildSubOrders2 subOrderSelectedMap/data',
+        data,
+      );
       for (let item of data) {
         if (item.id === currentOptMainId) {
           for (let subOrder of item?.subOrderInformationLists) {
@@ -446,12 +471,15 @@ const OrderPage = () =&gt; {
         }
       }
     }
-
+    console.log(
+      cloneSubOrders,
+      '5656cloneSubOrders/length',
+      cloneSubOrders.length,
+    );
     if (cloneSubOrders.length === 0) {
       message.error('页面错误：当前操作的订单数据不存在，请联系系统管理员');
       return;
     }
-
     return cloneSubOrders;
   }
  
@@ -1334,6 +1362,11 @@ const OrderPage = () =&gt; {
                 className="p-0"
                 type="link"
                 onClick={() => {
+                  console.log(
+                    optRecord.id,
+                    '5656optRecord.id, record.id',
+                    record.id,
+                  );
                   createOptObject(optRecord.id, record.id);
                   setUploadPayBillModalVisible(true);
                 }}