feat: update 修复了销售合并开票后，修改申请开票备注报错的问题

zhongnanhuang
1 parent ac326715
Showing 2 changed files with 19 additions and 15 deletions
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/index.tsx
@@ -27,6 +27,11 @@ export default ({
     sumPrice += parseFloat(order.totalPayment);
   }
  
+  /**
+   * isMainOrder：合并申请开票  data是选中的主订单id集合
+   * isEdit：编辑备注 subOrders为申请开票的子订单集合
+   * !isMainOrder&&!isEdit：订单申请开票 subOrders为申请开票的子订单集合
+   */
   if (isMainOrder) {
     ids = data;
   } else {
@@ -40,24 +45,22 @@ export default ({
   let newListAnnex = [];
  
   //回显，子订单可以编辑备注跟附件
-  if (!isMainOrder) {
-    if (isEdit) {
-      newListAnnex = newSubOrder.afterAnnexList?.map((path) => {
-        let i = 0;
-        return {
-          uid: i++,
-          name: getAliYunOSSFileNameFromUrl(path),
-          status: 'uploaded',
-          url: path,
-          response: { data: [path] },
-        };
-      });
-      newSubOrder.filePaths = newListAnnex;
-    }
+  if (isEdit) {
+    newSubOrder = cloneDeep(subOrders[0]);
+    newListAnnex = newSubOrder.afterAnnexList?.map((path) => {
+      let i = 0;
+      return {
+        uid: i++,
+        name: getAliYunOSSFileNameFromUrl(path),
+        status: 'uploaded',
+        url: path,
+        response: { data: [path] },
+      };
+    });
+    newSubOrder.filePaths = newListAnnex;
   }
  
   //拼接主订单id
-  console.log(isMainOrder);
   if (isMainOrder) {
     console.log('in');
     newSubOrder.applyInvoicingNotes = ids.join(',');
@@ -1198,6 +1198,7 @@ const OrderPage = () =&gt; {
                       setApplyForInvoicingVisible(true);
                       setSelectedRows([optRecord]);
                       setIsEdit(true);
+                      setIsMainOrder(false);
                     }}
                   />
                 </Tooltip>