From 603cf5c8be42d2ddf8b0e3d77230184d5a71a0bf Mon Sep 17 00:00:00 2001 From: uiuJun <> Date: Fri, 10 Oct 2025 14:52:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E8=B4=A6=E5=8D=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/bills/summary/show/$id.tsx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/pages/bills/summary/show/$id.tsx b/src/pages/bills/summary/show/$id.tsx index daedc6a..0c7442f 100644 --- a/src/pages/bills/summary/show/$id.tsx +++ b/src/pages/bills/summary/show/$id.tsx @@ -13,6 +13,7 @@ export default function Show({ title = '账单详情' }) { const { id } = useParams<{ id: string }>(); const [data, setShow] = useState({}); + console.log(data, 'pppp'); // 注册标签页 const { addTab } = usePageTabs({ tabKey: `bill-detail-${id}`, @@ -43,29 +44,19 @@ export default function Show({ title = '账单详情' }) { label: '欠费账单', key: '1', closable: false, - children: ( - - ), + children: , }, { label: '已付账单', key: '2', closable: false, - children: ( - - ), + children: , }, { label: '作废账单', key: '3', closable: false, - children: ( - - ), + children: , }, ]; -- 2.47.2 From 59b3126b00784b925056200e4c3761f06d6d9579 Mon Sep 17 00:00:00 2001 From: uiuJun <> Date: Fri, 10 Oct 2025 17:55:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E6=B0=B4=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/libs/umi/layoutConfig.tsx | 7 ++++--- src/components/Select.tsx | 5 +++-- src/pages/meter/bills/index.tsx | 2 +- src/pages/meter/tasks/index.tsx | 2 +- src/pages/meter/tasks/modals/TaskCreate.tsx | 3 +++ src/pages/moments/classification/modals/Create.tsx | 9 ++++++++- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/common/libs/umi/layoutConfig.tsx b/src/common/libs/umi/layoutConfig.tsx index 88c1335..a575bd6 100644 --- a/src/common/libs/umi/layoutConfig.tsx +++ b/src/common/libs/umi/layoutConfig.tsx @@ -41,9 +41,10 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => { avatarProps: { render: () => , }, - waterMarkProps: { - content: snap.session.user?.username, - }, + //水印设置 + // waterMarkProps: { + // content: snap.session.user?.username, + // }, collapsedButtonRender: false, token: { bgLayout: '#eef0f3', diff --git a/src/components/Select.tsx b/src/components/Select.tsx index 0dcb2e3..364cbe6 100644 --- a/src/components/Select.tsx +++ b/src/components/Select.tsx @@ -585,11 +585,12 @@ export const Selects = { formItemProps: { ...(required ? rulesHelper.number : {}) }, request: async (params) => { + console.log(params, '1111'); let res = await Apis.Meter.HouseMeters.List({ - keywords: params?.KeyWords, + ...params, asset_projects_id: params?.asset_projects_id, charge_standards_id: params?.house_charge_standards_id, - ...params, + name: params?.keyWords || undefined, }); res?.data?.map((l: any) => { l.label = l.id + ':' + l.name; diff --git a/src/pages/meter/bills/index.tsx b/src/pages/meter/bills/index.tsx index 71e84fe..99e78d4 100644 --- a/src/pages/meter/bills/index.tsx +++ b/src/pages/meter/bills/index.tsx @@ -96,7 +96,7 @@ export default function Index({ title = '仪表账单' }) { isConfirm description="确认执行此任务吗？" onConfirm={() => - Apis.HouseCharage.HouseChargeTaskDetails.CreateHouseBill({ + Apis.Meter.HouseMeterTaskDetails.CreateMeterBill({ id: item.id, }).then(() => action?.reload()) } diff --git a/src/pages/meter/tasks/index.tsx b/src/pages/meter/tasks/index.tsx index 91cff32..b5f86d4 100644 --- a/src/pages/meter/tasks/index.tsx +++ b/src/pages/meter/tasks/index.tsx @@ -35,7 +35,7 @@ export default function Index({ title = '仪表任务' }) { MyProTableProps.request(params, sort, Apis.Meter.HouseMeterTasks.List) } toolBarRender={(action) => [ - , + , ]} columns={[ MyColumns.ID(), diff --git a/src/pages/meter/tasks/modals/TaskCreate.tsx b/src/pages/meter/tasks/modals/TaskCreate.tsx index 94af007..90d6f4b 100644 --- a/src/pages/meter/tasks/modals/TaskCreate.tsx +++ b/src/pages/meter/tasks/modals/TaskCreate.tsx @@ -208,6 +208,9 @@ export default function Create(props: MyBetaModalFormProps) { key: 'data_id', colProps: { span: 24 }, formItemProps: { ...rulesHelper.text }, + fieldProps: { + showSearch: true, + }, }), ] : []; diff --git a/src/pages/moments/classification/modals/Create.tsx b/src/pages/moments/classification/modals/Create.tsx index edbcfa5..a1de6d4 100644 --- a/src/pages/moments/classification/modals/Create.tsx +++ b/src/pages/moments/classification/modals/Create.tsx @@ -7,8 +7,9 @@ import { import { MomentSelect } from '@/components/MomentCategories'; import { Apis } from '@/gen/Apis'; import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; +import { Form, message } from 'antd'; export default function Create(props: MyBetaModalFormProps) { + const [form] = Form.useForm(); return ( {...MyModalFormProps.props} @@ -16,6 +17,12 @@ export default function Create(props: MyBetaModalFormProps) { wrapperCol={{ span: 24 }} width="500px" trigger={} + key={new Date().getTime()} + onOpenChange={(open: any) => { + if (open) { + form.resetFields(); // 清空表单数据 + } + }} onFinish={async (values) => Apis.Customer.CustomerMomentCategories.Store(values) .then(() => { -- 2.47.2