fix: 报表

boyang
1 parent cfc5c16b
Showing 2 changed files with 43 additions and 52 deletions
src/pages/OrderReport/components/OrderDualAxes.tsx
src/pages/OrderReport/index.tsx
@@ -42,11 +42,7 @@ const OrderDualAxes = ({ data, statisticMethod, onXValueClick }) =&gt; {
   const handleClick = (event) => {
     // 获取当前点击点的数据
     const pointData = event?.data?.data;
-    if (
-      pointData &&
-      (data?.targetAndTotalPaymentDtoList !== undefined ||
-        data?.orderNumberDtoList !== undefined)
-    ) {
+    if (pointData) {
       // 解析年份和月份
       if (yFiledString === 'curMonth') {
         const xValue = pointData['curMonth']; // 格式类似 "2025-01"
@@ -57,29 +53,29 @@ const OrderDualAxes = ({ data, statisticMethod, onXValueClick }) =&gt; {
             return;
           }
-          // 减 1 获得目标年份
-          const targetYear = String(Number(yearFromXValue) - 1); // "2024"
+          // // 减 1 获得目标年份
+          // const targetYear = String(Number(yearFromXValue) - 1); // "2024"
-          // 检查 pointData.type 是否包含目标年份
-          if (
-            pointData?.type?.includes(targetYear) ||
-            pointData?.name?.includes(targetYear)
-          ) {
-            // 调用父组件传递的回调
-            onXValueClick?.(xValue);
+          // // 检查 pointData.type 是否包含目标年份
+          // if (
+          //   pointData?.type?.includes(targetYear) ||
+          //   pointData?.name?.includes(targetYear)
+          // ) {
+          // 调用父组件传递的回调
+          onXValueClick?.(xValue, pointData?.name);
-            // // 合并两个数据源
-            // const allData = [...targetData, ...orderData];
+          // // 合并两个数据源
+          // const allData = [...targetData, ...orderData];
-            // // 筛选出当前列的所有数据
-            // const columnData = allData.filter(
-            //   (item) => item[yFiledString] === xValue,
-            // );
+          // // 筛选出当前列的所有数据
+          // const columnData = allData.filter(
+          //   (item) => item[yFiledString] === xValue,
+          // );
-            // 可选择将筛选出的数据展示到页面或以其他方式处理
-            // alert(`当前列数据: ${JSON.stringify(columnData, null, 2)}`);
-          } else {
-          }
+          // 可选择将筛选出的数据展示到页面或以其他方式处理
+          // alert(`当前列数据: ${JSON.stringify(columnData, null, 2)}`);
+          // } else {
+          // }
         }
       } else {
         console.warn('点击事件未携带有效数据');
@@ -147,31 +147,25 @@ const OrderReportPage = () =&gt; {
     setLoading(false);
   };
-  const handleXValueClick = async (xValue) => {
+  const handleXValueClick = async (xValue, type) => {
     try {
       const [yearValue, monthValue] = xValue.split('-');
-      const adjustedYearValue = (parseInt(yearValue, 10) - 1).toString();
-      const adjustedMonthValue = monthValue.startsWith('0')
-        ? monthValue.slice(1)
-        : monthValue;
-      // 更新年份和月份选项的选中值
-      setSelectedYear(adjustedYearValue);
-      setSelectedMonth(adjustedMonthValue);
-
-      // const yearSelect = document.querySelector('select[name="year"]'); // 根据 ProFormSelect 的 `name` 属性找到对应 DOM
-      // if (yearSelect) {
-      //   const event = new Event('change', { bubbles: true });
-      //   yearSelect.value = adjustedYearValue;
-      //   yearSelect.dispatchEvent(event);
-      // }
-
-      // // 触发月份选择器的 onChange
-      // const monthSelect = document.querySelector('select[name="month"]'); // 根据 ProFormSelect 的 `name` 属性找到对应 DOM
-      // if (monthSelect) {
-      //   const event = new Event('change', { bubbles: true });
-      //   monthSelect.value = adjustedMonthValue;
-      //   monthSelect.dispatchEvent(event);
-      // }
+      if (type?.includes('年')) {
+        const adjustedYearValue = (parseInt(yearValue, 10) - 1).toString();
+        const adjustedMonthValue = monthValue.startsWith('0')
+          ? monthValue.slice(1)
+          : monthValue;
+        // 更新年份和月份选项的选中值
+        setSelectedYear(adjustedYearValue);
+        setSelectedMonth(adjustedMonthValue);
+      } else {
+        // 更新年份和月份选项的选中值
+        const adjustedMonthValue = monthValue.startsWith('0')
+          ? monthValue.slice(1)
+          : monthValue;
+        setSelectedYear(yearValue);
+        setSelectedMonth(adjustedMonthValue);
+      }
     } catch (error) {
       console.error('Failed to fetch updated data:', error);
     }
@@ -287,8 +281,8 @@ const OrderReportPage = () =&gt; {
               <div>
                 <ProForm.Group>
                   <ProFormSelect
-                    name="salesCode"
-                    key="salesCode"
+                    name="selectedMonth"
+                    key="selectedMonth"
                     width="100px"
                     // actionRef={mainTableRef}
                     // formRef={mainTableFormRef}
@@ -302,8 +296,8 @@ const OrderReportPage = () =&gt; {
                     }}
                   />
                   <ProFormSelect
-                    name="salesCode"
-                    key="salesCode"
+                    name="selectedYear"
+                    key="selectedYear"
                     width="100px"
                     // actionRef={mainTableRef}
                     // formRef={mainTableFormRef}
@@ -312,7 +306,8 @@ const OrderReportPage = () =&gt; {
                     placeholder="2025"
                     options={yearOptions}
                     onChange={(value) => {
-                      setSelectedYear(value); // 更新选中值
+                      const newValue = value === undefined ? '2025' : value;
+                      setSelectedYear(newValue); // 更新选中值
                     }}
                   />
                 </ProForm.Group>