diff --git a/.umirc.ts b/.umirc.ts
index 6fdf83b..2aa773e 100644
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -15,8 +15,8 @@ export default defineConfig({
proxy: {
'/api/': {
// target: 'http://yt:8003',
- // target: 'http://10.39.13.78:8001/',
- target: 'https://test-admin.linyikj.com.cn/',
+ target: 'http://10.39.13.78:8001/',
+ // target: 'https://test-admin.linyikj.com.cn/',
// target: 'https://admin.linyikj.com.cn/',
// target: 'http://c789629c.natappfree.cc',
diff --git a/src/pages/bills/list/modals/BillCreate.tsx b/src/pages/bills/list/modals/BillCreate.tsx
index d2343a2..5c6ed53 100644
--- a/src/pages/bills/list/modals/BillCreate.tsx
+++ b/src/pages/bills/list/modals/BillCreate.tsx
@@ -201,12 +201,6 @@ export default function Create(props: MyBetaModalFormProps) {
formItemProps: { ...rulesHelper.number },
fieldProps: {
showSearch: true,
- onChange: () => {
- form.setFieldsValue({
- asset_units_id: undefined,
- asset_floors_id: undefined,
- });
- },
},
}),
],
diff --git a/src/pages/bills/list/modals/BillUpdate.tsx b/src/pages/bills/list/modals/BillUpdate.tsx
index f018b93..c55727e 100644
--- a/src/pages/bills/list/modals/BillUpdate.tsx
+++ b/src/pages/bills/list/modals/BillUpdate.tsx
@@ -147,12 +147,6 @@ export default function Update(props: MyBetaModalFormProps) {
formItemProps: { ...rulesHelper.number },
fieldProps: {
showSearch: true,
- onChange: () => {
- form.setFieldsValue({
- asset_units_id: undefined,
- asset_floors_id: undefined,
- });
- },
},
}),
],
diff --git a/src/pages/charge/standard/components/HasHouse.tsx b/src/pages/charge/standard/components/HasHouse.tsx
index b44764a..973b4d7 100644
--- a/src/pages/charge/standard/components/HasHouse.tsx
+++ b/src/pages/charge/standard/components/HasHouse.tsx
@@ -1,6 +1,7 @@
import { MyButtons, MyColumns, MyProTableProps } from '@/common';
import { Apis } from '@/gen/Apis';
+import { HouseBillsTypeEnum } from '@/gen/Enums';
import { ProTable } from '@ant-design/pro-components';
import { Space } from 'antd';
import { useEffect, useRef } from 'react';
@@ -28,11 +29,15 @@ export default function Index({ ...rest }) {
)
}
toolBarRender={(action) => [
- ,
+ (rest?.item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
+ rest?.item.charge_type ===
+ HouseBillsTypeEnum.MaintenanceFund.value) && (
+
+ ),
]}
search={false}
columns={[
diff --git a/src/pages/charge/standard/index.tsx b/src/pages/charge/standard/index.tsx
index 3056a3d..d2f4356 100644
--- a/src/pages/charge/standard/index.tsx
+++ b/src/pages/charge/standard/index.tsx
@@ -69,6 +69,11 @@ export default function Index({ title = '收费标准' }) {
dataIndex: 'name',
search: false,
},
+ {
+ title: '关联房屋数',
+ dataIndex: 'house_charge_has_houses_count',
+ search: false,
+ },
MyColumns.EnumTag({
title: '收费项',
dataIndex: 'charge_type',
@@ -148,11 +153,16 @@ export default function Index({ title = '收费标准' }) {
reload={action?.reload}
title="编辑"
/>
-
+ {(item.charge_type === HouseBillsTypeEnum.PropertyFee.value ||
+ item.charge_type ===
+ HouseBillsTypeEnum.MaintenanceFund.value) && (
+
+ )}
+
Apis.HouseCharage.HouseChargeStandards.Delete({
diff --git a/src/pages/meter/list/index.tsx b/src/pages/meter/list/index.tsx
index 9e1a94b..29b53d4 100644
--- a/src/pages/meter/list/index.tsx
+++ b/src/pages/meter/list/index.tsx
@@ -64,6 +64,16 @@ export default function Index({ title = '仪表管理' }) {
]}
columns={[
MyColumns.ID(),
+ {
+ title: '机构',
+ dataIndex: ['company', 'name'],
+ search: false,
+ },
+ {
+ title: '项目',
+ dataIndex: ['asset_project', 'name'],
+ search: false,
+ },
MyColumns.EnumTag({
title: '类型',
dataIndex: 'meter_type',
@@ -85,6 +95,11 @@ export default function Index({ title = '仪表管理' }) {
dataIndex: ['charge_standard', 'name'],
search: false,
},
+ {
+ title: '关联房屋数',
+ dataIndex: 'house_meter_has_houses_count',
+ search: false,
+ },
{
title: '初始抄表读数',
dataIndex: 'initial_value',
@@ -105,6 +120,7 @@ export default function Index({ title = '仪表管理' }) {
dataIndex: 'latest_time',
search: false,
},
+
{
title: '备注',
dataIndex: 'remark',