From 1a9e821f484d73171711230a9de5c46bb5c200af Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Wed, 2 Jul 2025 09:51:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0add?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/property/building/index.ts | 2 +- .../src/api/property/community/index.ts | 2 +- apps/web-antd/src/api/property/floor/index.ts | 2 +- apps/web-antd/src/api/property/room/index.ts | 2 +- apps/web-antd/src/api/property/unit/index.ts | 2 +- .../src/api/sis/accessControl/index.ts | 2 +- .../src/api/sis/accessControlDevice/index.ts | 2 +- .../src/api/sis/deviceManage/index.ts | 2 +- .../web-antd/src/api/sis/devicePoint/index.ts | 2 +- apps/web-antd/src/api/sis/personLib/index.ts | 20 ++++++++++--------- apps/web-antd/vite.config.mts | 5 +++-- 11 files changed, 23 insertions(+), 20 deletions(-) diff --git a/apps/web-antd/src/api/property/building/index.ts b/apps/web-antd/src/api/property/building/index.ts index 29a07cbd..219947ba 100644 --- a/apps/web-antd/src/api/property/building/index.ts +++ b/apps/web-antd/src/api/property/building/index.ts @@ -39,7 +39,7 @@ export function buildingInfo(id: ID) { * @returns void */ export function buildingAdd(data: BuildingForm) { - return requestClient.postWithMsg('/property/building', data); + return requestClient.postWithMsg('/property/building/add', data); } /** diff --git a/apps/web-antd/src/api/property/community/index.ts b/apps/web-antd/src/api/property/community/index.ts index 58b99819..bb46cf97 100644 --- a/apps/web-antd/src/api/property/community/index.ts +++ b/apps/web-antd/src/api/property/community/index.ts @@ -50,7 +50,7 @@ export function communityInfo(id: ID) { * @returns void */ export function communityAdd(data: CommunityForm) { - return requestClient.postWithMsg('/property/community', data); + return requestClient.postWithMsg('/property/community/add', data); } /** diff --git a/apps/web-antd/src/api/property/floor/index.ts b/apps/web-antd/src/api/property/floor/index.ts index 8b154ce2..01a641ce 100644 --- a/apps/web-antd/src/api/property/floor/index.ts +++ b/apps/web-antd/src/api/property/floor/index.ts @@ -39,7 +39,7 @@ export function floorInfo(id: ID) { * @returns void */ export function floorAdd(data: FloorForm) { - return requestClient.postWithMsg('/property/floor', data); + return requestClient.postWithMsg('/property/floor/add', data); } /** diff --git a/apps/web-antd/src/api/property/room/index.ts b/apps/web-antd/src/api/property/room/index.ts index da07ffee..b6f6e9e2 100644 --- a/apps/web-antd/src/api/property/room/index.ts +++ b/apps/web-antd/src/api/property/room/index.ts @@ -39,7 +39,7 @@ export function roomInfo(id: ID) { * @returns void */ export function roomAdd(data: RoomForm) { - return requestClient.postWithMsg('/property/room', data); + return requestClient.postWithMsg('/property/room/add', data); } /** diff --git a/apps/web-antd/src/api/property/unit/index.ts b/apps/web-antd/src/api/property/unit/index.ts index 8563db68..dea03ddb 100644 --- a/apps/web-antd/src/api/property/unit/index.ts +++ b/apps/web-antd/src/api/property/unit/index.ts @@ -39,7 +39,7 @@ export function unitInfo(id: ID) { * @returns void */ export function unitAdd(data: UnitForm) { - return requestClient.postWithMsg('/property/unit', data); + return requestClient.postWithMsg('/property/unit/add', data); } /** diff --git a/apps/web-antd/src/api/sis/accessControl/index.ts b/apps/web-antd/src/api/sis/accessControl/index.ts index f4a2afc4..ed8934c7 100644 --- a/apps/web-antd/src/api/sis/accessControl/index.ts +++ b/apps/web-antd/src/api/sis/accessControl/index.ts @@ -45,7 +45,7 @@ export function accessControlInfo(id: ID) { * @returns void */ export function accessControlAdd(data: AccessControlForm) { - return requestClient.postWithMsg('/sis/accessControl', data); + return requestClient.postWithMsg('/sis/accessControl/add', data); } /** diff --git a/apps/web-antd/src/api/sis/accessControlDevice/index.ts b/apps/web-antd/src/api/sis/accessControlDevice/index.ts index ef99954a..7730483c 100644 --- a/apps/web-antd/src/api/sis/accessControlDevice/index.ts +++ b/apps/web-antd/src/api/sis/accessControlDevice/index.ts @@ -56,7 +56,7 @@ export function accessControlDeviceInfo(id: ID) { * @returns void */ export function accessControlDeviceAdd(data: AccessControlDeviceForm) { - return requestClient.postWithMsg('/sis/accessControlDevice', data); + return requestClient.postWithMsg('/sis/accessControlDevice/add', data); } /** diff --git a/apps/web-antd/src/api/sis/deviceManage/index.ts b/apps/web-antd/src/api/sis/deviceManage/index.ts index 1ad62e17..2a700f3b 100644 --- a/apps/web-antd/src/api/sis/deviceManage/index.ts +++ b/apps/web-antd/src/api/sis/deviceManage/index.ts @@ -39,7 +39,7 @@ export function deviceManageInfo(id: ID) { * @returns void */ export function deviceManageAdd(data: DeviceManageForm) { - return requestClient.postWithMsg('/sis/deviceManage', data); + return requestClient.postWithMsg('/sis/deviceManage/add', data); } /** diff --git a/apps/web-antd/src/api/sis/devicePoint/index.ts b/apps/web-antd/src/api/sis/devicePoint/index.ts index 12cb1be3..f429006d 100644 --- a/apps/web-antd/src/api/sis/devicePoint/index.ts +++ b/apps/web-antd/src/api/sis/devicePoint/index.ts @@ -40,7 +40,7 @@ export function devicePointInfo(id: ID) { * @returns void */ export function devicePointAdd(data: DevicePointForm) { - return requestClient.postWithMsg('/sis/devicePoint', data); + return requestClient.postWithMsg('/sis/devicePoint/add', data); } /** diff --git a/apps/web-antd/src/api/sis/personLib/index.ts b/apps/web-antd/src/api/sis/personLib/index.ts index e2f43600..dcc1ed0c 100644 --- a/apps/web-antd/src/api/sis/personLib/index.ts +++ b/apps/web-antd/src/api/sis/personLib/index.ts @@ -1,18 +1,20 @@ -import type { PersonLibVO, PersonLibForm, PersonLibQuery } from './model'; +import type { PersonLibForm, PersonLibQuery, PersonLibVO } from './model'; -import type { ID, IDS } from '#/api/common'; -import type { PageResult } from '#/api/common'; +import type { ID, IDS, PageResult } from '#/api/common'; import { commonExport } from '#/api/helper'; import { requestClient } from '#/api/request'; /** -* 查询人像库列表 -* @param params -* @returns 人像库列表 -*/ + 查询人像库列表 + @param params + @returns 人像库列表 + * @param params + */ export function personLibList(params?: PersonLibQuery) { - return requestClient.get>('/sis/personLib/list', { params }); + return requestClient.get>('/sis/personLib/list', { + params, + }); } /** @@ -39,7 +41,7 @@ export function personLibInfo(id: ID) { * @returns void */ export function personLibAdd(data: PersonLibForm) { - return requestClient.postWithMsg('/sis/personLib', data); + return requestClient.postWithMsg('/sis/personLib/add', data); } /** diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts index 77d61004..e7317230 100644 --- a/apps/web-antd/vite.config.mts +++ b/apps/web-antd/vite.config.mts @@ -28,8 +28,9 @@ export default defineConfig(async () => { rewrite: (path) => path.replace(/^\/api/, ''), // mock代理目标地址 // target: 'http://by.missmoc.top:3010/', - // target: 'http://192.168.0.103:8080', - target: 'http://47.109.37.87:3010', + target: 'http://127.0.0.1:8080', + // target: 'http://47.109.37.87:3010', + // target: 'http://192.168.110.207:8080', ws: true, }, }, From 0251d119882aa96eb39b03c4a1a8f9612374c7c4 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Wed, 2 Jul 2025 10:07:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/property/building/index.ts | 2 +- apps/web-antd/src/api/property/community/index.ts | 2 +- apps/web-antd/src/api/property/floor/index.ts | 2 +- apps/web-antd/src/api/property/room/index.ts | 2 +- apps/web-antd/src/api/property/unit/index.ts | 2 +- apps/web-antd/src/api/sis/accessControl/index.ts | 2 +- apps/web-antd/src/api/sis/accessControlDevice/index.ts | 2 +- apps/web-antd/src/api/sis/deviceManage/index.ts | 2 +- apps/web-antd/src/api/sis/devicePoint/index.ts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/web-antd/src/api/property/building/index.ts b/apps/web-antd/src/api/property/building/index.ts index 219947ba..29a07cbd 100644 --- a/apps/web-antd/src/api/property/building/index.ts +++ b/apps/web-antd/src/api/property/building/index.ts @@ -39,7 +39,7 @@ export function buildingInfo(id: ID) { * @returns void */ export function buildingAdd(data: BuildingForm) { - return requestClient.postWithMsg('/property/building/add', data); + return requestClient.postWithMsg('/property/building', data); } /** diff --git a/apps/web-antd/src/api/property/community/index.ts b/apps/web-antd/src/api/property/community/index.ts index bb46cf97..58b99819 100644 --- a/apps/web-antd/src/api/property/community/index.ts +++ b/apps/web-antd/src/api/property/community/index.ts @@ -50,7 +50,7 @@ export function communityInfo(id: ID) { * @returns void */ export function communityAdd(data: CommunityForm) { - return requestClient.postWithMsg('/property/community/add', data); + return requestClient.postWithMsg('/property/community', data); } /** diff --git a/apps/web-antd/src/api/property/floor/index.ts b/apps/web-antd/src/api/property/floor/index.ts index 01a641ce..8b154ce2 100644 --- a/apps/web-antd/src/api/property/floor/index.ts +++ b/apps/web-antd/src/api/property/floor/index.ts @@ -39,7 +39,7 @@ export function floorInfo(id: ID) { * @returns void */ export function floorAdd(data: FloorForm) { - return requestClient.postWithMsg('/property/floor/add', data); + return requestClient.postWithMsg('/property/floor', data); } /** diff --git a/apps/web-antd/src/api/property/room/index.ts b/apps/web-antd/src/api/property/room/index.ts index b6f6e9e2..da07ffee 100644 --- a/apps/web-antd/src/api/property/room/index.ts +++ b/apps/web-antd/src/api/property/room/index.ts @@ -39,7 +39,7 @@ export function roomInfo(id: ID) { * @returns void */ export function roomAdd(data: RoomForm) { - return requestClient.postWithMsg('/property/room/add', data); + return requestClient.postWithMsg('/property/room', data); } /** diff --git a/apps/web-antd/src/api/property/unit/index.ts b/apps/web-antd/src/api/property/unit/index.ts index dea03ddb..8563db68 100644 --- a/apps/web-antd/src/api/property/unit/index.ts +++ b/apps/web-antd/src/api/property/unit/index.ts @@ -39,7 +39,7 @@ export function unitInfo(id: ID) { * @returns void */ export function unitAdd(data: UnitForm) { - return requestClient.postWithMsg('/property/unit/add', data); + return requestClient.postWithMsg('/property/unit', data); } /** diff --git a/apps/web-antd/src/api/sis/accessControl/index.ts b/apps/web-antd/src/api/sis/accessControl/index.ts index ed8934c7..f4a2afc4 100644 --- a/apps/web-antd/src/api/sis/accessControl/index.ts +++ b/apps/web-antd/src/api/sis/accessControl/index.ts @@ -45,7 +45,7 @@ export function accessControlInfo(id: ID) { * @returns void */ export function accessControlAdd(data: AccessControlForm) { - return requestClient.postWithMsg('/sis/accessControl/add', data); + return requestClient.postWithMsg('/sis/accessControl', data); } /** diff --git a/apps/web-antd/src/api/sis/accessControlDevice/index.ts b/apps/web-antd/src/api/sis/accessControlDevice/index.ts index 7730483c..ef99954a 100644 --- a/apps/web-antd/src/api/sis/accessControlDevice/index.ts +++ b/apps/web-antd/src/api/sis/accessControlDevice/index.ts @@ -56,7 +56,7 @@ export function accessControlDeviceInfo(id: ID) { * @returns void */ export function accessControlDeviceAdd(data: AccessControlDeviceForm) { - return requestClient.postWithMsg('/sis/accessControlDevice/add', data); + return requestClient.postWithMsg('/sis/accessControlDevice', data); } /** diff --git a/apps/web-antd/src/api/sis/deviceManage/index.ts b/apps/web-antd/src/api/sis/deviceManage/index.ts index 2a700f3b..1ad62e17 100644 --- a/apps/web-antd/src/api/sis/deviceManage/index.ts +++ b/apps/web-antd/src/api/sis/deviceManage/index.ts @@ -39,7 +39,7 @@ export function deviceManageInfo(id: ID) { * @returns void */ export function deviceManageAdd(data: DeviceManageForm) { - return requestClient.postWithMsg('/sis/deviceManage/add', data); + return requestClient.postWithMsg('/sis/deviceManage', data); } /** diff --git a/apps/web-antd/src/api/sis/devicePoint/index.ts b/apps/web-antd/src/api/sis/devicePoint/index.ts index f429006d..12cb1be3 100644 --- a/apps/web-antd/src/api/sis/devicePoint/index.ts +++ b/apps/web-antd/src/api/sis/devicePoint/index.ts @@ -40,7 +40,7 @@ export function devicePointInfo(id: ID) { * @returns void */ export function devicePointAdd(data: DevicePointForm) { - return requestClient.postWithMsg('/sis/devicePoint/add', data); + return requestClient.postWithMsg('/sis/devicePoint', data); } /** From 79fe4c6412f1dfecd4b9d2d922d292437693e9e6 Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Wed, 2 Jul 2025 11:02:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=BF=E6=A4=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/property/chargeManagement/model.d.ts | 69 ++++- .../property/conservationManagement/index.ts | 59 +++++ .../conservationManagement/model.d.ts | 247 ++++++++++++++++++ .../api/property/productManagement/model.d.ts | 19 +- .../chargeManagement/data.ts | 56 ++-- .../chargeManagement/index.vue | 30 ++- .../chargeManagement/orderCharge-detail.vue | 83 ++++++ .../conservationManagement/data.ts | 229 ++++++++++++++++ .../conservationManagement/index.vue | 146 ++++++++++- .../orderMaintain-modal.vue | 93 +++++++ .../productManagement/data.ts | 19 +- .../productManagement/index.vue | 18 +- .../plantsProduct-detail.vue | 12 +- .../productManagement/plantsProduct-modal.vue | 8 +- .../visitorInvitation/data.ts | 24 -- .../visitorManagement/visitorTodo/data.ts | 47 ++-- apps/web-antd/vite.config.mts | 5 +- 17 files changed, 1031 insertions(+), 133 deletions(-) create mode 100644 apps/web-antd/src/api/property/conservationManagement/index.ts create mode 100644 apps/web-antd/src/api/property/conservationManagement/model.d.ts create mode 100644 apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue create mode 100644 apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts create mode 100644 apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/orderMaintain-modal.vue diff --git a/apps/web-antd/src/api/property/chargeManagement/model.d.ts b/apps/web-antd/src/api/property/chargeManagement/model.d.ts index 68cc125c..8313b1d2 100644 --- a/apps/web-antd/src/api/property/chargeManagement/model.d.ts +++ b/apps/web-antd/src/api/property/chargeManagement/model.d.ts @@ -65,7 +65,6 @@ export interface OrderChargeVO { * 收费状态 */ chargeStatus: number; - } export interface OrderChargeForm extends BaseEntity { @@ -133,7 +132,6 @@ export interface OrderChargeForm extends BaseEntity { * 收费状态 */ chargeStatus?: number; - } export interface OrderChargeQuery extends PageQuery { @@ -202,3 +200,70 @@ export interface OrderChargeQuery extends PageQuery { */ params?: any; } + +export interface orderChargeDetailForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 订单id + */ + orderId?: string | number; + + /** + * 租赁人id（系统用户） + */ + userId?: string | number; + + /** + * 租赁人名称 + */ + userName?: string; + + /** + * 租金 + */ + rent?: number; + + /** + * 押金 + */ + deposit?: number; + + /** + * 违约金 + */ + penalty?: number; + + /** + * 总金额 + */ + totalAmount?: number; + + /** + * 收费日期 + */ + chargeDate?: string; + + /** + * 支付方式 + */ + paymentMethod?: number; + + /** + * 开票状态 + */ + invoiceStatus?: number; + + /** + * 发票类型 + */ + invoiceType?: number; + + /** + * 收费状态 + */ + chargeStatus?: number; +} diff --git a/apps/web-antd/src/api/property/conservationManagement/index.ts b/apps/web-antd/src/api/property/conservationManagement/index.ts new file mode 100644 index 00000000..033529c0 --- /dev/null +++ b/apps/web-antd/src/api/property/conservationManagement/index.ts @@ -0,0 +1,59 @@ +import type { OrderMaintainVO, OrderMaintainForm, OrderMaintainQuery } from './model'; +import type { ID, IDS } from '#/api/common'; +import type { PageResult } from '#/api/common'; +import { commonExport } from '#/api/helper'; +import { requestClient } from '#/api/request'; + +/** +* 查询绿植租赁-订单养护管理列表 +* @param params +* @returns 绿植租赁-订单养护管理列表 +*/ +export function orderMaintainList(params?: OrderMaintainQuery) { + return requestClient.get>('/property/orderMaintain/list', { params }); +} + +/** + * 导出绿植租赁-订单养护管理列表 + * @param params + * @returns 绿植租赁-订单养护管理列表 + */ +export function orderMaintainExport(params?: OrderMaintainQuery) { + return commonExport('/property/orderMaintain/export', params ?? {}); +} + +/** + * 查询绿植租赁-订单养护管理详情 + * @param id id + * @returns 绿植租赁-订单养护管理详情 + */ +export function orderMaintainInfo(id: ID) { + return requestClient.get(`/property/orderMaintain/${id}`); +} + +/** + * 新增绿植租赁-订单养护管理 + * @param data + * @returns void + */ +export function orderMaintainAdd(data: OrderMaintainForm) { + return requestClient.postWithMsg('/property/orderMaintain', data); +} + +/** + * 更新绿植租赁-订单养护管理 + * @param data + * @returns void + */ +export function orderMaintainUpdate(data: OrderMaintainForm) { + return requestClient.putWithMsg('/property/orderMaintain', data); +} + +/** + * 删除绿植租赁-订单养护管理 + * @param id id + * @returns void + */ +export function orderMaintainRemove(id: ID | IDS) { + return requestClient.deleteWithMsg(`/property/orderMaintain/${id}`); +} diff --git a/apps/web-antd/src/api/property/conservationManagement/model.d.ts b/apps/web-antd/src/api/property/conservationManagement/model.d.ts new file mode 100644 index 00000000..6207f3b7 --- /dev/null +++ b/apps/web-antd/src/api/property/conservationManagement/model.d.ts @@ -0,0 +1,247 @@ +import type { PageQuery, BaseEntity } from '#/api/common'; + +export interface OrderMaintainVO { + /** + * 主键 + */ + id: string | number; + + /** + * 养护名称 + */ + maintainName: string; + + /** + * 小区id + */ + communityId: string | number; + + /** + * 建筑id + */ + buildingId: string | number; + + /** + * 楼层id + */ + floorId: string | number; + + /** + * 服务类型 + */ + serveType: number; + + /** + * 养护周期类型 + */ + periodType: number; + + /** + * 养护周期频次 + */ + periodFrequency: number; + + /** + * 订单id + */ + orderId: string | number; + + /** + * 计划执行时间 + */ + startTime: string; + + /** + * 计划完成时间 + */ + endTime: string; + + /** + * 巡检结果 + */ + inspectResult: number; + + /** + * 处理措施 + */ + measure: string; + + /** + * 客户评分 + */ + customerScore: number; + + /** + * 客户反馈 + */ + customerAdvice: string; + + /** + * 处理状态 + */ + state: number; +} + +export interface OrderMaintainForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 养护名称 + */ + maintainName?: string; + + /** + * 小区id + */ + communityId?: string | number; + + /** + * 建筑id + */ + buildingId?: string | number; + + /** + * 楼层id + */ + floorId?: string | number; + + /** + * 服务类型 + */ + serveType?: number; + + /** + * 养护周期类型 + */ + periodType?: number; + + /** + * 养护周期频次 + */ + periodFrequency?: number; + + /** + * 订单id + */ + orderId?: string | number; + + /** + * 计划执行时间 + */ + startTime?: string; + + /** + * 计划完成时间 + */ + endTime?: string; + + /** + * 巡检结果 + */ + inspectResult?: number; + + /** + * 处理措施 + */ + measure?: string; + + /** + * 客户评分 + */ + customerScore?: number; + + /** + * 客户反馈 + */ + customerAdvice?: string; + + /** + * 处理状态 + */ + state?: number; +} + +export interface OrderMaintainQuery extends PageQuery { + /** + * 养护名称 + */ + maintainName?: string; + + /** + * 小区id + */ + communityId?: string | number; + + /** + * 建筑id + */ + buildingId?: string | number; + + /** + * 楼层id + */ + floorId?: string | number; + + /** + * 服务类型 + */ + serveType?: number; + + /** + * 养护周期类型 + */ + periodType?: number; + + /** + * 养护周期频次 + */ + periodFrequency?: number; + + /** + * 订单id + */ + orderId?: string | number; + + /** + * 计划执行时间 + */ + startTime?: string; + + /** + * 计划完成时间 + */ + endTime?: string; + + /** + * 巡检结果 + */ + inspectResult?: number; + + /** + * 处理措施 + */ + measure?: string; + + /** + * 客户评分 + */ + customerScore?: number; + + /** + * 客户反馈 + */ + customerAdvice?: string; + + /** + * 处理状态 + */ + state?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/apps/web-antd/src/api/property/productManagement/model.d.ts b/apps/web-antd/src/api/property/productManagement/model.d.ts index 684c2026..5d611320 100644 --- a/apps/web-antd/src/api/property/productManagement/model.d.ts +++ b/apps/web-antd/src/api/property/productManagement/model.d.ts @@ -19,7 +19,7 @@ export interface PropertyVO { /** * 产品分类 */ - plantType: number; + plantType: number|string; /** * 产品图片 @@ -44,7 +44,7 @@ export interface PropertyVO { /** * 状态（0下架 1上架 ） */ - state: number; + state: number|string; /** * 备注 @@ -72,8 +72,7 @@ export interface PropertyForm extends BaseEntity { /** * 产品分类 */ - plantType?: number; - + plantType?: number|string; /** * 产品图片 */ @@ -97,7 +96,7 @@ export interface PropertyForm extends BaseEntity { /** * 状态（0下架 1上架 ） */ - state?: number; + state?: number|string; /** * 备注 @@ -120,7 +119,7 @@ export interface PropertyQuery extends PageQuery { /** * 产品分类 */ - plantType?: number; + plantType?: number|string; /** * 产品图片 @@ -145,7 +144,7 @@ export interface PropertyQuery extends PageQuery { /** * 状态（0下架 1上架 ） */ - state?: number; + state?: number|string; /** * 日期范围参数 @@ -172,7 +171,7 @@ export interface plantsProduct extends BaseEntity { /** * 产品分类 */ - plantType?: number; + plantType?: number|string; /** * 产品图片 @@ -182,7 +181,7 @@ export interface plantsProduct extends BaseEntity { /** * 规格 */ - specification?: string; + specification?: number|string; /** * 租金 @@ -197,7 +196,7 @@ export interface plantsProduct extends BaseEntity { /** * 状态（0下架 1上架 ） */ - state?: number; + state?: number|string; /** * 备注 diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts index 47ed6132..d19cd563 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts @@ -2,18 +2,14 @@ import type { FormSchemaGetter } from '#/adapter/form'; import type { VxeGridProps } from '#/adapter/vxe-table'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; +import {orderChargeList} from "#/api/property/chargeManagement"; export const querySchema: FormSchemaGetter = () => [ { - component: 'Input', + component: 'Select', fieldName: 'orderId', label: '订单号', }, - { - component: 'Input', - fieldName: 'userId', - label: '租赁人id', - }, { component: 'Select', componentProps: { @@ -27,16 +23,19 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'userName', label: '租赁人', }, - { - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - fieldName: 'chargeDate', - label: '收费日期', - }, + // { + // component: 'RangePicker', + // componentProps: { + // showTime: { + // format: 'HH:mm:ss' + // }, + // format: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'YYYY-MM-DD HH:mm:ss', + // placeholder: ['开始时间', '结束时间'] + // }, + // fieldName: 'chargeDate', + // label: '收费日期', + // }, { component: 'Select', componentProps: { @@ -71,7 +70,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'orderId', }, { - title: '租赁人id', + title: '租赁合同编号', field: 'userId', }, { @@ -129,6 +128,10 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, + { + title: '创建时间', + field: 'createTime', + }, { field: 'action', fixed: 'right', @@ -148,16 +151,21 @@ export const modalSchema: FormSchemaGetter = () => [ triggerFields: [''], }, }, + // { + // label: '订单号', + // fieldName: 'orderId', + // component: 'Input', + // rules: 'required', + // }, { label: '订单号', fieldName: 'orderId', - component: 'Input', - rules: 'required', - }, - { - label: '租赁人id', - fieldName: 'userId', - component: 'Input', + component: 'ApiSelect', + componentProps: { + api: orderChargeList, + resultField: 'rows', + valueField: 'orderId', + }, rules: 'required', }, { diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue index 9fabaeb0..718a2cf7 100644 --- a/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue +++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue @@ -8,13 +8,12 @@ import { type VxeGridProps } from '#/adapter/vxe-table'; import { - orderChargeExport, orderChargeList, orderChargeRemove, } from '#/api/property/chargeManagement'; import type { OrderChargeForm } from '#/api/property/chargeManagement/model'; -import { commonDownloadExcel } from '#/utils/file/download'; import orderChargeModal from './orderCharge-modal.vue'; +import orderChargeDetail from './orderCharge-detail.vue'; import { columns, querySchema } from './data'; const formOptions: VbenFormProps = { @@ -63,6 +62,15 @@ const [OrderChargeModal, modalApi] = useVbenModal({ connectedComponent: orderChargeModal, }); +const [orderChargeDetailModal, orderChargeDetailApi] = useVbenModal({ + connectedComponent: orderChargeDetail, +}); + +async function handleInfo(row: Required) { + orderChargeDetailApi.setData({ id: row.id }); + orderChargeDetailApi.open(); +} + function handleAdd() { modalApi.setData({}); modalApi.open(); @@ -91,12 +99,6 @@ function handleMultiDelete() { }, }); } - -function handleDownloadExcel() { - commonDownloadExcel(orderChargeExport, '绿植租赁-订单收费数据', tableApi.formApi.form.values, { - fieldMappingTime: formOptions.fieldMappingTime, - }); -}