feat: update

zhongnanhuang
1 parent 6a0caaf4
Showing 3 changed files with 48 additions and 12 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/FinancialReceiptsModal.tsx
src/pages/Order/index.tsx
@@ -11,17 +11,32 @@ import {
 } from '@ant-design/pro-components';
 import { Form, message } from 'antd';
 import { cloneDeep } from 'lodash';
-export default ({ setCheckVisible, isEdit, data, isMainOrder, onClose }) => {
-  console.log(data);
-  let ids = data;
+export default ({
+  setCheckVisible,
+  isEdit,
+  data,
+  subOrders,
+  isMainOrder,
+  onClose,
+}) => {
+  console.log(subOrders);
+  let ids = [];
+  let newSubOrder = {};
+  if (isMainOrder) {
+    ids = data;
+  } else {
+    newSubOrder = cloneDeep(subOrders[0]);
+    ids = subOrders?.map((item) => {
+      return item.id;
+    });
+  }
+
   let newListAnnex = [];
-  let subOrder = {};
  
   //回显，子订单可以编辑备注跟附件
   if (!isMainOrder) {
     if (isEdit) {
-      subOrder = cloneDeep(data[0]);
-      newListAnnex = subOrder.afterAnnexList?.map((path) => {
+      newListAnnex = newSubOrder.afterAnnexList?.map((path) => {
         let i = 0;
         return {
           uid: i++,
@@ -31,13 +46,15 @@ export default ({ setCheckVisible, isEdit, data, isMainOrder, onClose }) =&gt; {
           response: { data: [path] },
         };
       });
-      subOrder.filePaths = newListAnnex;
+      newSubOrder.filePaths = newListAnnex;
     }
   }
  
   //拼接主订单id
+  console.log(isMainOrder);
   if (isMainOrder) {
-    subOrder.applyInvoicingNotes = ids.join(',');
+    console.log('in');
+    newSubOrder.applyInvoicingNotes = ids.join(',');
   }
  
   const [form] = Form.useForm<{
@@ -57,7 +74,7 @@ export default ({ setCheckVisible, isEdit, data, isMainOrder, onClose }) =&gt; {
       width={500}
       open
       title={isEdit ? '修改信息' : '申请开票'}
-      initialValues={subOrder}
+      initialValues={newSubOrder}
       form={form}
       autoFocusFirstInput
       modalProps={{
@@ -13,7 +13,7 @@ export default ({ setVisible, onClose }) =&gt; {
       }>
         width={500}
         open
-        title="标题"
+        title="收款记录"
         form={form}
         autoFocusFirstInput
         modalProps={{
@@ -313,10 +313,8 @@ const OrderPage = () =&gt; {
         rowObj[id] = item;
       });
       setSelectedItems(mainOrderIds);
-      setSelectedRowObj(rowObj);
     } else {
       setSelectedItems([]);
-      setSelectedRowObj({});
     }
   };
  
@@ -883,6 +881,24 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
+
+            {true ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setFinancialReceiptsModalVisible(true);
+                  setOrderRow(record);
+                  setSelectedRows([optRecord]);
+                  setIsEdit(true);
+                }}
+              >
+                收款记录
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('invoicing') ? (
               <Button
                 className="p-0"
@@ -1626,6 +1642,7 @@ const OrderPage = () =&gt; {
                         }
                         setApplyForInvoicingVisible(true);
                         setIsEdit(false);
+                        setIsMainOrder(false);
                       }}
                     >
                       申请开票
@@ -2394,11 +2411,13 @@ const OrderPage = () =&gt; {
         <ApplyForInvoicingModal
           setCheckVisible={setApplyForInvoicingVisible}
           data={selectedItems}
+          subOrders={selectedRows}
           isMainOrder={isMainOrder}
           isEdit={isEdit}
           onClose={() => {
             setApplyForInvoicingVisible(false);
             setSelectedRows({});
+            setIsMainOrder(false);
             refreshTable();
           }}
         />