feat: 自动开票弹窗

柏杨
1 parent 6fda7d6a
Showing 2 changed files with 24 additions and 3 deletions
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
src/pages/Order/OrderList/OrderList.tsx
@@ -30,8 +30,16 @@ export default ({
   dataList,
   setVisible,
   mainOrder,
+  mainOrders,
   onClose,
   type = 'applyInvoicing',
+}: {
+  dataList: any[];
+  setVisible: (val: boolean) => void;
+  mainOrder: any;
+  mainOrders?: any[];
+  onClose: () => void;
+  type?: string;
 }) => {
   // let subOrderIds = dataList?.map((item) => {
   //   return item.id;
@@ -100,9 +108,17 @@ export default ({
     return uniqueIds.map((id) => {
       // 确保id是string或number类型
       const orderId = String(id);
-      const orderData = dataListCopy.find(
-        (d: any) => d.mainOrderId === id || d.orderId === id,
-      );
+
+      // 优先从传入的mainOrders中获取数据
+      const mainOrderData = mainOrders
+        ? mainOrders.find((item: any) => item.id === id)
+        : null;
+
+      // 如果没有找到主订单数据，则从dataList中查找
+      const orderData =
+        mainOrderData ||
+        dataListCopy.find((d: any) => d.mainOrderId === id || d.orderId === id);
+
       const totalPayment = orderData?.totalPayment || 0;
       const invoiceIssuedAmount = orderData?.invoiceIssuedAmount || 0;
       const availableAmount = Math.max(0, totalPayment - invoiceIssuedAmount);
@@ -5567,6 +5567,11 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             }
           }}
           mainOrder={isMainOrder ? getFirstMainOrder() : buildMainOrder()}
+          mainOrders={
+            isMainOrder
+              ? [...mainOrderSelectedMap.values()]
+              : [buildMainOrder()]
+          }
           onClose={() => {
             setInvoicingDrawerFormVisible(false);
             setIsMainOrder(true);