pay/pay-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #13

Merged
uiujun merged 5 commits from develop into main 2025-10-01 18:07:02 +08:00
Conversation 0 Commits 5 Files Changed 45 +437 -568
7 changed files with 437 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9ea61ef8f - Show all commits

2
.umirc.ts
View File

@ -18,7 +18,7 @@ export default defineConfig({
// target: 'http://10.39.13.78:8001/',
target: 'https://test-admin.linyikj.com.cn/',
// target: 'https://admin.linyikj.com.cn/',
// target: 'http://cd69cef8.natappfree.cc/',
// target: 'http://c789629c.natappfree.cc',
changeOrigin: true,
pathRewrite: { '^': '' },

2
gencode.json
View File

@ -1,4 +1,4 @@
{
"url": "http://10.39.13.78:8001/api/docs/openapi",
"url": "http://c789629c.natappfree.cc/api/docs/openapi",
"module": "Admin"
}

30
src/gen/ApiTypes.d.ts vendored
View File

@ -67,6 +67,16 @@ declare namespace ApiTypes {
"asset_houses_id"?: number; // 资产房屋ID
"status"?: string; // 状态,[enum:HouseOccupantsStatusEnum]
};
type CustomerList = {
"name"?: string; // 客户姓名
"phone"?: string; // 客户手机号
"house_relation"?: string; // 房客关系,[enum:HouseOccupantsHouseRelationEnum]
"residential_relation"?: string; // 居住关系,[enum:HouseOccupantsResidentialRelationEnum]
"relation_with_owner"?: string; // 与产权人关系,[enum:HouseOccupantsRelationWithOwnerEnum]
};
type CustomerHouseByPhone = {
"phone": string; // 客户手机号
};
type Update = {
"id": number; // id
"name": string; // 客户姓名
@ -644,6 +654,7 @@ declare namespace ApiTypes {
namespace Positions {
type List = {
"name"?: string; // 模糊搜索：名称
"is_use"?: number; // 是否启用，1启用，0禁用
};
type Store = {
"name": string; // 岗位名称
@ -1256,6 +1267,9 @@ declare namespace ApiTypes {
type Delete = {
"id": number; // id
};
type CreateHouseBill = {
"id": number; // 任务明单id
};
}
namespace HouseChargeTasks {
type List = {
@ -1285,6 +1299,9 @@ declare namespace ApiTypes {
type Delete = {
"id": number; // id
};
type ExecuteTask = {
"id": number; // id
};
}
}
namespace HouseOrder {
@ -1344,7 +1361,8 @@ declare namespace ApiTypes {
}
namespace HouseMeterReadings {
type List = {
"name"?: string; // 模糊搜索：名称
"house_meters_id": number; // 仪表id,[ref:house_meters]
"operation_type"?: string; // 操作类型,[enum:HouseMeterReadingsOperationTypeEnum]
};
type Store = {
"house_meters_id": number; // 仪表id,[ref:house_meters]
@ -1352,7 +1370,7 @@ declare namespace ApiTypes {
"current_reading": number; // 本次读数
"reading_time": Date; // 抄表时间
"company_employees_id": number; // 抄表人id,[ref:company_employees]
"remark": string; // 备注
"remark"?: string; // 备注
};
type Update = {
"id": number; // id
@ -1364,7 +1382,7 @@ declare namespace ApiTypes {
"loss_amount"?: number; // 损耗
"reading_time": Date; // 抄表时间
"company_employees_id": number; // 抄表人id,[ref:company_employees]
"remark": string; // 备注
"remark"?: string; // 备注
};
type Show = {
"id": number; // id
@ -1385,6 +1403,9 @@ declare namespace ApiTypes {
type Delete = {
"id": number; // id
};
type CreateMeterBill = {
"id": number; // 仪表任务明细id
};
}
namespace HouseMeterTasks {
type List = {
@ -1410,6 +1431,9 @@ declare namespace ApiTypes {
type Delete = {
"id": number; // id
};
type ExecuteMeterTasks = {
"id": number; // id
};
}
namespace HouseMeters {
type List = {

20
src/gen/Apis.ts
View File

@ -46,6 +46,12 @@ export const Apis = {
List(data?: ApiTypes.Archive.HouseOccupants.List): Promise<MyResponseType> {
return request('admin/archive/house_occupants/list', { data });
},
CustomerList(data?: ApiTypes.Archive.HouseOccupants.CustomerList): Promise<MyResponseType> {
return request('admin/archive/house_occupants/customer_list', { data });
},
CustomerHouseByPhone(data: ApiTypes.Archive.HouseOccupants.CustomerHouseByPhone): Promise<MyResponseType> {
return request('admin/archive/house_occupants/customer_house_by_phone', { data });
},
Update(data: ApiTypes.Archive.HouseOccupants.Update): Promise<MyResponseType> {
return request('admin/archive/house_occupants/update', { data });
},
@ -737,6 +743,9 @@ export const Apis = {
Delete(data: ApiTypes.HouseCharage.HouseChargeTaskDetails.Delete): Promise<MyResponseType> {
return request('admin/house_charage/house_charge_task_details/delete', { data });
},
CreateHouseBill(data: ApiTypes.HouseCharage.HouseChargeTaskDetails.CreateHouseBill): Promise<MyResponseType> {
return request('admin/house_charage/house_charge_task_details/create_house_bill', { data });
},
},
HouseChargeTasks: {
List(data?: ApiTypes.HouseCharage.HouseChargeTasks.List): Promise<MyResponseType> {
@ -757,6 +766,9 @@ export const Apis = {
Delete(data: ApiTypes.HouseCharage.HouseChargeTasks.Delete): Promise<MyResponseType> {
return request('admin/house_charage/house_charge_tasks/delete', { data });
},
ExecuteTask(data: ApiTypes.HouseCharage.HouseChargeTasks.ExecuteTask): Promise<MyResponseType> {
return request('admin/house_charage/house_charge_tasks/execute_task', { data });
},
},
},
HouseOrder: {
@ -805,7 +817,7 @@ export const Apis = {
},
},
HouseMeterReadings: {
List(data?: ApiTypes.Meter.HouseMeterReadings.List): Promise<MyResponseType> {
List(data: ApiTypes.Meter.HouseMeterReadings.List): Promise<MyResponseType> {
return request('admin/meter/house_meter_readings/list', { data });
},
Store(data: ApiTypes.Meter.HouseMeterReadings.Store): Promise<MyResponseType> {
@ -831,6 +843,9 @@ export const Apis = {
Delete(data: ApiTypes.Meter.HouseMeterTaskDetails.Delete): Promise<MyResponseType> {
return request('admin/meter/house_meter_task_details/delete', { data });
},
CreateMeterBill(data: ApiTypes.Meter.HouseMeterTaskDetails.CreateMeterBill): Promise<MyResponseType> {
return request('admin/meter/house_meter_task_details/create_meter_bill', { data });
},
},
HouseMeterTasks: {
List(data?: ApiTypes.Meter.HouseMeterTasks.List): Promise<MyResponseType> {
@ -851,6 +866,9 @@ export const Apis = {
Delete(data: ApiTypes.Meter.HouseMeterTasks.Delete): Promise<MyResponseType> {
return request('admin/meter/house_meter_tasks/delete', { data });
},
ExecuteMeterTasks(data: ApiTypes.Meter.HouseMeterTasks.ExecuteMeterTasks): Promise<MyResponseType> {
return request('admin/meter/house_meter_tasks/execute_meter_tasks', { data });
},
},
HouseMeters: {
List(data?: ApiTypes.Meter.HouseMeters.List): Promise<MyResponseType> {

931
src/gen/Enums.ts
View File

File diff suppressed because it is too large Load Diff

6
src/pages/meter/tasks/index.tsx
View File

@ -32,11 +32,7 @@ export default function Index({ title = '账单任务' }) {
<ProTable
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
params,
sort,
Apis.HouseCharage.HouseChargeTasks.List,
)
MyProTableProps.request(params, sort, Apis.Meter.HouseMeterTasks.List)
}
toolBarRender={(action) => [
<TaskCreate key="Create" reload={action?.reload} title="账单任务" />,

14
src/pages/meter/tasks/modals/TaskCreate.tsx
View File

@ -1,18 +1,20 @@
import {
MyBetaModalFormProps,
MyButtons,
MyFormItems,
MyModalFormProps,
rulesHelper,
} from '@/common';
import { Selects } from '@/components/Select';
import { Apis } from '@/gen/Apis';
import { HouseMeterTasksGenerationMethodEnum } from '@/gen/Enums';
import { BetaSchemaForm } from '@ant-design/pro-components';
import { Form, message } from 'antd';
export default function Create(props: MyBetaModalFormProps) {
const [form] = Form.useForm();
return (
<BetaSchemaForm<ApiTypes.HouseCharage.HouseChargeTasks.Store>
<BetaSchemaForm<ApiTypes.Meter.HouseMeterTasks.Store>
{...MyModalFormProps.props}
title={`创建${props.title}`}
width="480px"
@ -29,7 +31,7 @@ export default function Create(props: MyBetaModalFormProps) {
}
}}
onFinish={async (values) =>
Apis.HouseCharage.HouseChargeTasks.Store(values)
Apis.Meter.HouseMeterTasks.Store(values)
.then(() => {
props.reload?.();
message.success(props.title + '账单任务创建成功');
@ -116,6 +118,14 @@ export default function Create(props: MyBetaModalFormProps) {
},
formItemProps: { ...rulesHelper.text },
},
MyFormItems.EnumRadio({
key: 'generation_method',
title: '收款渠道',
colProps: { span: 24 },
valueEnum: HouseMeterTasksGenerationMethodEnum,
required: true,
}),
]}
/>
);