From cef7871eba035b4e0419dd2a57057d235012ffd5 Mon Sep 17 00:00:00 2001 From: fyy <2717885210@qq.com> Date: Thu, 17 Jul 2025 09:39:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentManagement/machineType/index.vue | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/apps/web-antd/src/views/property/equipmentManagement/machineType/index.vue b/apps/web-antd/src/views/property/equipmentManagement/machineType/index.vue index 6a24bd47..62c866b7 100644 --- a/apps/web-antd/src/views/property/equipmentManagement/machineType/index.vue +++ b/apps/web-antd/src/views/property/equipmentManagement/machineType/index.vue @@ -194,28 +194,10 @@ function handleDownloadExcel() { - - - {{ detailData.machineTypeName }} - - - {{ detailData.machineTypeCode }} - - - - {{ detailData.isEnable == '1' ? '启用' : '禁用' }} - - - - {{ detailData.remark || '-' }} - - +

类型名称:{{ detailData.machineTypeName }}

+

类型编号:{{ detailData.machineTypeCode }}

+

是否启用:{{ detailData.isEnable == '1' ? '启用' : '禁用' }}

+

备注:{{ detailData.remark || '-' }}

From 01da009de8e6b11575da43fd156b6d564c094cee Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Thu, 17 Jul 2025 14:10:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/property/equipmentManagement/deviceLocation/data.ts | 4 ---- .../deviceLocation/deviceLocation-modal.vue | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts index a4f6b9f9..d51b68d7 100644 --- a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts +++ b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/data.ts @@ -42,10 +42,6 @@ export const columns: VxeGridProps['columns'] = [ }, }, }, - { - title: '位置对象', - field: 'locationObject', - }, { title: '备注', field: 'remark', diff --git a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue index 5d8a8542..a992bbbc 100644 --- a/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue +++ b/apps/web-antd/src/views/property/equipmentManagement/deviceLocation/deviceLocation-modal.vue @@ -105,9 +105,11 @@ const [BasicModal, modalApi] = useVbenModal({ isUpdate.value = !!id; if (isUpdate.value && id) { const record = await deviceLocationInfo(id); + await setupCommunitySelect(record.locationType); record.locationType = record.locationType?.toString(); await formApi.setValues(record); } + await markInitialized(); modalApi.modalLoading(false); }, From 3389a864d10fe5310640b2e8acfb4aaab3c14fda Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Thu, 17 Jul 2025 14:21:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../costManagement/costItemSetting/index.ts | 61 +++++ .../costManagement/costItemSetting/model.d.ts | 219 ++++++++++++++++ .../costItemSetting/costItemSetting-modal.vue | 101 ++++++++ .../costManagement/costItemSetting/data.ts | 241 ++++++++++++++++++ .../costManagement/costItemSetting/index.vue | 182 +++++++++++++ 5 files changed, 804 insertions(+) create mode 100644 apps/web-antd/src/api/property/costManagement/costItemSetting/index.ts create mode 100644 apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts create mode 100644 apps/web-antd/src/views/property/costManagement/costItemSetting/costItemSetting-modal.vue create mode 100644 apps/web-antd/src/views/property/costManagement/costItemSetting/data.ts create mode 100644 apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue diff --git a/apps/web-antd/src/api/property/costManagement/costItemSetting/index.ts b/apps/web-antd/src/api/property/costManagement/costItemSetting/index.ts new file mode 100644 index 00000000..b97c3125 --- /dev/null +++ b/apps/web-antd/src/api/property/costManagement/costItemSetting/index.ts @@ -0,0 +1,61 @@ +import type { CostItemSettingVO, CostItemSettingForm, CostItemSettingQuery } 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 costItemSettingList(params?: CostItemSettingQuery) { + return requestClient.get>('/property/costItemSetting/list', { params }); +} + +/** + * 导出费用项设置列表 + * @param params + * @returns 费用项设置列表 + */ +export function costItemSettingExport(params?: CostItemSettingQuery) { + return commonExport('/property/costItemSetting/export', params ?? {}); +} + +/** + * 查询费用项设置详情 + * @param id id + * @returns 费用项设置详情 + */ +export function costItemSettingInfo(id: ID) { + return requestClient.get(`/property/costItemSetting/${id}`); +} + +/** + * 新增费用项设置 + * @param data + * @returns void + */ +export function costItemSettingAdd(data: CostItemSettingForm) { + return requestClient.postWithMsg('/property/costItemSetting', data); +} + +/** + * 更新费用项设置 + * @param data + * @returns void + */ +export function costItemSettingUpdate(data: CostItemSettingForm) { + return requestClient.putWithMsg('/property/costItemSetting', data); +} + +/** + * 删除费用项设置 + * @param id id + * @returns void + */ +export function costItemSettingRemove(id: ID | IDS) { + return requestClient.deleteWithMsg(`/property/costItemSetting/${id}`); +} diff --git a/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts b/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts new file mode 100644 index 00000000..732e49fb --- /dev/null +++ b/apps/web-antd/src/api/property/costManagement/costItemSetting/model.d.ts @@ -0,0 +1,219 @@ +import type { PageQuery, BaseEntity } from '#/api/common'; + +export interface CostItemSettingVO { + /** + * 主键 + */ + id: string | number; + + /** + * 费用类型 + */ + costType: string; + + /** + * 收费项目 + */ + chargeItem: string; + + /** + * 费用标识 + */ + costMark: string; + + /** + * 付费类型 + */ + paymentType: string; + + /** + * 缴费周期(月) + */ + chargeCycle: number; + + /** + * 是否手机缴费 + */ + isMobilePay: string; + + /** + * 进位方式 + */ + roundingMode: string; + + /** + * 保留小数 + */ + currencyDecimals: string; + + /** + * 启用状态 + */ + state: string; + + /** + * 计算公式 + */ + formula: string; + + /** + * 计费单价 + */ + unitPrice: number; + + /** + * 附加费 + */ + surcharge: number; + + /** + * 搜索值 + */ + searchValue: string; + +} + +export interface CostItemSettingForm extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 费用类型 + */ + costType?: string; + + /** + * 收费项目 + */ + chargeItem?: string; + + /** + * 费用标识 + */ + costMark?: string; + + /** + * 付费类型 + */ + paymentType?: string; + + /** + * 缴费周期(月) + */ + chargeCycle?: number; + + /** + * 是否手机缴费 + */ + isMobilePay?: string; + + /** + * 进位方式 + */ + roundingMode?: string; + + /** + * 保留小数 + */ + currencyDecimals?: string; + + /** + * 启用状态 + */ + state?: string; + + /** + * 计算公式 + */ + formula?: string; + + /** + * 计费单价 + */ + unitPrice?: number; + + /** + * 附加费 + */ + surcharge?: number; + + /** + * 搜索值 + */ + searchValue?: string; + +} + +export interface CostItemSettingQuery extends PageQuery { + /** + * 费用类型 + */ + costType?: string; + + /** + * 收费项目 + */ + chargeItem?: string; + + /** + * 费用标识 + */ + costMark?: string; + + /** + * 付费类型 + */ + paymentType?: string; + + /** + * 缴费周期(月) + */ + chargeCycle?: number; + + /** + * 是否手机缴费 + */ + isMobilePay?: string; + + /** + * 进位方式 + */ + roundingMode?: string; + + /** + * 保留小数 + */ + currencyDecimals?: string; + + /** + * 启用状态 + */ + state?: string; + + /** + * 计算公式 + */ + formula?: string; + + /** + * 计费单价 + */ + unitPrice?: number; + + /** + * 附加费 + */ + surcharge?: number; + + /** + * 搜索值 + */ + searchValue?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/apps/web-antd/src/views/property/costManagement/costItemSetting/costItemSetting-modal.vue b/apps/web-antd/src/views/property/costManagement/costItemSetting/costItemSetting-modal.vue new file mode 100644 index 00000000..218e5c62 --- /dev/null +++ b/apps/web-antd/src/views/property/costManagement/costItemSetting/costItemSetting-modal.vue @@ -0,0 +1,101 @@ + + + + diff --git a/apps/web-antd/src/views/property/costManagement/costItemSetting/data.ts b/apps/web-antd/src/views/property/costManagement/costItemSetting/data.ts new file mode 100644 index 00000000..d5240c1e --- /dev/null +++ b/apps/web-antd/src/views/property/costManagement/costItemSetting/data.ts @@ -0,0 +1,241 @@ +import type { FormSchemaGetter } from '#/adapter/form'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { getDictOptions } from '#/utils/dict'; +import { renderDict } from '#/utils/render'; + +export const querySchema: FormSchemaGetter = () => [ + { + component: 'Select', + componentProps: { + // 可选从DictEnum中获取 DictEnum.PRO_EXPENSE_TYPE 便于维护 + options: getDictOptions('pro_expense_type'), + }, + fieldName: 'costType', + label: '费用类型', + }, + { + component: 'Input', + fieldName: 'chargeItem', + label: '收费项目', + }, + { + component: 'Input', + fieldName: 'costMark', + label: '费用标识', + }, + { + component: 'Select', + componentProps: { + }, + fieldName: 'paymentType', + label: '付费类型', + }, + { + component: 'Input', + fieldName: 'chargeCycle', + label: '缴费周期', + }, + { + component: 'Input', + fieldName: 'isMobilePay', + label: '是否手机缴费', + }, + { + component: 'Input', + fieldName: 'roundingMode', + label: '进位方式', + }, + { + component: 'Input', + fieldName: 'currencyDecimals', + label: '保留小数', + }, + { + component: 'Input', + fieldName: 'state', + label: '启用状态', + }, + { + component: 'Input', + fieldName: 'formula', + label: '计算公式', + }, + { + component: 'Input', + fieldName: 'unitPrice', + label: '计费单价', + }, + { + component: 'Input', + fieldName: 'surcharge', + label: '附加费', + }, + { + component: 'Input', + fieldName: 'searchValue', + label: '搜索值', + }, +]; + +// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新 +// export const columns: () => VxeGridProps['columns'] = () => [ +export const columns: VxeGridProps['columns'] = [ + { type: 'checkbox', width: 60 }, + { + title: '主键', + field: 'id', + }, + { + title: '费用类型', + field: 'costType', + slots: { + default: ({ row }) => { + // 可选从DictEnum中获取 DictEnum.PRO_EXPENSE_TYPE 便于维护 + return renderDict(row.costType, 'pro_expense_type'); + }, + }, + }, + { + title: '收费项目', + field: 'chargeItem', + }, + { + title: '费用标识', + field: 'costMark', + }, + { + title: '付费类型', + field: 'paymentType', + }, + { + title: '缴费周期', + field: 'chargeCycle', + }, + { + title: '是否手机缴费', + field: 'isMobilePay', + }, + { + title: '进位方式', + field: 'roundingMode', + }, + { + title: '保留小数', + field: 'currencyDecimals', + }, + { + title: '启用状态', + field: 'state', + }, + { + title: '计算公式', + field: 'formula', + }, + { + title: '计费单价', + field: 'unitPrice', + }, + { + title: '附加费', + field: 'surcharge', + }, + { + title: '搜索值', + field: 'searchValue', + }, + { + field: 'action', + fixed: 'right', + slots: { default: 'action' }, + title: '操作', + width: 180, + }, +]; + +export const modalSchema: FormSchemaGetter = () => [ + { + label: '主键', + fieldName: 'id', + component: 'Input', + dependencies: { + show: () => false, + triggerFields: [''], + }, + }, + { + label: '费用类型', + fieldName: 'costType', + component: 'Select', + componentProps: { + // 可选从DictEnum中获取 DictEnum.PRO_EXPENSE_TYPE 便于维护 + options: getDictOptions('pro_expense_type'), + }, + rules: 'selectRequired', + }, + { + label: '收费项目', + fieldName: 'chargeItem', + component: 'Input', + rules: 'required', + }, + { + label: '费用标识', + fieldName: 'costMark', + component: 'Input', + rules: 'required', + }, + { + label: '付费类型', + fieldName: 'paymentType', + component: 'Select', + componentProps: { + }, + rules: 'selectRequired', + }, + { + label: '缴费周期', + fieldName: 'chargeCycle', + component: 'Input', + }, + { + label: '是否手机缴费', + fieldName: 'isMobilePay', + component: 'Input', + }, + { + label: '进位方式', + fieldName: 'roundingMode', + component: 'Input', + }, + { + label: '保留小数', + fieldName: 'currencyDecimals', + component: 'Input', + }, + { + label: '启用状态', + fieldName: 'state', + component: 'Input', + }, + { + label: '计算公式', + fieldName: 'formula', + component: 'Input', + }, + { + label: '计费单价', + fieldName: 'unitPrice', + component: 'Input', + }, + { + label: '附加费', + fieldName: 'surcharge', + component: 'Input', + }, + { + label: '搜索值', + fieldName: 'searchValue', + component: 'Input', + }, +]; diff --git a/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue b/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue new file mode 100644 index 00000000..afd89df3 --- /dev/null +++ b/apps/web-antd/src/views/property/costManagement/costItemSetting/index.vue @@ -0,0 +1,182 @@ + + +