diff --git a/apps/web-antd/src/api/property/building/model.d.ts b/apps/web-antd/src/api/property/building/model.d.ts index ff1a7de9..2983ef7d 100644 --- a/apps/web-antd/src/api/property/building/model.d.ts +++ b/apps/web-antd/src/api/property/building/model.d.ts @@ -2,7 +2,7 @@ import type { PageQuery, BaseEntity } from '#/api/common'; export interface BuildingVO { /** - * + * */ id: string | number; @@ -135,7 +135,7 @@ export interface BuildingVO { export interface BuildingForm extends BaseEntity { /** - * + * */ id?: string | number; @@ -397,3 +397,136 @@ export interface BuildingQuery extends PageQuery { */ params?: any; } + +export interface Building extends BaseEntity { + /** + * 园区编码 + */ + communityCode?: string; + + /** + * 建筑编码 + */ + buildingCode?: string; + + /** + * 建筑名称 + */ + buildingName?: string; + + /** + * 省 + */ + province?: string; + + /** + * 市 + */ + city?: string; + + /** + * 区 + */ + district?: string; + + /** + * 地址 + */ + addr?: string; + + /** + * 经度 + */ + lon?: string; + + /** + * 维度 + */ + lat?: string; + + /** + * 产权性质(1:自持,2:承租,3:自持+承租,4:政府免费使用) + */ + cqxz?: number; + + /** + * 不动产编号 + */ + bdcbh?: string; + + /** + * 产权编号 + */ + cqbh?: string; + + /** + * 图地编号 + */ + tdbh?: string; + + /** + * 建筑面积 + */ + jzmj?: number; + + /** + * 产权面积 + */ + cqmj?: number; + + /** + * 可租面积 + */ + kzmj?: number; + + /** + * 自用面积 + */ + zymj?: number; + + /** + * 配套面积 + */ + ptmj?: number; + + /** + * 车位面积 + */ + cwmj?: number; + + /** + * 标准层高 + */ + bzcg?: number; + + /** + * 排序字段 + */ + sort?: number; + + /** + * 组织编码 + */ + orgCode?: string; + + /** + * 数据状态:1有效,0无效 + */ + dataState?: number; + + /** + * 修改时间 + */ + modifyTime?: string; + + /** + * 搜索值 + */ + searchValue?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + diff --git a/apps/web-antd/src/api/property/community/model.d.ts b/apps/web-antd/src/api/property/community/model.d.ts index b820b221..1d398f70 100644 --- a/apps/web-antd/src/api/property/community/model.d.ts +++ b/apps/web-antd/src/api/property/community/model.d.ts @@ -217,3 +217,74 @@ export interface CommunityQuery extends PageQuery { */ params?: any; } +export interface Community extends BaseEntity { + /** + * 社区名称 + */ + communityName?: string; + + /** + * 社区编码 + */ + communityCode?: string; + + /** + * 社区类型 1:园区,2:小区 + */ + communityType?: number; + + /** + * 省 + */ + province?: string; + + /** + * 市 + */ + city?: string; + + /** + * 区 + */ + district?: string; + + /** + * 地址 + */ + addr?: string; + + /** + * 经度 + */ + lon?: string; + + /** + * 维度 + */ + lat?: string; + + /** + * 小图图片 + */ + img?: string; + + /** + * 组织编码 + */ + orgCode?: string; + + /** + * 数据状态:1有效,0无效 + */ + dataState?: number; + + /** + * 修改时间 + */ + modifyTime?: string; + + /** + * 日期范围参数 + */ + 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 7f6f1bb4..684c2026 100644 --- a/apps/web-antd/src/api/property/productManagement/model.d.ts +++ b/apps/web-antd/src/api/property/productManagement/model.d.ts @@ -152,3 +152,60 @@ export interface PropertyQuery extends PageQuery { */ params?: any; } + +export interface plantsProduct extends BaseEntity { + /** + * 主键 + */ + id?: string | number; + + /** + * 产品编号 + */ + plantCode?: string; + + /** + * 产品名称 + */ + plantName?: string; + + /** + * 产品分类 + */ + plantType?: number; + + /** + * 产品图片 + */ + imgPath?: string; + + /** + * 规格 + */ + specification?: string; + + /** + * 租金 + */ + rent?: number; + + /** + * 库存数量 + */ + inventory?: number; + + /** + * 状态(0下架 1上架 ) + */ + state?: number; + + /** + * 备注 + */ + remark?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/apps/web-antd/src/views/property/building/building-detail.vue b/apps/web-antd/src/views/property/building/building-detail.vue new file mode 100644 index 00000000..bfbf5b8b --- /dev/null +++ b/apps/web-antd/src/views/property/building/building-detail.vue @@ -0,0 +1,109 @@ + + + diff --git a/apps/web-antd/src/views/property/building/data.ts b/apps/web-antd/src/views/property/building/data.ts index d3c7027e..4371ee88 100644 --- a/apps/web-antd/src/views/property/building/data.ts +++ b/apps/web-antd/src/views/property/building/data.ts @@ -20,36 +20,6 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'buildingName', label: '建筑名称', }, - { - component: 'Input', - fieldName: 'province', - label: '省', - }, - { - component: 'Input', - fieldName: 'city', - label: '市', - }, - { - component: 'Input', - fieldName: 'district', - label: '区', - }, - { - component: 'Input', - fieldName: 'addr', - label: '地址', - }, - { - component: 'Input', - fieldName: 'lon', - label: '经度', - }, - { - component: 'Input', - fieldName: 'lat', - label: '维度', - }, { component: 'Select', componentProps: { @@ -57,137 +27,43 @@ export const querySchema: FormSchemaGetter = () => [ options: getDictOptions('wy_cqxz'), }, fieldName: 'cqxz', - label: '产权性质(1:自持,2:承租,3:自持+承租,4:政府免费使用)', - }, - { - component: 'Input', - fieldName: 'bdcbh', - label: '不动产编号', - }, - { - component: 'Input', - fieldName: 'cqbh', - label: '产权编号', - }, - { - component: 'Input', - fieldName: 'tdbh', - label: '图地编号', - }, - { - component: 'Input', - fieldName: 'jzmj', - label: '建筑面积', - }, - { - component: 'Input', - fieldName: 'cqmj', - label: '产权面积', - }, - { - component: 'Input', - fieldName: 'kzmj', - label: '可租面积', - }, - { - component: 'Input', - fieldName: 'zymj', - label: '自用面积', - }, - { - component: 'Input', - fieldName: 'ptmj', - label: '配套面积', - }, - { - component: 'Input', - fieldName: 'cwmj', - label: '车位面积', - }, - { - component: 'Input', - fieldName: 'bzcg', - label: '标准层高', - }, - { - component: 'Input', - fieldName: 'sort', - label: '排序字段', - }, - { - component: 'Input', - fieldName: 'orgCode', - label: '组织编码', + label: '产权性质', }, { component: 'Input', fieldName: 'dataState', - label: '数据状态:1有效,0无效', - }, - { - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - fieldName: 'modifyTime', - label: '修改时间', - }, - { - component: 'Input', - fieldName: 'searchValue', - label: '搜索值', - }, + label: '数据状态', + } ]; // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新 // export const columns: () => VxeGridProps['columns'] = () => [ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, - { - title: '', - field: 'id', - }, { title: '园区编码', field: 'communityCode', + width: 'auto' }, { title: '建筑编码', field: 'buildingCode', + width: 'auto' }, { title: '建筑名称', field: 'buildingName', - }, - { - title: '省', - field: 'province', - }, - { - title: '市', - field: 'city', - }, - { - title: '区', - field: 'district', + width: 'auto' }, { title: '地址', field: 'addr', + width: 'auto' }, { - title: '经度', - field: 'lon', - }, - { - title: '维度', - field: 'lat', - }, - { - title: '产权性质(1:自持,2:承租,3:自持+承租,4:政府免费使用)', + title: '产权性质', field: 'cqxz', + width: 'auto', slots: { default: ({ row }) => { // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护 @@ -198,62 +74,62 @@ export const columns: VxeGridProps['columns'] = [ { title: '不动产编号', field: 'bdcbh', + width: 'auto' }, { title: '产权编号', field: 'cqbh', + width: 'auto' }, { - title: '图地编号', + title: '土地编号', field: 'tdbh', + width: 'auto' }, { title: '建筑面积', field: 'jzmj', + width: 'auto' }, { title: '产权面积', field: 'cqmj', + width: 'auto' }, { title: '可租面积', field: 'kzmj', + width: 'auto' }, { title: '自用面积', field: 'zymj', + width: 'auto' }, { title: '配套面积', field: 'ptmj', + width: 'auto' }, { title: '车位面积', field: 'cwmj', + width: 'auto' }, { title: '标准层高', field: 'bzcg', + width: 'auto' }, { - title: '排序字段', - field: 'sort', - }, - { - title: '组织编码', - field: 'orgCode', - }, - { - title: '数据状态:1有效,0无效', + title: '数据状态', field: 'dataState', + width: 'auto' }, { title: '修改时间', field: 'modifyTime', - }, - { - title: '搜索值', - field: 'searchValue', + width: 'auto' }, { field: 'action', @@ -292,6 +168,12 @@ export const modalSchema: FormSchemaGetter = () => [ component: 'Input', rules: 'required', }, + { + label: '组织编码', + fieldName: 'orgCode', + component: 'Input', + rules: 'required', + }, { label: '省', fieldName: 'province', @@ -329,7 +211,7 @@ export const modalSchema: FormSchemaGetter = () => [ rules: 'required', }, { - label: '产权性质(1:自持,2:承租,3:自持+承租,4:政府免费使用)', + label: '产权性质', fieldName: 'cqxz', component: 'Select', componentProps: { @@ -404,13 +286,7 @@ export const modalSchema: FormSchemaGetter = () => [ component: 'Input', }, { - label: '组织编码', - fieldName: 'orgCode', - component: 'Input', - rules: 'required', - }, - { - label: '数据状态:1有效,0无效', + label: '数据状态', fieldName: 'dataState', component: 'Input', }, @@ -423,10 +299,5 @@ export const modalSchema: FormSchemaGetter = () => [ format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', }, - }, - { - label: '搜索值', - fieldName: 'searchValue', - component: 'Input', - }, + } ]; diff --git a/apps/web-antd/src/views/property/building/index.vue b/apps/web-antd/src/views/property/building/index.vue index c1fa721e..59e94341 100644 --- a/apps/web-antd/src/views/property/building/index.vue +++ b/apps/web-antd/src/views/property/building/index.vue @@ -1,18 +1,12 @@ + + diff --git a/apps/web-antd/src/views/property/community/data.ts b/apps/web-antd/src/views/property/community/data.ts index a66ba360..872f4c3f 100644 --- a/apps/web-antd/src/views/property/community/data.ts +++ b/apps/web-antd/src/views/property/community/data.ts @@ -22,63 +22,13 @@ export const querySchema: FormSchemaGetter = () => [ options: getDictOptions('wy_sqlx'), }, fieldName: 'communityType', - label: '社区类型 1:园区,2:小区', - }, - { - component: 'Input', - fieldName: 'province', - label: '省', - }, - { - component: 'Input', - fieldName: 'city', - label: '市', - }, - { - component: 'Input', - fieldName: 'district', - label: '区', - }, - { - component: 'Input', - fieldName: 'addr', - label: '地址', - }, - { - component: 'Input', - fieldName: 'lon', - label: '经度', - }, - { - component: 'Input', - fieldName: 'lat', - label: '维度', - }, - { - component: 'Input', - fieldName: 'img', - label: '小图图片', - }, - { - component: 'Input', - fieldName: 'orgCode', - label: '组织编码', + label: '社区类型', }, { component: 'Input', fieldName: 'dataState', - label: '数据状态:1有效,0无效', - }, - { - component: 'DatePicker', - componentProps: { - showTime: true, - format: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'YYYY-MM-DD HH:mm:ss', - }, - fieldName: 'modifyTime', - label: '修改时间', - }, + label: '数据状态', + } ]; // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新 @@ -98,7 +48,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'communityCode', }, { - title: '社区类型 1:园区,2:小区', + title: '社区类型', field: 'communityType', slots: { default: ({ row }) => { @@ -136,11 +86,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'img', }, { - title: '组织编码', - field: 'orgCode', - }, - { - title: '数据状态:1有效,0无效', + title: '数据状态', field: 'dataState', }, { @@ -179,7 +125,7 @@ export const modalSchema: FormSchemaGetter = () => [ rules: 'required', }, { - label: '社区类型 1:园区,2:小区', + label: '社区类型', fieldName: 'communityType', component: 'Select', componentProps: { @@ -234,13 +180,7 @@ export const modalSchema: FormSchemaGetter = () => [ }, }, { - label: '组织编码', - fieldName: 'orgCode', - component: 'Input', - rules: 'required', - }, - { - label: '数据状态:1有效,0无效', + label: '数据状态', fieldName: 'dataState', component: 'Input', rules: 'required', diff --git a/apps/web-antd/src/views/property/community/index.vue b/apps/web-antd/src/views/property/community/index.vue index 23a05ffb..57bc2ff1 100644 --- a/apps/web-antd/src/views/property/community/index.vue +++ b/apps/web-antd/src/views/property/community/index.vue @@ -1,18 +1,12 @@ + + diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/property-modal.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/plantsProduct-modal.vue similarity index 100% rename from apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/property-modal.vue rename to apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/plantsProduct-modal.vue