From da1200716aa39621390b5cdd71f2f6e8d392f6c8 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Sat, 20 Dec 2025 00:57:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(basic-data):=20=E6=96=B0=E5=A2=9E=E6=A1=A3?= =?UTF-8?q?=E5=8F=A3=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=93=9C=E5=86=9C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除箱产品列表中的农夫箱类型选项 - 新增 MelonStallList 组件用于档口信息管理 - 重构 MelonFarmerList 组件国际化前缀及参数传递逻辑 - 导出 MelonStallList 组件便于页面引用 - 在基础数据索引文件中添加档口列表导出 - 更新采购订单列表组件支持自定义查询参数 - 添加产地采购和市场采购订单页面 - 完善档口相关国际化文案配置 - 调整供应商类型枚举值及采购订单类型字段 - 优化左侧菜单匹配逻辑以支持子菜单展开显示 - 修改部分接口字段类型定义提升数据准确性 --- .../components/BasicData/BoxProductList.tsx | 6 - .../components/BasicData/MelonFarmerList.tsx | 18 +- .../components/BasicData/MelonStallList.tsx | 253 ++++++++++++++++++ .../src/components/BasicData/index.ts | 1 + .../components/Order/PurchaseOrderList.tsx | 3 + packages/app-operation/src/locales/zh-CN.ts | 91 ++++++- .../src/pages/MadePurchaseOrder.tsx | 8 +- .../src/pages/MarketPurchaseOrder.tsx | 11 + .../app-operation/src/pages/MelonStall.tsx | 5 + .../src/services/business/typings.d.ts | 24 +- shared/components/src/LeftMenu/index.tsx | 14 +- swagger/business.json | 2 +- 12 files changed, 415 insertions(+), 21 deletions(-) create mode 100644 packages/app-operation/src/components/BasicData/MelonStallList.tsx create mode 100644 packages/app-operation/src/pages/MarketPurchaseOrder.tsx create mode 100644 packages/app-operation/src/pages/MelonStall.tsx diff --git a/packages/app-operation/src/components/BasicData/BoxProductList.tsx b/packages/app-operation/src/components/BasicData/BoxProductList.tsx index a3f9b1e..dd51217 100644 --- a/packages/app-operation/src/components/BasicData/BoxProductList.tsx +++ b/packages/app-operation/src/components/BasicData/BoxProductList.tsx @@ -244,12 +244,6 @@ export default function BoxProductList(props: IBoxProductListProps) { id: intlPrefix + '.type.thirdPartyBox', }), }, - { - key: 'FARMER_BOX', - tab: intl.formatMessage({ - id: intlPrefix + '.type.farmerBox', - }), - }, ], }, }} diff --git a/packages/app-operation/src/components/BasicData/MelonFarmerList.tsx b/packages/app-operation/src/components/BasicData/MelonFarmerList.tsx index d882309..7a1d9f2 100644 --- a/packages/app-operation/src/components/BasicData/MelonFarmerList.tsx +++ b/packages/app-operation/src/components/BasicData/MelonFarmerList.tsx @@ -5,8 +5,10 @@ import { ModeType, } from '@/components'; import { business } from '@/services'; +import { formatBankCard, formatIdCard, formatPhone } from '@/utils/format'; import { formatParam } from '@/utils/formatParam'; import { useIntl } from '@@/exports'; +import { EyeInvisibleOutlined, EyeTwoTone } from '@ant-design/icons'; import { ActionType, ProColumns, @@ -15,8 +17,6 @@ import { import { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; import { ProFormUploadMaterial } from '@chageable/components'; import React, { useRef, useState } from 'react'; -import { EyeInvisibleOutlined, EyeTwoTone } from '@ant-design/icons'; -import { formatBankCard, formatIdCard, formatPhone } from '@/utils/format'; interface IMelonFarmerListProps { ghost?: boolean; @@ -37,7 +37,7 @@ export default function MelonFarmerList(props: IMelonFarmerListProps) { onValueChange, } = props; const intl = useIntl(); - const intlPrefix = 'supplier'; + const intlPrefix = 'melonFarmer'; const actionRef = useRef(); const [showIdCard, setShowIdCard] = useState>({}); @@ -142,6 +142,8 @@ export default function MelonFarmerList(props: IMelonFarmerListProps) { ]; const formContext = [ +