This commit is contained in:
parent
603cf5c8be
commit
59b3126b00
@ -41,9 +41,10 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
|
|||||||
avatarProps: {
|
avatarProps: {
|
||||||
render: () => <AvatarProps user={snap.session.user} />,
|
render: () => <AvatarProps user={snap.session.user} />,
|
||||||
},
|
},
|
||||||
waterMarkProps: {
|
//水印设置
|
||||||
content: snap.session.user?.username,
|
// waterMarkProps: {
|
||||||
},
|
// content: snap.session.user?.username,
|
||||||
|
// },
|
||||||
collapsedButtonRender: false,
|
collapsedButtonRender: false,
|
||||||
token: {
|
token: {
|
||||||
bgLayout: '#eef0f3',
|
bgLayout: '#eef0f3',
|
||||||
|
|||||||
@ -585,11 +585,12 @@ export const Selects = {
|
|||||||
formItemProps: { ...(required ? rulesHelper.number : {}) },
|
formItemProps: { ...(required ? rulesHelper.number : {}) },
|
||||||
|
|
||||||
request: async (params) => {
|
request: async (params) => {
|
||||||
|
console.log(params, '1111');
|
||||||
let res = await Apis.Meter.HouseMeters.List({
|
let res = await Apis.Meter.HouseMeters.List({
|
||||||
keywords: params?.KeyWords,
|
...params,
|
||||||
asset_projects_id: params?.asset_projects_id,
|
asset_projects_id: params?.asset_projects_id,
|
||||||
charge_standards_id: params?.house_charge_standards_id,
|
charge_standards_id: params?.house_charge_standards_id,
|
||||||
...params,
|
name: params?.keyWords || undefined,
|
||||||
});
|
});
|
||||||
res?.data?.map((l: any) => {
|
res?.data?.map((l: any) => {
|
||||||
l.label = l.id + ':' + l.name;
|
l.label = l.id + ':' + l.name;
|
||||||
|
|||||||
@ -96,7 +96,7 @@ export default function Index({ title = '仪表账单' }) {
|
|||||||
isConfirm
|
isConfirm
|
||||||
description="确认执行此任务吗?"
|
description="确认执行此任务吗?"
|
||||||
onConfirm={() =>
|
onConfirm={() =>
|
||||||
Apis.HouseCharage.HouseChargeTaskDetails.CreateHouseBill({
|
Apis.Meter.HouseMeterTaskDetails.CreateMeterBill({
|
||||||
id: item.id,
|
id: item.id,
|
||||||
}).then(() => action?.reload())
|
}).then(() => action?.reload())
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,7 +35,7 @@ export default function Index({ title = '仪表任务' }) {
|
|||||||
MyProTableProps.request(params, sort, Apis.Meter.HouseMeterTasks.List)
|
MyProTableProps.request(params, sort, Apis.Meter.HouseMeterTasks.List)
|
||||||
}
|
}
|
||||||
toolBarRender={(action) => [
|
toolBarRender={(action) => [
|
||||||
<TaskCreate key="Create" reload={action?.reload} title="账单任务" />,
|
<TaskCreate key="Create" reload={action?.reload} title="仪表任务" />,
|
||||||
]}
|
]}
|
||||||
columns={[
|
columns={[
|
||||||
MyColumns.ID(),
|
MyColumns.ID(),
|
||||||
|
|||||||
@ -208,6 +208,9 @@ export default function Create(props: MyBetaModalFormProps) {
|
|||||||
key: 'data_id',
|
key: 'data_id',
|
||||||
colProps: { span: 24 },
|
colProps: { span: 24 },
|
||||||
formItemProps: { ...rulesHelper.text },
|
formItemProps: { ...rulesHelper.text },
|
||||||
|
fieldProps: {
|
||||||
|
showSearch: true,
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
: [];
|
: [];
|
||||||
|
|||||||
@ -7,8 +7,9 @@ import {
|
|||||||
import { MomentSelect } from '@/components/MomentCategories';
|
import { MomentSelect } from '@/components/MomentCategories';
|
||||||
import { Apis } from '@/gen/Apis';
|
import { Apis } from '@/gen/Apis';
|
||||||
import { BetaSchemaForm } from '@ant-design/pro-components';
|
import { BetaSchemaForm } from '@ant-design/pro-components';
|
||||||
import { message } from 'antd';
|
import { Form, message } from 'antd';
|
||||||
export default function Create(props: MyBetaModalFormProps) {
|
export default function Create(props: MyBetaModalFormProps) {
|
||||||
|
const [form] = Form.useForm();
|
||||||
return (
|
return (
|
||||||
<BetaSchemaForm<ApiTypes.Customer.CustomerMomentCategories.Store>
|
<BetaSchemaForm<ApiTypes.Customer.CustomerMomentCategories.Store>
|
||||||
{...MyModalFormProps.props}
|
{...MyModalFormProps.props}
|
||||||
@ -16,6 +17,12 @@ export default function Create(props: MyBetaModalFormProps) {
|
|||||||
wrapperCol={{ span: 24 }}
|
wrapperCol={{ span: 24 }}
|
||||||
width="500px"
|
width="500px"
|
||||||
trigger={<MyButtons.Create title={`添加${props.title}`} />}
|
trigger={<MyButtons.Create title={`添加${props.title}`} />}
|
||||||
|
key={new Date().getTime()}
|
||||||
|
onOpenChange={(open: any) => {
|
||||||
|
if (open) {
|
||||||
|
form.resetFields(); // 清空表单数据
|
||||||
|
}
|
||||||
|
}}
|
||||||
onFinish={async (values) =>
|
onFinish={async (values) =>
|
||||||
Apis.Customer.CustomerMomentCategories.Store(values)
|
Apis.Customer.CustomerMomentCategories.Store(values)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user