feat: update

zhongnanhuang
1 parent 80202e20
Showing 2 changed files with 6 additions and 11 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/index.tsx
@@ -13,7 +13,7 @@ import { Form, message } from &#39;antd&#39;;
 import { cloneDeep } from 'lodash';
 export default ({ setCheckVisible, isEdit, data, isMainOrder, onClose }) => {
   console.log(data);
-  let ids = data?.map((item) => item.id);
+  let ids = data;
   let newListAnnex = [];
   let subOrder = {};
  
@@ -304,17 +304,16 @@ const OrderPage = () =&gt; {
         return item.id;
       });
  
-      let rowObjs = data?.map((item) => {
+      let rowObj = {};
+      data?.forEach((item) => {
         let id = item.id;
-        let rowObj: any = {};
         rowObj[id] = item;
-        return rowObj;
       });
       setSelectedItems(mainOrderIds);
-      setSelectedRowObj(rowObjs);
+      setSelectedRowObj(rowObj);
     } else {
       setSelectedItems([]);
-      setSelectedRowObj([]);
+      setSelectedRowObj({});
     }
   };
  
@@ -2166,10 +2165,6 @@ const OrderPage = () =&gt; {
           onClick={() => {
             setApplyForInvoicingVisible(true);
             //选中订单
-            let rows = selectedRowObj?.map((item) => {
-              return Object.values(item)[0];
-            });
-            setSelectedRows(rows);
             setIsEdit(false);
             setIsMainOrder(true);
           }}
@@ -2395,7 +2390,7 @@ const OrderPage = () =&gt; {
       {applyForInvoicingVisible && (
         <ApplyForInvoicingModal
           setCheckVisible={setApplyForInvoicingVisible}
-          data={selectedRows}
+          data={selectedItems}
           isMainOrder={isMainOrder}
           isEdit={isEdit}
           onClose={() => {