From 6014e42cb675504f2c588f9a88a38d8e913986a8 Mon Sep 17 00:00:00 2001
From: uiuJun <>
Date: Fri, 10 Oct 2025 09:54:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
=?UTF-8?q?=E5=8D=95=E5=88=9B=E5=BB=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.umirc.ts | 4 ++--
src/pages/bills/list/modals/BillCreate.tsx | 6 ------
src/pages/bills/list/modals/BillUpdate.tsx | 6 ------
.../charge/standard/components/HasHouse.tsx | 15 +++++++++-----
src/pages/charge/standard/index.tsx | 20 ++++++++++++++-----
src/pages/meter/list/index.tsx | 16 +++++++++++++++
6 files changed, 43 insertions(+), 24 deletions(-)
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',
--
2.47.2
From afa03b2fc2d01a22345e5b1525cbfea3dcc04aca Mon Sep 17 00:00:00 2001
From: uiuJun <>
Date: Fri, 10 Oct 2025 09:58:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E5=8C=BA=E5=88=86=E6=8A=95?=
=?UTF-8?q?=E8=AF=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/complaint/index.tsx | 5 ++++-
src/pages/work_order/index.tsx | 8 +++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/pages/complaint/index.tsx b/src/pages/complaint/index.tsx
index b923f54..b40fc41 100644
--- a/src/pages/complaint/index.tsx
+++ b/src/pages/complaint/index.tsx
@@ -39,7 +39,10 @@ export default function Index({ title = '投诉列表' }) {
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
- { ...params, type: HouseWorkOrdersTypeEnum.Complaint.value },
+ {
+ ...params,
+ type: [HouseWorkOrdersTypeEnum.Complaint.value],
+ },
sort,
Apis.WorkOrder.HouseWorkOrders.List,
)
diff --git a/src/pages/work_order/index.tsx b/src/pages/work_order/index.tsx
index ecf4225..7095fa8 100644
--- a/src/pages/work_order/index.tsx
+++ b/src/pages/work_order/index.tsx
@@ -41,7 +41,13 @@ export default function Index({ title = '工单管理' }) {
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
- params,
+ {
+ ...params,
+ type: [
+ HouseWorkOrdersTypeEnum.Repair.value,
+ HouseWorkOrdersTypeEnum.Incident.value,
+ ],
+ },
sort,
Apis.WorkOrder.HouseWorkOrders.List,
)
--
2.47.2
From 67209f6d2098db5e30d0ada94d0142ed585f9377 Mon Sep 17 00:00:00 2001
From: uiuJun <>
Date: Fri, 10 Oct 2025 14:24:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/charge/tasks/index.tsx | 5 -----
src/pages/order/pay/index.tsx | 6 +-----
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/pages/charge/tasks/index.tsx b/src/pages/charge/tasks/index.tsx
index 9343f8c..27296b6 100644
--- a/src/pages/charge/tasks/index.tsx
+++ b/src/pages/charge/tasks/index.tsx
@@ -55,11 +55,6 @@ export default function Index({ title = '账单任务' }) {
dataIndex: ['asset_project', 'name'],
search: false,
},
- {
- title: '任务ID',
- dataIndex: 'id',
- search: false,
- },
MyColumns.EnumTag({
title: '创建类型',
dataIndex: 'type',
diff --git a/src/pages/order/pay/index.tsx b/src/pages/order/pay/index.tsx
index 606ba55..af1a54b 100644
--- a/src/pages/order/pay/index.tsx
+++ b/src/pages/order/pay/index.tsx
@@ -47,11 +47,7 @@ export default function Index({ title = '支付明细' }) {
// ]}
columns={[
MyColumns.ID(),
- {
- title: '支付订单',
- dataIndex: 'house_orders_id',
- search: false,
- },
+
MyColumns.EnumTag({
title: '支付状态',
dataIndex: 'payment_status',
--
2.47.2