fix: 修改回款bug

boyang
1 parent 0567bf0b
Showing 1 changed file with 141 additions and 47 deletions
src/pages/Order/OrderWarning/index.tsx
@@ -197,10 +197,8 @@ const OrderPage = () =&gt; {
   const mainTableSecondRef = useRef<ActionType>();
   const mainTableFormRef = useRef<ProFormInstance>();
   const mainTableSecondFormRef = useRef<ProFormInstance>();
-  let [searchParams, setSearchParam] = useState(Object); //表格的查询条件存储
-  console.log(searchParams);
-  const [messageApi, contextHolder] = message.useMessage();
-  console.log(messageApi);
+  let [setSearchParam] = useState(Object); //表格的查询条件存储
+  const [contextHolder] = message.useMessage();
   const [
     shippingWarehouseChangeModalVisible,
     setShippingWarehouseChangeModalVisible,
@@ -208,6 +206,7 @@ const OrderPage = () =&gt; {
   const [ids, setIds] = useState([]);
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  const [activeTabKey, setActiveTabKey] = useState('1'); // **新增状态**
  
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
@@ -333,10 +332,8 @@ 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);
   }
  
   /**
@@ -385,11 +382,6 @@ const OrderPage = () =&gt; {
    * 返回当前操作的主订单数据
    */
   function buildMainOrder() {
-    console.log(
-      currentOptMainId,
-      '5656buildMainOrder currentOptMainId/curretnOptSubId',
-      curretnOptSubId,
-    );
     if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
@@ -399,11 +391,9 @@ 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]);
     }
-    console.log(mainOrderClone, '5656buildMainOrder mainOrderClone');
     if (!mainOrderClone) {
       message.error('页面错误：当前操作的主订单数据不存在，请联系系统管理员');
     }
