Merge remote-tracking branch 'origin/dev/2025b' into dev/2025b

src/main.jsx

@@ -45,6 +45,8 @@ import { isNotEmpty } from '@/utils/commons'
 import ProductsManage from '@/views/products/Manage';
 import ProductsDetail from '@/views/products/Detail';
 import ProductsAudit from '@/views/products/Audit';
+import PickYear from './views/products/PickYear'
+
 import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA,PERM_TRAIN_TICKET, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT, PERM_PRODUCTS_OFFER_PUT } from '@/config'
 
 import './i18n'
@@ -94,6 +96,7 @@ const initRouter = async () => {
         { path: "products/:travel_agency_id/:use_year/:audit_state/edit",element:<RequireAuth subject={PERM_PRODUCTS_OFFER_PUT} result={true}><ProductsDetail /></RequireAuth>},
         { path: "products/audit",element:<RequireAuth subject={PERM_PRODUCTS_OFFER_PUT} result={true}><ProductsAudit /></RequireAuth>},
         { path: "products/edit",element:<RequireAuth subject={PERM_PRODUCTS_OFFER_PUT} result={true}><ProductsDetail /></RequireAuth>},
+        { path: "products/pick-year",element: <RequireAuth subject={PERM_PRODUCTS_OFFER_PUT} result={true}><PickYear /></RequireAuth>},
         //
       ]
     },

src/views/products/PickYear.jsx

@@ -0,0 +1,40 @@
+import { useNavigate } from "react-router-dom";
+import { Row, DatePicker, Flex, Col, Typography } from "antd";
+import dayjs from "dayjs";
+import { usingStorage } from "@/hooks/usingStorage";
+
+function PickYear() {
+  const navigate = useNavigate();
+  const { travelAgencyId } = usingStorage();
+
+  return (
+    <>
+      <Row justify="center">
+        <Col span={4}>
+          <Flex gap="middle" vertical>
+            <Typography.Title className="text-center" level={3}>
+              请选择采购年份
+            </Typography.Title>
+            <DatePicker
+              className="w-full"
+              size="large"
+              variant="underlined"
+              needConfirm
+              inputReadOnly={true}
+              minDate={dayjs().add(-30, "year")}
+              maxDate={dayjs().add(2, "year")}
+              allowClear={false}
+              picker="year"
+              open={true}
+              onOk={(date) => {
+                const useYear = date.year();
+                navigate(`/products/${travelAgencyId}/${useYear}/all/edit`);
+              }}
+            />
+          </Flex>
+        </Col>
+      </Row>
+    </>
+  );
+}
+export default PickYear;