Compare commits

..

3 Commits

Author SHA1 Message Date
b98300d927 fix:内容
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m33s
2025-10-11 10:18:18 +08:00
697d197882 fix:解决冲突 2025-10-11 09:53:51 +08:00
657df04ce3 fix:更新 2025-10-11 09:21:58 +08:00
4 changed files with 83 additions and 11 deletions

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

@ -864,12 +864,14 @@ declare namespace ApiTypes {
"companies_id": number; // 所属机构id,[ref:companies] "companies_id": number; // 所属机构id,[ref:companies]
"projects_id": number; // 所属项目id,[ref:asset_projects] "projects_id": number; // 所属项目id,[ref:asset_projects]
"receipt_accounts_id": number; // 机构收款账号id,[ref:company_receipt_accounts] "receipt_accounts_id": number; // 机构收款账号id,[ref:company_receipt_accounts]
"is_default"?: number; // 是否默认收款账号
}; };
type Update = { type Update = {
"id": number; // id "id": number; // id
"companies_id": number; // 所属机构id,[ref:companies] "companies_id": number; // 所属机构id,[ref:companies]
"projects_id": number; // 所属项目id,[ref:asset_projects] "projects_id": number; // 所属项目id,[ref:asset_projects]
"receipt_accounts_id": number; // 机构收款账号id,[ref:company_receipt_accounts] "receipt_accounts_id": number; // 机构收款账号id,[ref:company_receipt_accounts]
"is_default"?: number; // 是否默认收款账号
}; };
type Show = { type Show = {
"id": number; // id "id": number; // id
@ -1341,6 +1343,37 @@ declare namespace ApiTypes {
"id": number; // id "id": number; // id
}; };
} }
namespace HousePrepaymentPayments {
type List = {
"house_prepayments_id"?: number; // 房屋预付id,[ref:house_prepayments]
"asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses]
"full_name"?: string; // 模糊搜索:房屋名称
};
type Show = {
"id": number; // id
};
type Delete = {
"id": number; // id
};
}
namespace HousePrepayments {
type List = {
"full_name"?: string; // 模糊搜索:房屋名称
"company_name"?: string; // 模糊搜索:机构名称
};
type Show = {
"id": number; // id
};
type SoftDelete = {
"id": number; // id
};
type Restore = {
"id": number; // id
};
type Delete = {
"id": number; // id
};
}
} }
namespace Meter { namespace Meter {
namespace HouseMeterHasHouses { namespace HouseMeterHasHouses {
@ -1398,6 +1431,7 @@ declare namespace ApiTypes {
namespace HouseMeterTaskDetails { namespace HouseMeterTaskDetails {
type List = { type List = {
"house_meter_task_id"?: number; // 仪表任务id,[ref:house_meter_tasks] "house_meter_task_id"?: number; // 仪表任务id,[ref:house_meter_tasks]
"house_meters_id"?: number; // 仪表id,[ref:house_meters]
"full_name"?: string; // 房屋全称 "full_name"?: string; // 房屋全称
"meter_name"?: string; // 仪表名称 "meter_name"?: string; // 仪表名称
}; };
@ -1626,7 +1660,7 @@ declare namespace ApiTypes {
type List = { type List = {
"title"?: string; // 模糊搜索:名称 "title"?: string; // 模糊搜索:名称
"house_name"?: string; // 模糊搜索:房屋名称 "house_name"?: string; // 模糊搜索:房屋名称
"type"?: string; // 工单类型,[enum:HouseWorkOrdersTypeEnum] "type"?: string[]; // 工单类型,[enum:HouseWorkOrdersTypeEnum]
"level"?: string; // 工单优先级,[enum:HouseWorkOrdersLevelEnum] "level"?: string; // 工单优先级,[enum:HouseWorkOrdersLevelEnum]
"status"?: string; // 工单状态,[enum:HouseWorkOrdersStatusEnum] "status"?: string; // 工单状态,[enum:HouseWorkOrdersStatusEnum]
"assign_status"?: string; // 工单分配状态,[enum:HouseWorkOrdersAssignStatusEnum] "assign_status"?: string; // 工单分配状态,[enum:HouseWorkOrdersAssignStatusEnum]

View File

@ -800,6 +800,34 @@ export const Apis = {
return request('admin/house_order/house_orders/delete', { data }); return request('admin/house_order/house_orders/delete', { data });
}, },
}, },
HousePrepaymentPayments: {
List(data?: ApiTypes.HouseOrder.HousePrepaymentPayments.List): Promise<MyResponseType> {
return request('admin/house_order/house_prepayment_payments/list', { data });
},
Show(data: ApiTypes.HouseOrder.HousePrepaymentPayments.Show): Promise<MyResponseType> {
return request('admin/house_order/house_prepayment_payments/show', { data });
},
Delete(data: ApiTypes.HouseOrder.HousePrepaymentPayments.Delete): Promise<MyResponseType> {
return request('admin/house_order/house_prepayment_payments/delete', { data });
},
},
HousePrepayments: {
List(data?: ApiTypes.HouseOrder.HousePrepayments.List): Promise<MyResponseType> {
return request('admin/house_order/house_prepayments/list', { data });
},
Show(data: ApiTypes.HouseOrder.HousePrepayments.Show): Promise<MyResponseType> {
return request('admin/house_order/house_prepayments/show', { data });
},
SoftDelete(data: ApiTypes.HouseOrder.HousePrepayments.SoftDelete): Promise<MyResponseType> {
return request('admin/house_order/house_prepayments/soft_delete', { data });
},
Restore(data: ApiTypes.HouseOrder.HousePrepayments.Restore): Promise<MyResponseType> {
return request('admin/house_order/house_prepayments/restore', { data });
},
Delete(data: ApiTypes.HouseOrder.HousePrepayments.Delete): Promise<MyResponseType> {
return request('admin/house_order/house_prepayments/delete', { data });
},
},
}, },
Meter: { Meter: {
HouseMeterHasHouses: { HouseMeterHasHouses: {

View File

@ -154,7 +154,7 @@ export const BannersTypeEnum= {
// 缓存类型 // 缓存类型
export const CacheTypeEnum= { export const CacheTypeEnum= {
'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#7db989","value":"MobilePhoneVerificationCode"}, 'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#ad9561","value":"MobilePhoneVerificationCode"},
}; };
// CompaniesMerchantTypeEnum // CompaniesMerchantTypeEnum
@ -192,6 +192,7 @@ export const CompanyEmployeeBacklogsStatusEnum= {
export const CompanyEmployeeBacklogsTypeEnum= { export const CompanyEmployeeBacklogsTypeEnum= {
'WorkOrder': {"text":"工单","color":"#FF6600","value":"WorkOrder"}, 'WorkOrder': {"text":"工单","color":"#FF6600","value":"WorkOrder"},
'Contract': {"text":"合同","color":"#2A82E4","value":"Contract"}, 'Contract': {"text":"合同","color":"#2A82E4","value":"Contract"},
'MomentTask': {"text":"朋友圈任务","color":"#FF6600","value":"MomentTask"},
}; };
// CompanyReceiptAccountsPayChannelEnum // CompanyReceiptAccountsPayChannelEnum
@ -204,10 +205,10 @@ export const CompanyReceiptAccountsPayChannelEnum= {
// ConvenienceServicesTypeEnum // ConvenienceServicesTypeEnum
export const ConvenienceServicesTypeEnum= { export const ConvenienceServicesTypeEnum= {
'PropertyExclusive': {"text":"物业专属","color":"#8b5cf6","value":"PropertyExclusive"},
'EmergencyRepair': {"text":"紧急抢修","color":"#ef4444","value":"EmergencyRepair"}, 'EmergencyRepair': {"text":"紧急抢修","color":"#ef4444","value":"EmergencyRepair"},
'LifeService': {"text":"生活服务","color":"#3b82f6","value":"LifeService"}, 'LifeService': {"text":"生活服务","color":"#3b82f6","value":"LifeService"},
'GovernmentConsulting': {"text":"政务咨询","color":"#10b981","value":"GovernmentConsulting"}, 'GovernmentConsulting': {"text":"政务咨询","color":"#10b981","value":"GovernmentConsulting"},
'PropertyExclusive': {"text":"物业专属","color":"#8b5cf6","value":"PropertyExclusive"},
}; };
// CustomerBacklogsStatusEnum // CustomerBacklogsStatusEnum
@ -485,6 +486,13 @@ export const HouseOrdersPaymentMethodEnum= {
'Alipay': {"text":"支付宝","color":"#1677ff","value":"Alipay"}, 'Alipay': {"text":"支付宝","color":"#1677ff","value":"Alipay"},
'BankTransfer': {"text":"银行转账","color":"#6c757d","value":"BankTransfer"}, 'BankTransfer': {"text":"银行转账","color":"#6c757d","value":"BankTransfer"},
'TongLian': {"text":"通联支付","color":"#ff9f0a","value":"TongLian"}, 'TongLian': {"text":"通联支付","color":"#ff9f0a","value":"TongLian"},
'Prepayment': {"text":"预缴支付","color":"#f59e0b","value":"Prepayment"},
};
// HousePrepaymentLogsTypeEnum
export const HousePrepaymentLogsTypeEnum= {
'Add': {"text":"加","color":"#52c41a","value":"Add"},
'Subtract': {"text":"减","color":"#f5222d","value":"Subtract"},
}; };
// HouseRegistersCustomerTypeEnum // HouseRegistersCustomerTypeEnum

View File

@ -163,6 +163,11 @@ export default function Create(props: MyBetaModalFormProps) {
valueEnum: CustomerMomentsContentTypeEnum, valueEnum: CustomerMomentsContentTypeEnum,
required: true, required: true,
colProps: { span: 24 }, colProps: { span: 24 },
fieldProps: {
onChange: (e: any) => {
setContentType(e?.target?.value);
},
},
}), }),
{ {
name: ['content_type'], name: ['content_type'],
@ -221,7 +226,6 @@ export default function Create(props: MyBetaModalFormProps) {
name: ['content_type'], name: ['content_type'],
valueType: 'dependency', valueType: 'dependency',
columns: ({ content_type }: any) => { columns: ({ content_type }: any) => {
setContentType(content_type);
return content_type === 'MiniProgram' return content_type === 'MiniProgram'
? [ ? [
{ {
@ -282,16 +286,14 @@ export default function Create(props: MyBetaModalFormProps) {
const handleNext = async () => { const handleNext = async () => {
// 这里可以添加表单验证逻辑 // 这里可以添加表单验证逻辑
if (current < steps.length - 1) { setCurrent(1);
setCurrent(current + 1); console.log('next', current);
}
}; };
// 处理上一步 // 处理上一步
const handlePrev = () => { const handlePrev = () => {
if (current > 0) { setCurrent(0);
setCurrent(current - 1); console.log('Prev', current);
}
}; };
return ( return (
@ -375,7 +377,7 @@ export default function Create(props: MyBetaModalFormProps) {
}} }}
/> />
</div> </div>
{current ? <MyinfoPreview item={{ type: getContentType }} /> : ''} <MyinfoPreview item={{ type: getContentType }} />
</Space> </Space>
</Space> </Space>
} }