This commit is contained in:
parent
a145e8dabc
commit
6014e42cb6
@ -15,8 +15,8 @@ export default defineConfig({
|
|||||||
proxy: {
|
proxy: {
|
||||||
'/api/': {
|
'/api/': {
|
||||||
// target: 'http://yt:8003',
|
// target: 'http://yt:8003',
|
||||||
// target: 'http://10.39.13.78:8001/',
|
target: 'http://10.39.13.78:8001/',
|
||||||
target: 'https://test-admin.linyikj.com.cn/',
|
// target: 'https://test-admin.linyikj.com.cn/',
|
||||||
// target: 'https://admin.linyikj.com.cn/',
|
// target: 'https://admin.linyikj.com.cn/',
|
||||||
// target: 'http://c789629c.natappfree.cc',
|
// target: 'http://c789629c.natappfree.cc',
|
||||||
|
|
||||||
|
|||||||
@ -201,12 +201,6 @@ export default function Create(props: MyBetaModalFormProps) {
|
|||||||
formItemProps: { ...rulesHelper.number },
|
formItemProps: { ...rulesHelper.number },
|
||||||
fieldProps: {
|
fieldProps: {
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
onChange: () => {
|
|
||||||
form.setFieldsValue({
|
|
||||||
asset_units_id: undefined,
|
|
||||||
asset_floors_id: undefined,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|||||||
@ -147,12 +147,6 @@ export default function Update(props: MyBetaModalFormProps) {
|
|||||||
formItemProps: { ...rulesHelper.number },
|
formItemProps: { ...rulesHelper.number },
|
||||||
fieldProps: {
|
fieldProps: {
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
onChange: () => {
|
|
||||||
form.setFieldsValue({
|
|
||||||
asset_units_id: undefined,
|
|
||||||
asset_floors_id: undefined,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import { MyButtons, MyColumns, MyProTableProps } from '@/common';
|
import { MyButtons, MyColumns, MyProTableProps } from '@/common';
|
||||||
import { Apis } from '@/gen/Apis';
|
import { Apis } from '@/gen/Apis';
|
||||||
|
|
||||||
|
import { HouseBillsTypeEnum } from '@/gen/Enums';
|
||||||
import { ProTable } from '@ant-design/pro-components';
|
import { ProTable } from '@ant-design/pro-components';
|
||||||
import { Space } from 'antd';
|
import { Space } from 'antd';
|
||||||
import { useEffect, useRef } from 'react';
|
import { useEffect, useRef } from 'react';
|
||||||
@ -28,11 +29,15 @@ export default function Index({ ...rest }) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
toolBarRender={(action) => [
|
toolBarRender={(action) => [
|
||||||
<ChargeStandardHasHouse
|
(rest?.item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
|
||||||
item={rest.item}
|
rest?.item.charge_type ===
|
||||||
reload={action?.reload}
|
HouseBillsTypeEnum.MaintenanceFund.value) && (
|
||||||
title={'绑房'}
|
<ChargeStandardHasHouse
|
||||||
/>,
|
item={rest.item}
|
||||||
|
reload={action?.reload}
|
||||||
|
title={'绑房'}
|
||||||
|
/>
|
||||||
|
),
|
||||||
]}
|
]}
|
||||||
search={false}
|
search={false}
|
||||||
columns={[
|
columns={[
|
||||||
|
|||||||
@ -69,6 +69,11 @@ export default function Index({ title = '收费标准' }) {
|
|||||||
dataIndex: 'name',
|
dataIndex: 'name',
|
||||||
search: false,
|
search: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '关联房屋数',
|
||||||
|
dataIndex: 'house_charge_has_houses_count',
|
||||||
|
search: false,
|
||||||
|
},
|
||||||
MyColumns.EnumTag({
|
MyColumns.EnumTag({
|
||||||
title: '收费项',
|
title: '收费项',
|
||||||
dataIndex: 'charge_type',
|
dataIndex: 'charge_type',
|
||||||
@ -148,11 +153,16 @@ export default function Index({ title = '收费标准' }) {
|
|||||||
reload={action?.reload}
|
reload={action?.reload}
|
||||||
title="编辑"
|
title="编辑"
|
||||||
/>
|
/>
|
||||||
<ChargeStandardHasHouse
|
{(item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
|
||||||
item={item}
|
item.charge_type ===
|
||||||
reload={action?.reload}
|
HouseBillsTypeEnum.MaintenanceFund.value) && (
|
||||||
title={'绑房'}
|
<ChargeStandardHasHouse
|
||||||
/>
|
item={item}
|
||||||
|
reload={action?.reload}
|
||||||
|
title={'绑房'}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
<MyButtons.Delete
|
<MyButtons.Delete
|
||||||
onConfirm={() =>
|
onConfirm={() =>
|
||||||
Apis.HouseCharage.HouseChargeStandards.Delete({
|
Apis.HouseCharage.HouseChargeStandards.Delete({
|
||||||
|
|||||||
@ -64,6 +64,16 @@ export default function Index({ title = '仪表管理' }) {
|
|||||||
]}
|
]}
|
||||||
columns={[
|
columns={[
|
||||||
MyColumns.ID(),
|
MyColumns.ID(),
|
||||||
|
{
|
||||||
|
title: '机构',
|
||||||
|
dataIndex: ['company', 'name'],
|
||||||
|
search: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '项目',
|
||||||
|
dataIndex: ['asset_project', 'name'],
|
||||||
|
search: false,
|
||||||
|
},
|
||||||
MyColumns.EnumTag({
|
MyColumns.EnumTag({
|
||||||
title: '类型',
|
title: '类型',
|
||||||
dataIndex: 'meter_type',
|
dataIndex: 'meter_type',
|
||||||
@ -85,6 +95,11 @@ export default function Index({ title = '仪表管理' }) {
|
|||||||
dataIndex: ['charge_standard', 'name'],
|
dataIndex: ['charge_standard', 'name'],
|
||||||
search: false,
|
search: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '关联房屋数',
|
||||||
|
dataIndex: 'house_meter_has_houses_count',
|
||||||
|
search: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '初始抄表读数',
|
title: '初始抄表读数',
|
||||||
dataIndex: 'initial_value',
|
dataIndex: 'initial_value',
|
||||||
@ -105,6 +120,7 @@ export default function Index({ title = '仪表管理' }) {
|
|||||||
dataIndex: 'latest_time',
|
dataIndex: 'latest_time',
|
||||||
search: false,
|
search: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
title: '备注',
|
title: '备注',
|
||||||
dataIndex: 'remark',
|
dataIndex: 'remark',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user