@@ -414,11 +404,6 @@ const OrderPage = () =&gt; {
    * 返回当前操作的子订单集合
    */
   function buildSubOrders() {
-    console.log(
-      curretnOptSubId,
-      '5656buildSubOrders currentOptMainId/currentOptMainId',
-      currentOptMainId,
-    );
     if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
@@ -431,11 +416,6 @@ const OrderPage = () =&gt; {
       // if (!curretnOptSubId) {
       //如果有选中子订单，那么取选中的子订单为操作对象，否则取当前主订单的全部子订单为操作对象
       let currentOptSubOrders = subOrderSelectedMap.get(currentOptMainId);
-      console.log(
-        subOrderSelectedMap,
-        '5656buildSubOrders subOrderSelectedMap/currentOptSubOrders',
-        currentOptSubOrders,
-      );
       if (
         currentOptSubOrders === null ||
         currentOptSubOrders === undefined ||
@@ -455,11 +435,6 @@ 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) {
@@ -471,11 +446,6 @@ const OrderPage = () =&gt; {
         }
       }
     }
-    console.log(
-      cloneSubOrders,
-      '5656cloneSubOrders/length',
-      cloneSubOrders.length,
-    );
     if (cloneSubOrders.length === 0) {
       message.error('页面错误：当前操作的订单数据不存在，请联系系统管理员');
       return;
@@ -670,8 +640,6 @@ const OrderPage = () =&gt; {
      * @param optRecord
      */
     function getOrderStatusTag(optRecord: any): import('react').ReactNode {
-      console.log(optRecord);
-
       const orderStatus = optRecord.orderStatus;
       const paymentMethod = optRecord.paymentMethod;
       let orderStatusTagText = enumValueToLabel(
@@ -1362,11 +1330,6 @@ 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);
                 }}
@@ -2873,7 +2836,6 @@ const OrderPage = () =&gt; {
                       onClick={() => {
                         setCurrentMainId(record.id);
                         setReissueVisibleOld(true);
-                        console.log(reissueVisible);
                       }}
                     >
                       重新开票(旧)
@@ -4028,6 +3990,58 @@ const OrderPage = () =&gt; {
     },
   );
  
+  // 主订单列表
+  const mainOrdersColumns2: ProColumns<OrderType>[] = MAIN_ORDER_COLUMNS.map(
+    (item) => {
+      //首能账号只能搜索订单编号
+      let canSearchIndex = [
+        'id',
+        'salesCode',
+        'subNotes',
+        'orderStatus',
+        'createTime',
+        'modifiedAuditStatus',
+      ];
+      if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) {
+        item.search = false;
+      }
+
+      canSearchIndex = [
+        'id',
+        'salesCode',
+        'customerName',
+        'institution',
+        'productName',
+        'orderStatus',
+        'createTime',
+      ];
+
+      if (isExaminer() && !canSearchIndex.includes(item.dataIndex)) {
+        item.search = false;
+      }
+
+      if (item.dataIndex === 'name') {
+        return {
+          ...item,
+          title: <OrderTableHeader />,
+          render: (text, record) => {
+            return <MainOrderColumnRender record={record} />;
+          },
+        };
+      }
+
+      /**
+       * 采购的订单状态筛选内容
+       */
+      if (roleCode === 'procure' && item.dataIndex === 'orderStatus') {
+        item.valueEnum = enumToProTableEnumValue(
+          PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
+        );
+      }
+      return item;
+    },
+  );
+
   /**
    * 采购可以筛选供应商备注
    */
@@ -4039,6 +4053,13 @@ const OrderPage = () =&gt; {
       valueType: 'text',
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '供应商备注',
+      width: 120,
+      dataIndex: 'supplierNotes',
+      valueType: 'text',
+      hideInTable: true,
+    });
   }
  
   /**
@@ -4059,6 +4080,20 @@ const OrderPage = () =&gt; {
       },
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '采购名称',
+      width: 120,
+      dataIndex: 'supplierName',
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
   }
  
   /**
@@ -4082,6 +4117,23 @@ const OrderPage = () =&gt; {
       },
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '采购排除',
+      width: 120,
+      dataIndex: 'excludeProcureNames',
+      fieldProps: {
+        mode: 'multiple',
+      },
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
   }
  
   /**
@@ -4096,6 +4148,14 @@ const OrderPage = () =&gt; {
       valueEnum: enumToProTableEnumValue(SHIPPING_WAREHOUSE_OPTIONS),
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '发货仓库',
+      width: 120,
+      dataIndex: 'shippingWarehouse',
+      valueType: 'select',
+      valueEnum: enumToProTableEnumValue(SHIPPING_WAREHOUSE_OPTIONS),
+      hideInTable: true,
+    });
   }
  
   //判断是否是采购，是的话新增一个筛选条件
@@ -4107,6 +4167,13 @@ const OrderPage = () =&gt; {
       hideInTable: true,
       valueEnum: enumToProTableEnumValue(PROCURE_ORDER_STATUS),
     });
+    mainOrdersColumns2.push({
+      title: isSupplier() ? '下单状态' : '采购下单状态',
+      dataIndex: 'procureOrderStatus',
+      valueType: 'select',
+      hideInTable: true,
+      valueEnum: enumToProTableEnumValue(PROCURE_ORDER_STATUS),
+    });
   }
  
   //选择天数1
@@ -4217,6 +4284,7 @@ const OrderPage = () =&gt; {
       filter,
       data: { ...params, statusDatetimeGe: calDate },
     });
+    console.log(res.data, '5656request');
  
     const data = res.data;
     setRolePath(data.specialPath);
@@ -4252,6 +4320,14 @@ const OrderPage = () =&gt; {
       mainTableSecondRef.current?.reload();
     }
   }, [calDate2]);
+  useEffect(() => {
+    if (activeTabKey === '1') {
+      mainTableRef.current?.reload(); // **修改位置：在选择第二个标签时请求request2**
+    }
+    if (activeTabKey === '2') {
+      mainTableSecondRef.current?.reload(); // **修改位置：在选择第二个标签时请求request2**
+    }
+  }, [activeTabKey]);
  
   const request2 = async (
     // 第一个参数 params 查询表单和 params 参数的结合
@@ -4307,6 +4383,7 @@ const OrderPage = () =&gt; {
       filter,
       data: { ...params },
     });
+    console.log(data, '5656request2');
  
     setRolePath(data.specialPath);
     setSubOrderCount(data.count);
@@ -4344,7 +4421,7 @@ const OrderPage = () =&gt; {
   };
   const tabsItems = [
     {
-      key: 1,
+      key: '1',
       label: (
         <span>
           发票确认预警
@@ -4431,7 +4508,8 @@ const OrderPage = () =&gt; {
             search={false}
             // labelWidth: 'auto',
             // onCollapse: resize,
-            request={request}
+            // request={request}
+            request={activeTabKey === '1' ? request : null} // **条件请求**
             toolbar={{
               multipleLine: true,
             }}
@@ -4924,7 +5002,7 @@ const OrderPage = () =&gt; {
       ),
     },
     {
-      key: 2,
+      key: '2',
       label: (
         <span>
           订单回款预警
@@ -4962,7 +5040,7 @@ const OrderPage = () =&gt; {
             actionRef={mainTableSecondRef}
             formRef={mainTableSecondFormRef}
             expandIconColumnIndex={-1}
-            columns={mainOrdersColumns}
+            columns={mainOrdersColumns2}
             rowKey="id"
             pagination={{
               showQuickJumper: true,
@@ -4972,6 +5050,7 @@ const OrderPage = () =&gt; {
               onChange: (page, size) => {
                 setPageSize(size);
                 setCurrentPage(page);
+                mainTableSecondRef.current?.reload();
               },
               showTotal: (total, range) => {
                 return (
@@ -5001,7 +5080,8 @@ const OrderPage = () =&gt; {
             search={false}
             // labelWidth: 'auto',
             // onCollapse: resize,
-            request={request2}
+            // request={request2}
+            request={activeTabKey === '2' ? request2 : null} // **条件请求**
             toolbar={{
               multipleLine: true,
             }}
@@ -5498,7 +5578,21 @@ const OrderPage = () =&gt; {
   return (
     <div className="order-page-container">
       <div id="resizeDiv"></div>
-      <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => {}} />
+      {/* <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => { }} /> */}
+      <Tabs
+        defaultActiveKey="1"
+        items={tabsItems}
+        onChange={(key) => {
+          setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+          if (key === '1') {
+            setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+            mainTableRef.current?.reload(); // **请求主订单的 request**
+          } else if (key === '2') {
+            setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+            mainTableSecondRef.current?.reload(); // **请求订单回款的 request2**
+          }
+        }}
+      />
     </div>
   );
 };