Compare commits

..

1 Commits

Author SHA1 Message Date
Your Name
ad1215f65b fix:更新优化
All checks were successful
Build and Push Docker Image / build (push) Successful in 4m36s
2026-02-26 15:49:41 +08:00
7 changed files with 42 additions and 31 deletions

View File

@ -91,7 +91,7 @@ export default function Index({ title = '项目信息' }) {
// tooltip="【项目列表】的【配置】功能,受角色权限控制"
toolBarRender={(action) => [toolBarRender(action)]}
columns={[
// MyColumns.ID(),
MyColumns.ID(),
// 组织树选择器
Selects?.OrganizationSearch({
title: '所属组织',

View File

@ -29,7 +29,7 @@ export default function Index({ title = '房屋账单' }) {
},
{
key: '2',
label: `房屋数(${res?.['清欠房屋数']})`,
label: `清房屋数(${res?.['清欠房屋数']})`,
},
{
key: '3',

View File

@ -8,12 +8,12 @@
background: linear-gradient(135deg, #6499ff 0%, #95b8ff 100%);
padding: 25px 0;
border-radius: 12px;
box-shadow: 0 10px 25px -5px rgba(42, 126, 251, 0.3);
// box-shadow: 0 10px 25px -5px rgba(42, 126, 251, 0.3);
transition: all 0.3s ease;
&:hover {
transform: translateY(-2px);
box-shadow: 0 15px 30px -5px rgba(42, 126, 251, 0.4);
// box-shadow: 0 15px 30px -5px rgba(42, 126, 251, 0.4);
}
// animation: fadeInUp 0.6s ease-out forwards;
@ -149,13 +149,13 @@
text-align: center;
color: #3d3d3d;
font-size: 16px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
// box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
transition: all 0.3s ease;
border: 1px solid #f0f0f0;
&:hover {
transform: translateY(-3px);
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12);
// box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12);
border-color: #e0e7ff;
}
@ -191,7 +191,7 @@
}
.real_time_dynamics {
color: #333;
color: #666;
width: 100%;
font-size: 16px;
padding: 0 0 15px 0;

View File

@ -30,7 +30,14 @@ export default function CommonMeter({ title = '公摊表' }) {
const getCurrentPermissions = useCurrentPermissions();
let toolBarRender = (action: any) => {
return getCurrentPermissions({
create: <Create key="Create" reload={action?.reload} title={title} />,
create: (
<Create
key="Create"
reload={action?.reload}
item={{ meter_type: 'CommonMeter' }}
title={title}
/>
),
exportmeter: (
<MyImportModal
key="ImportMeter"

View File

@ -7,10 +7,7 @@ import {
} from '@/common';
import { Selects } from '@/components/Select';
import { Apis } from '@/gen/Apis';
import {
HouseMetersMeterTypeEnum,
HouseMetersUsageTypeEnum,
} from '@/gen/Enums';
import { HouseMetersUsageTypeEnum } from '@/gen/Enums';
import { BetaSchemaForm } from '@ant-design/pro-components';
import { Form, message } from 'antd';
@ -40,6 +37,7 @@ export default function Create(props: MyBetaModalFormProps) {
...values,
latest_value: values.initial_value,
latest_time: values.initial_time,
meter_type: props?.item?.meter_type,
})
.then(() => {
props.reload?.();
@ -60,13 +58,13 @@ export default function Create(props: MyBetaModalFormProps) {
}),
]),
MyFormItems.EnumRadio({
key: 'meter_type',
title: '仪表类型',
colProps: { span: 24 },
valueEnum: HouseMetersMeterTypeEnum,
required: true,
}),
// MyFormItems.EnumRadio({
// key: 'meter_type',
// title: '仪表类型',
// colProps: { span: 24 },
// valueEnum: HouseMetersMeterTypeEnum,
// required: true,
// }),
MyFormItems.EnumRadio({
key: 'usage_type',
title: '使用类型',

View File

@ -30,7 +30,14 @@ export default function HouseMeter({ title = '房屋表' }) {
const getCurrentPermissions = useCurrentPermissions();
let toolBarRender = (action: any) => {
return getCurrentPermissions({
create: <Create key="Create" reload={action?.reload} title={title} />,
create: (
<Create
key="Create"
reload={action?.reload}
item={{ meter_type: 'HouseMeter' }}
title={title}
/>
),
exportmeter: (
<MyImportModal
key="ImportMeter"

View File

@ -7,10 +7,7 @@ import {
} from '@/common';
import { Selects } from '@/components/Select';
import { Apis } from '@/gen/Apis';
import {
HouseMetersMeterTypeEnum,
HouseMetersUsageTypeEnum,
} from '@/gen/Enums';
import { HouseMetersUsageTypeEnum } from '@/gen/Enums';
import { BetaSchemaForm } from '@ant-design/pro-components';
import { Form, message } from 'antd';
@ -33,6 +30,7 @@ export default function Create(props: MyBetaModalFormProps) {
onOpenChange={(open: any) => {
if (open) {
form.resetFields(); // 清空表单数据
// form.setFieldsValue(props?.item);
}
}}
onFinish={async (values) =>
@ -40,6 +38,7 @@ export default function Create(props: MyBetaModalFormProps) {
...values,
latest_value: values.initial_value,
latest_time: values.initial_time,
meter_type: props?.item?.meter_type,
})
.then(() => {
props.reload?.();
@ -60,13 +59,13 @@ export default function Create(props: MyBetaModalFormProps) {
}),
]),
MyFormItems.EnumRadio({
key: 'meter_type',
title: '仪表类型',
colProps: { span: 24 },
valueEnum: HouseMetersMeterTypeEnum,
required: true,
}),
// MyFormItems.EnumRadio({
// key: 'meter_type',
// title: '仪表类型',
// colProps: { span: 24 },
// valueEnum: HouseMetersMeterTypeEnum,
// required: true,
// }),
MyFormItems.EnumRadio({
key: 'usage_type',
title: '使用类型',