综合模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
15683799673 2025-06-28 22:49:40 +08:00
parent acd63bc96e
commit 54cea19b78
22 changed files with 523 additions and 571 deletions

View File

@ -1,4 +1,4 @@
import type { PageQuery, BaseEntity } from '#/api/common';
import type { BaseEntity, PageQuery } from '#/api/common';
export interface BuildingVO {
/**
@ -16,21 +16,6 @@ export interface BuildingVO {
*/
buildingName: string;
/**
*
*/
province: string;
/**
*
*/
city: string;
/**
*
*/
district: string;
/**
*
*/
@ -70,67 +55,6 @@ export interface BuildingVO {
*
*/
lat: string;
/**
* (1:自持23+,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;
}
export interface BuildingForm extends BaseEntity {
@ -149,21 +73,6 @@ export interface BuildingForm extends BaseEntity {
*/
buildingName?: string;
/**
*
*/
province?: string;
/**
*
*/
city?: string;
/**
*
*/
district?: string;
/**
*
*/
@ -203,68 +112,6 @@ export interface BuildingForm extends BaseEntity {
*
*/
lat?: string;
/**
* (1:自持23+,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;
}
export interface BuildingQuery extends PageQuery {
@ -278,21 +125,6 @@ export interface BuildingQuery extends PageQuery {
*/
buildingName?: string;
/**
*
*/
province?: string;
/**
*
*/
city?: string;
/**
*
*/
district?: string;
/**
*
*/
@ -333,68 +165,13 @@ export interface BuildingQuery extends PageQuery {
*/
lat?: string;
/**
* (1:自持23+,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;
/**
*
*/
*
*/
params?: any;
}

View File

@ -1,28 +1,37 @@
import type { CityAreaVO, CityAreaForm, CityAreaQuery } from './model';
import type { CityAreaForm, CityAreaQuery, CityAreaVO } 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
*/
export function cityAreaList(params?: CityAreaQuery) {
return requestClient.get<PageResult<CityAreaVO>>('/property/cityArea/list', { params });
return requestClient.get<PageResult<CityAreaVO>>('/property/cityArea/list', {
params,
});
}
/**
*
* @param params
*/
export function getCityAreaTreeList() {
return requestClient.get<CityAreaVO[]>('/property/cityArea/treeList');
}
/**
*
* @param params
* @returns
*/
export function cityAreaExport(params?: CityAreaQuery) {
return commonExport('/property/cityArea/export', params ?? {});
@ -30,10 +39,10 @@ export function cityAreaExport(params?: CityAreaQuery) {
/**
*
* @param areaCode id
* @returns
*/
export function cityAreaInfo(areaCode: ID) {
return requestClient.get<CityAreaVO>(`/property/cityArea/${areaCode}`);

View File

@ -1,18 +1,29 @@
import type { CommunityVO, CommunityForm, CommunityQuery } from './model';
import type { CommunityForm, CommunityQuery, CommunityVO } 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
*/
export function communityList(params?: CommunityQuery) {
return requestClient.get<PageResult<CommunityVO>>('/property/community/list', { params });
return requestClient.get<PageResult<CommunityVO>>(
'/property/community/list',
{ params },
);
}
/**
*
* @param params
* @returns
*/
export function communityTree(level: number) {
return requestClient.get<CommunityVO[]>(`/property/community/tree/${level}`);
}
/**

View File

@ -1,8 +1,8 @@
import type { PageQuery, BaseEntity } from '#/api/common';
import type { BaseEntity, PageQuery } from '#/api/common';
export interface CommunityVO {
/**
*
*
*/
id: string | number;
@ -16,6 +16,9 @@ export interface CommunityVO {
*/
communityType: number;
cityFullCode: string;
cityFullName: string;
/**
*
*/
@ -52,7 +55,7 @@ export interface CommunityVO {
area: number;
/**
*
*
*/
builtYear: string;
@ -75,12 +78,11 @@ export interface CommunityVO {
*
*/
img: string;
}
export interface CommunityForm extends BaseEntity {
/**
*
*
*/
id?: string | number;
@ -94,6 +96,9 @@ export interface CommunityForm extends BaseEntity {
*/
communityType?: number;
cityFullName: string;
cityFullCode: string;
/**
*
*/
@ -130,7 +135,7 @@ export interface CommunityForm extends BaseEntity {
area?: number;
/**
*
*
*/
builtYear?: string;
@ -153,7 +158,6 @@ export interface CommunityForm extends BaseEntity {
*
*/
img?: string;
}
export interface CommunityQuery extends PageQuery {
@ -203,7 +207,7 @@ export interface CommunityQuery extends PageQuery {
area?: number;
/**
*
*
*/
builtYear?: string;
@ -228,7 +232,7 @@ export interface CommunityQuery extends PageQuery {
img?: string;
/**
*
*/
*
*/
params?: any;
}

View File

@ -21,7 +21,7 @@ const title = computed(() => {
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
//
formItemClass: 'col-span-2',
formItemClass: 'col-span-1',
// label px
labelWidth: 80,
//
@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
const [BasicModal, modalApi] = useVbenModal({
//
class: 'w-[550px]',
class: 'w-[60%]',
fullscreenButton: false,
onBeforeClose,
onClosed: handleClosed,

View File

@ -1,22 +1,44 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { FormSchemaGetter, VbenFormSchema } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { communityList } from '#/api/property/community';
import type {
CommunityQuery,
CommunityVO,
} from '#/api/property/community/model';
import { getPopupContainer } from '@vben/utils';
import { getDictOptions } from '#/utils/dict';
import { DictEnum } from '@vben/constants';
let arr: CommunityVO[] = [];
const communitySelect: VbenFormSchema = {
component: 'ApiSelect',
fieldName: 'communityId',
label: '社区',
componentProps: {
resultField: 'list', // 根据API返回结构调整
labelField: 'communityName',
valueField: 'id',
api: async () => {
if (!arr || arr.length == 0) {
const params: CommunityQuery = {
pageNum: 1,
pageSize: 500,
};
const res = await communityList(params);
arr = res.rows;
}
return arr;
},
},
};
export const querySchema: FormSchemaGetter = () => [
{
component: 'Input',
fieldName: 'communityName',
label: '社区',
},
communitySelect,
{
component: 'Input',
fieldName: 'buildingName',
label: '建筑名称',
},
{
component: 'Input',
fieldName: 'unitCount',
label: '单元数',
},
];
// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
@ -27,18 +49,6 @@ export const columns: VxeGridProps['columns'] = [
title: '建筑名称',
field: 'buildingName',
},
{
title: '省',
field: 'province',
},
{
title: '市',
field: 'city',
},
{
title: '区',
field: 'district',
},
{
title: '总层数',
field: 'floorCount',
@ -49,7 +59,7 @@ export const columns: VxeGridProps['columns'] = [
},
{
title: '建筑类型',
field: 'buildType',
field: 'buildTypeName',
},
{
title: '电梯数量',
@ -91,9 +101,7 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
{
label: '园区编码',
fieldName: 'communityId',
component: 'Input',
...communitySelect,
rules: 'required',
},
{
@ -102,24 +110,6 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'Input',
rules: 'required',
},
{
label: '省',
fieldName: 'province',
component: 'Input',
rules: 'required',
},
{
label: '市',
fieldName: 'city',
component: 'Input',
rules: 'required',
},
{
label: '区',
fieldName: 'district',
component: 'Input',
rules: 'required',
},
{
label: '总层数',
fieldName: 'floorCount',
@ -134,7 +124,10 @@ export const modalSchema: FormSchemaGetter = () => [
label: '建筑类型',
fieldName: 'buildType',
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.sys_build_use_type),
},
},
{
label: '电梯数量',
@ -147,8 +140,8 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'DatePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
},
},
{
@ -161,17 +154,10 @@ export const modalSchema: FormSchemaGetter = () => [
label: '经度',
fieldName: 'lon',
component: 'Input',
rules: 'required',
},
{
label: '维度',
fieldName: 'lat',
component: 'Input',
rules: 'required',
},
{
label: '排序字段',
fieldName: 'sort',
component: 'Input',
},
];

View File

@ -1,18 +1,13 @@
<script setup lang="ts">
import type { Recordable } from '@vben/types';
import { ref } from 'vue';
import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
import { getVxePopupContainer } from '@vben/utils';
import { Modal, Popconfirm, Space } from 'ant-design-vue';
import dayjs from 'dayjs';
import {
import {
useVbenVxeGrid,
vxeCheckboxChecked,
type VxeGridProps
type VxeGridProps,
} from '#/adapter/vxe-table';
import {
@ -76,7 +71,7 @@ const gridOptions: VxeGridProps = {
keyField: 'id',
},
//
id: 'property-building-index'
id: 'property-building-index',
};
const [BasicTable, tableApi] = useVbenVxeGrid({
@ -118,9 +113,14 @@ function handleMultiDelete() {
}
function handleDownloadExcel() {
commonDownloadExcel(buildingExport, '建筑数据', tableApi.formApi.form.values, {
fieldMappingTime: formOptions.fieldMappingTime,
});
commonDownloadExcel(
buildingExport,
'建筑数据',
tableApi.formApi.form.values,
{
fieldMappingTime: formOptions.fieldMappingTime,
},
);
}
</script>
@ -138,9 +138,10 @@ function handleDownloadExcel() {
<a-button
:disabled="!vxeCheckboxChecked(tableApi)"
danger
type="primary"
v-access:code="['property:building:remove']"
@click="handleMultiDelete">
type="primary"
v-access:code="['property:building:remove']"
@click="handleMultiDelete"
>
{{ $t('pages.common.delete') }}
</a-button>
<a-button

View File

@ -1,10 +1,10 @@
<script setup lang="ts">
import type {Community} from '#/api/property/community/model';
import {shallowRef} from 'vue';
import {useVbenModal} from '@vben/common-ui';
import {Descriptions, DescriptionsItem} from 'ant-design-vue';
import {communityInfo} from '#/api/property/community';
import {renderDict} from "#/utils/render";
import type { CommunityVO } from '#/api/property/community/model';
import { shallowRef } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { Descriptions, DescriptionsItem } from 'ant-design-vue';
import { communityInfo } from '#/api/property/community';
import { renderDict } from '#/utils/render';
const [BasicModal, modalApi] = useVbenModal({
onOpenChange: handleOpenChange,
@ -13,14 +13,14 @@ const [BasicModal, modalApi] = useVbenModal({
},
});
const communityDetail = shallowRef<null | Community>(null);
const communityDetail = shallowRef<null | CommunityVO>(null);
async function handleOpenChange(open: boolean) {
if (!open) {
return null;
}
modalApi.modalLoading(true);
const {id} = modalApi.getData() as { id: number | string };
const { id } = modalApi.getData() as { id: number | string };
const response = await communityInfo(id);
communityDetail.value = response;
modalApi.modalLoading(false);
@ -28,18 +28,27 @@ async function handleOpenChange(open: boolean) {
</script>
<template>
<BasicModal :footer="false" :fullscreen-button="false" title="小区管理信息" class="w-[70%]">
<Descriptions v-if="communityDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
<BasicModal
:footer="false"
:fullscreen-button="false"
title="小区管理信息"
class="w-[70%]"
>
<Descriptions
v-if="communityDetail"
size="small"
:column="2"
bordered
:labelStyle="{ width: '100px' }"
>
<DescriptionsItem label="小区名称">
{{ communityDetail.communityName }}
</DescriptionsItem>
<DescriptionsItem label="小区编码">
{{ communityDetail.communityCode }}
</DescriptionsItem>
<DescriptionsItem label="小区类型" v-if="communityDetail.communityType!=null">
<component
:is="renderDict(communityDetail.communityType,'wy_sqlx')"
/>
<DescriptionsItem
label="小区类型"
v-if="communityDetail.communityType != null"
>
<component :is="renderDict(communityDetail.communityType, 'wy_sqlx')" />
</DescriptionsItem>
<DescriptionsItem label="省">
{{ communityDetail.province }}
@ -62,12 +71,7 @@ async function handleOpenChange(open: boolean) {
<DescriptionsItem label="小图图片">
{{ communityDetail.img }}
</DescriptionsItem>
<DescriptionsItem label="组织编码">
{{ communityDetail.orgCode }}
</DescriptionsItem>
<DescriptionsItem label="修改时间">
{{ communityDetail.modifyTime }}
</DescriptionsItem>
</Descriptions>
</BasicModal>
</template>

View File

@ -3,13 +3,20 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { communityAdd, communityInfo, communityUpdate } from '#/api/property/community';
import {
communityAdd,
communityInfo,
communityUpdate,
} from '#/api/property/community';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
import { getCityAreaTreeList } from '#/api/property/cityArea';
import type { CityAreaVO } from '#/api/property/cityArea/model';
import type { CommunityForm } from '#/api/property/community/model';
const emit = defineEmits<{ reload: [] }>();
@ -21,13 +28,13 @@ const title = computed(() => {
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
//
formItemClass: 'col-span-2',
formItemClass: 'col-span-1',
// label px
labelWidth: 80,
//
componentProps: {
class: 'w-full',
}
},
},
schema: modalSchema(),
showDefaultActions: false,
@ -43,7 +50,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
const [BasicModal, modalApi] = useVbenModal({
//
class: 'w-[550px]',
class: 'w-[60%]',
fullscreenButton: false,
onBeforeClose,
onClosed: handleClosed,
@ -53,20 +60,20 @@ const [BasicModal, modalApi] = useVbenModal({
return null;
}
modalApi.modalLoading(true);
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await communityInfo(id);
await formApi.setValues(record);
}
setupDeptSelect();
await markInitialized();
modalApi.modalLoading(false);
},
});
let currentSelectNode: any = null;
async function handleConfirm() {
try {
modalApi.lock(true);
@ -75,7 +82,8 @@ async function handleConfirm() {
return;
}
// getValuesreadonly
const data = cloneDeep(await formApi.getValues());
const data: CommunityForm = cloneDeep(await formApi.getValues());
data.cityFullName = currentSelectNode.fullName;
await (isUpdate.value ? communityUpdate(data) : communityAdd(data));
resetInitialized();
emit('reload');
@ -87,6 +95,57 @@ async function handleConfirm() {
}
}
/**
* 初始化城市
*/
async function setupDeptSelect() {
const areaList = await getCityAreaTreeList();
// /
// addFullName(areaList, 'areaName', ' / ');
const splitStr = '/';
handleNode(
areaList,
'areaName',
splitStr,
function (node: any, parentNode: any) {
node.fullCode = parentNode
? parentNode.fullCode + splitStr + node.areaCode
: node.areaCode;
if (node.areaLevel != '303') {
node.disabled = true;
}
},
);
formApi.updateSchema([
{
componentProps: () => ({
class: 'w-full',
fieldNames: {
key: 'id',
label: 'areaName',
value: 'fullCode',
children: 'children',
},
getPopupContainer,
async onSelect(fullCode: any, node: CityAreaVO) {
currentSelectNode = node;
},
placeholder: '请选择城市',
showSearch: true,
treeData: areaList,
treeDefaultExpandAll: true,
treeLine: { showLeafIcon: false },
//
treeNodeFilterProp: 'areaName',
//
treeNodeLabelProp: 'fullName',
}),
fieldName: 'cityFullCode',
},
]);
}
async function handleClosed() {
await formApi.resetForm();
resetInitialized();
@ -98,4 +157,3 @@ async function handleClosed() {
<BasicForm />
</BasicModal>
</template>

View File

@ -1,15 +1,16 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { getPopupContainer } from '@vben/utils';
import { getDictOptions } from '#/utils/dict';
import { DictEnum } from '@vben/constants';
export const querySchema: FormSchemaGetter = () => [
{
component: 'Input',
fieldName: 'communityName',
label: '社区',
},
{
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_sqlx),
},
fieldName: 'communityType',
label: '社区类型',
},
@ -18,11 +19,6 @@ export const querySchema: FormSchemaGetter = () => [
fieldName: 'propertyCompany',
label: '物业公司',
},
{
component: 'Input',
fieldName: 'contactPhone',
label: '联系电话',
},
];
// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
@ -36,18 +32,11 @@ export const columns: VxeGridProps['columns'] = [
{
title: '社区类型',
field: 'communityType',
slots: { default: 'communityType' },
},
{
title: '省',
field: 'province',
},
{
title: '市',
field: 'city',
},
{
title: '区',
field: 'district',
title: '城市',
field: 'cityFullName',
},
{
title: '地址',
@ -62,11 +51,11 @@ export const columns: VxeGridProps['columns'] = [
field: 'lat',
},
{
title: '占地面积(平方米)',
title: '占地面积',
field: 'area',
},
{
title: '',
title: '建成时间',
field: 'builtYear',
},
{
@ -81,10 +70,6 @@ export const columns: VxeGridProps['columns'] = [
title: '社区描述',
field: 'description',
},
{
title: '小图图片',
field: 'img',
},
{
field: 'action',
fixed: 'right',
@ -114,10 +99,20 @@ export const modalSchema: FormSchemaGetter = () => [
label: '社区类型',
fieldName: 'communityType',
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_sqlx),
},
rules: 'selectRequired',
},
{
component: 'TreeSelect',
fieldName: 'cityFullCode',
defaultValue: undefined,
label: '城市',
rules: 'selectRequired',
},
/*{
label: '省',
fieldName: 'province',
component: 'Input',
@ -134,7 +129,7 @@ export const modalSchema: FormSchemaGetter = () => [
fieldName: 'district',
component: 'Input',
rules: 'required',
},
},*/
{
label: '地址',
fieldName: 'addr',
@ -145,27 +140,25 @@ export const modalSchema: FormSchemaGetter = () => [
label: '经度',
fieldName: 'lon',
component: 'Input',
rules: 'required',
},
{
label: '维度',
fieldName: 'lat',
component: 'Input',
rules: 'required',
},
{
label: '占地面积(平方米)',
label: '占地面积',
fieldName: 'area',
component: 'Input',
},
{
label: '',
label: '建成时间',
fieldName: 'builtYear',
component: 'DatePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
},
},
{
@ -184,8 +177,12 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'Textarea',
},
{
label: '小图图片',
label: '人像图片',
fieldName: 'img',
component: 'Input',
component: 'ImageUpload',
componentProps: {
maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
},
formItemClass: 'col-span-2',
},
];

View File

@ -6,13 +6,13 @@ import { ref } from 'vue';
import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
import { getVxePopupContainer } from '@vben/utils';
import { Modal, Popconfirm, Space } from 'ant-design-vue';
import { Modal, Popconfirm, Space, Tag } from 'ant-design-vue';
import dayjs from 'dayjs';
import {
import {
useVbenVxeGrid,
vxeCheckboxChecked,
type VxeGridProps
type VxeGridProps
} from '#/adapter/vxe-table';
import {
@ -138,8 +138,8 @@ function handleDownloadExcel() {
<a-button
:disabled="!vxeCheckboxChecked(tableApi)"
danger
type="primary"
v-access:code="['property:community:remove']"
type="primary"
v-access:code="['property:community:remove']"
@click="handleMultiDelete">
{{ $t('pages.common.delete') }}
</a-button>
@ -176,6 +176,12 @@ function handleDownloadExcel() {
</Popconfirm>
</Space>
</template>
<template #communityType="{ row }">
<Tag v-if="row.community_type == 1" color="#108ee9">园区</Tag>
<Tag v-else color="#2db7f5">小区</Tag>
</template>
</BasicTable>
<CommunityModal @reload="tableApi.query()" />
</Page>

View File

@ -1,12 +1,11 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
export const querySchema: FormSchemaGetter = () => [
{
component: 'Input',
fieldName: 'communityName',
label: '社区',
fieldName: 'floorName',
label: '楼层名称',
},
];
@ -15,21 +14,17 @@ export const querySchema: FormSchemaGetter = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '单元编码',
field: 'unitId',
},
{
title: '楼层数名称',
title: '楼层名称',
field: 'floorName',
},
{
title: '楼层号',
field: 'floorNumber',
},
{
/* {
title: '楼层类型',
field: 'floorType',
},
},*/
{
title: '房间数量',
field: 'roomCount',
@ -58,10 +53,11 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
{
label: '单元编码',
component: 'TreeSelect',
fieldName: 'unitId',
component: 'Input',
rules: 'required',
defaultValue: undefined,
label: '社区建筑',
rules: 'selectRequired',
},
{
label: '楼层数名称',
@ -75,13 +71,12 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'Input',
rules: 'required',
},
{
/*{
label: '楼层类型',
fieldName: 'floorType',
component: 'Select',
componentProps: {
},
},
componentProps: {},
},*/
{
label: '房间数量',
fieldName: 'roomCount',

View File

@ -3,13 +3,14 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { floorAdd, floorInfo, floorUpdate } from '#/api/property/floor';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
import { communityTree } from '#/api/property/community';
const emit = defineEmits<{ reload: [] }>();
@ -53,16 +54,14 @@ const [BasicModal, modalApi] = useVbenModal({
return null;
}
modalApi.modalLoading(true);
setupCommunitySelect()
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await floorInfo(id);
await formApi.setValues(record);
}
await markInitialized();
modalApi.modalLoading(false);
},
});
@ -87,6 +86,45 @@ async function handleConfirm() {
}
}
/**
* 初始化城市
*/
async function setupCommunitySelect() {
const areaList = await communityTree(3);
// /
// addFullName(areaList, 'areaName', ' / ');
const splitStr = '/';
handleNode(areaList, 'label', splitStr, function (node: any) {
if (node.level != 3) {
node.disabled = true;
}
});
formApi.updateSchema([
{
componentProps: () => ({
class: 'w-full',
fieldNames: {
key: 'id',
label: 'label',
value: 'code',
children: 'children',
},
getPopupContainer,
placeholder: '请选择建筑',
showSearch: true,
treeData: areaList,
treeDefaultExpandAll: true,
treeLine: { showLeafIcon: false },
//
treeNodeFilterProp: 'label',
//
treeNodeLabelProp: 'fullName',
}),
fieldName: 'unitId',
},
]);
}
async function handleClosed() {
await formApi.resetForm();
resetInitialized();

View File

@ -1,5 +1,8 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { getPopupContainer } from '@vben/utils';
import { getDictOptions } from '#/utils/dict';
import { DictEnum } from '@vben/constants';
export const querySchema: FormSchemaGetter = () => [
{
@ -11,15 +14,17 @@ export const querySchema: FormSchemaGetter = () => [
component: 'Input',
fieldName: 'orientation',
label: '朝向',
},
{
component: 'Input',
fieldName: 'isForSale',
label: '是否可售',
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_direction_towards),
},
},
{
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_fjzt),
},
fieldName: 'status',
label: '状态',
},
@ -29,20 +34,16 @@ export const querySchema: FormSchemaGetter = () => [
// export const columns: () => VxeGridProps['columns'] = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '所属楼层ID',
field: 'floorId',
},
{
title: '房间号',
field: 'roomNumber',
},
{
title: '房间类型',
field: 'roomType',
field: 'roomTypeName',
},
{
title: '面积(平方米)',
title: '面积',
field: 'area',
},
{
@ -51,7 +52,7 @@ export const columns: VxeGridProps['columns'] = [
},
{
title: '朝向',
field: 'orientation',
field: 'orientationName',
},
{
title: '是否可售',
@ -59,7 +60,7 @@ export const columns: VxeGridProps['columns'] = [
},
{
title: '状态',
field: 'status',
field: 'statusName',
},
{
field: 'action',
@ -81,13 +82,14 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
{
label: '所属楼层ID',
component: 'TreeSelect',
fieldName: 'floorId',
component: 'Input',
rules: 'required',
defaultValue: undefined,
label: '社区建筑',
rules: 'selectRequired',
},
{
label: '房间号(如101,202)',
label: '房间号',
fieldName: 'roomNumber',
component: 'Input',
rules: 'required',
@ -96,10 +98,13 @@ export const modalSchema: FormSchemaGetter = () => [
label: '房间类型',
fieldName: 'roomType',
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_room_type),
},
},
{
label: '面积(平方米)',
label: '面积',
fieldName: 'area',
component: 'Input',
},
@ -111,7 +116,11 @@ export const modalSchema: FormSchemaGetter = () => [
{
label: '朝向',
fieldName: 'orientation',
component: 'Input',
component: 'Select',
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_direction_towards),
},
},
{
label: '是否可售',
@ -122,6 +131,9 @@ export const modalSchema: FormSchemaGetter = () => [
label: '状态',
fieldName: 'status',
component: 'Select',
componentProps: {},
componentProps: {
getPopupContainer,
options: getDictOptions(DictEnum.wy_fjzt),
},
},
];

View File

@ -3,16 +3,13 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { roomAdd, roomInfo, roomUpdate } from '#/api/property/room';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
import { communityTree } from '#/api/property/community';
import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
const emit = defineEmits<{ reload: [] }>();
const isUpdate = ref(false);
const title = computed(() => {
return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
@ -21,7 +18,7 @@ const title = computed(() => {
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
//
formItemClass: 'col-span-2',
formItemClass: 'col-span-1',
// label px
labelWidth: 80,
//
@ -43,7 +40,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
const [BasicModal, modalApi] = useVbenModal({
//
class: 'w-[550px]',
class: 'w-[60%]',
fullscreenButton: false,
onBeforeClose,
onClosed: handleClosed,
@ -56,7 +53,7 @@ const [BasicModal, modalApi] = useVbenModal({
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
setupCommunitySelect()
if (isUpdate.value && id) {
const record = await roomInfo(id);
await formApi.setValues(record);
@ -87,6 +84,45 @@ async function handleConfirm() {
}
}
/**
* 初始化城市
*/
async function setupCommunitySelect() {
const areaList = await communityTree(4);
// /
// addFullName(areaList, 'areaName', ' / ');
const splitStr = '/';
handleNode(areaList, 'label', splitStr, function (node: any) {
if (node.level != 4) {
node.disabled = true;
}
});
formApi.updateSchema([
{
componentProps: () => ({
class: 'w-full',
fieldNames: {
key: 'id',
label: 'label',
value: 'code',
children: 'children',
},
getPopupContainer,
placeholder: '请选择建筑',
showSearch: true,
treeData: areaList,
treeDefaultExpandAll: true,
treeLine: { showLeafIcon: false },
//
treeNodeFilterProp: 'label',
//
treeNodeLabelProp: 'fullName',
}),
fieldName: 'floorId',
},
]);
}
async function handleClosed() {
await formApi.resetForm();
resetInitialized();

View File

@ -1,12 +1,11 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
export const querySchema: FormSchemaGetter = () => [
{
component: 'Input',
fieldName: 'communityName',
label: '社区',
component: 'TreeSelect',
fieldName: 'unitName',
label: '单元名称',
},
];
@ -14,10 +13,6 @@ export const querySchema: FormSchemaGetter = () => [
// export const columns: () => VxeGridProps['columns'] = () => [
export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 },
{
title: '建筑名称',
field: 'buildingId',
},
{
title: '单元名称',
field: 'unitName',
@ -54,10 +49,11 @@ export const modalSchema: FormSchemaGetter = () => [
},
},
{
label: '建筑名称',
component: 'TreeSelect',
fieldName: 'buildingId',
component: 'Input',
rules: 'required',
defaultValue: undefined,
label: '社区建筑',
rules: 'selectRequired',
},
{
label: '单元名称',

View File

@ -1,25 +1,16 @@
<script setup lang="ts">
import type { Recordable } from '@vben/types';
import { ref } from 'vue';
import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
import { getVxePopupContainer } from '@vben/utils';
import { Modal, Popconfirm, Space } from 'ant-design-vue';
import dayjs from 'dayjs';
import {
useVbenVxeGrid,
vxeCheckboxChecked,
type VxeGridProps
} from '#/adapter/vxe-table';
import {
unitExport,
unitList,
unitRemove,
} from '#/api/property/unit';
useVbenVxeGrid,
vxeCheckboxChecked,
type VxeGridProps,
} from '#/adapter/vxe-table';
import { unitExport, unitList, unitRemove } from '#/api/property/unit';
import type { UnitForm } from '#/api/property/unit/model';
import { commonDownloadExcel } from '#/utils/file/download';
@ -76,7 +67,7 @@ const gridOptions: VxeGridProps = {
keyField: 'id',
},
//
id: 'property-unit-index'
id: 'property-unit-index',
};
const [BasicTable, tableApi] = useVbenVxeGrid({
@ -138,9 +129,10 @@ function handleDownloadExcel() {
<a-button
:disabled="!vxeCheckboxChecked(tableApi)"
danger
type="primary"
v-access:code="['property:unit:remove']"
@click="handleMultiDelete">
type="primary"
v-access:code="['property:unit:remove']"
@click="handleMultiDelete"
>
{{ $t('pages.common.delete') }}
</a-button>
<a-button

View File

@ -3,13 +3,14 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep } from '@vben/utils';
import { cloneDeep, getPopupContainer, handleNode } from '@vben/utils';
import { useVbenForm } from '#/adapter/form';
import { unitAdd, unitInfo, unitUpdate } from '#/api/property/unit';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { modalSchema } from './data';
import { communityTree } from '#/api/property/community';
const emit = defineEmits<{ reload: [] }>();
@ -27,7 +28,7 @@ const [BasicForm, formApi] = useVbenForm({
//
componentProps: {
class: 'w-full',
}
},
},
schema: modalSchema(),
showDefaultActions: false,
@ -53,16 +54,14 @@ const [BasicModal, modalApi] = useVbenModal({
return null;
}
modalApi.modalLoading(true);
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await unitInfo(id);
await formApi.setValues(record);
}
setupCommunitySelect();
await markInitialized();
modalApi.modalLoading(false);
},
});
@ -87,6 +86,45 @@ async function handleConfirm() {
}
}
/**
* 初始化城市
*/
async function setupCommunitySelect() {
const areaList = await communityTree(2);
// /
// addFullName(areaList, 'areaName', ' / ');
const splitStr = '/';
handleNode(areaList, 'label', splitStr, function (node: any) {
if (node.level != 2) {
node.disabled = true;
}
});
formApi.updateSchema([
{
componentProps: () => ({
class: 'w-full',
fieldNames: {
key: 'id',
label: 'label',
value: 'code',
children: 'children',
},
getPopupContainer,
placeholder: '请选择建筑',
showSearch: true,
treeData: areaList,
treeDefaultExpandAll: true,
treeLine: { showLeafIcon: false },
//
treeNodeFilterProp: 'label',
//
treeNodeLabelProp: 'fullName',
}),
fieldName: 'buildingId',
},
]);
}
async function handleClosed() {
await formApi.resetForm();
resetInitialized();
@ -98,4 +136,3 @@ async function handleClosed() {
<BasicForm />
</BasicModal>
</template>

View File

@ -1,13 +1,9 @@
<script setup lang="ts">
import type { PropType } from 'vue';
import type { DeptTree } from '#/api/system/user/model';
import { onMounted, ref } from 'vue';
import { SyncOutlined } from '@ant-design/icons-vue';
import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
import { getDeptTree } from '#/api/system/user';
defineOptions({ inheritAttrs: false });
@ -45,9 +41,7 @@ async function loadTree() {
showTreeSkeleton.value = true;
searchValue.value = '';
selectDeptId.value = [];
const ret = await getDeptTree();
deptTreeArray.value = ret;
showTreeSkeleton.value = false;
}

View File

@ -1,76 +1,33 @@
# EXAMPLE USAGE:
#pre-commit:
# parallel: true
# commands:
# code-workspace:
# run: pnpm vsh code-workspace --auto-commit
# lint-md:
# run: pnpm prettier --cache --ignore-unknown --write {staged_files}
# glob: '*.md'
# lint-vue:
# run: pnpm prettier --write {staged_files} && pnpm eslint --cache --fix {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files}
# glob: '*.vue'
# lint-js:
# run: pnpm prettier --cache --ignore-unknown --write {staged_files} && pnpm eslint --cache --fix {staged_files}
# glob: '*.{js,jsx,ts,tsx}'
# lint-style:
# run: pnpm prettier --cache --ignore-unknown --write {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files}
# glob: '*.{scss,less,styl,html,vue,css}'
# lint-package:
# run: pnpm prettier --cache --write {staged_files}
# glob: 'package.json'
# lint-json:
# run: pnpm prettier --cache --write --parser json {staged_files}
# glob: '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}'
#
# Refer for explanation to following link:
# https://lefthook.dev/configuration/
#post-merge:
# commands:
# install:
# run: pnpm install
#
# pre-push:
# jobs:
# - name: packages audit
# tags:
# - frontend
# - security
# run: yarn audit
#
# - name: gems audit
# tags:
# - backend
# - security
# run: bundle audit
#
# pre-commit:
# parallel: true
# jobs:
# - run: yarn eslint {staged_files}
# glob: "*.{js,ts,jsx,tsx}"
#
# - name: rubocop
# glob: "*.rb"
# exclude:
# - config/application.rb
# - config/routes.rb
# run: bundle exec rubocop --force-exclusion {all_files}
#
# - name: govet
# files: git ls-files -m
# glob: "*.go"
# run: go vet {files}
#
# - script: "hello.js"
# runner: node
#
# - script: "hello.go"
# runner: go run
pre-commit:
parallel: true
commands:
code-workspace:
run: pnpm vsh code-workspace --auto-commit
lint-md:
run: pnpm prettier --cache --ignore-unknown --write {staged_files}
glob: '*.md'
lint-vue:
run: pnpm prettier --write {staged_files} && pnpm eslint --cache --fix {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files}
glob: '*.vue'
lint-js:
run: pnpm prettier --cache --ignore-unknown --write {staged_files} && pnpm eslint --cache --fix {staged_files}
glob: '*.{js,jsx,ts,tsx}'
lint-style:
run: pnpm prettier --cache --ignore-unknown --write {staged_files} && pnpm stylelint --fix --allow-empty-input {staged_files}
glob: '*.{scss,less,styl,html,vue,css}'
lint-package:
run: pnpm prettier --cache --write {staged_files}
glob: 'package.json'
lint-json:
run: pnpm prettier --cache --write --parser json {staged_files}
glob: '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}'
post-merge:
commands:
install:
run: pnpm install
commit-msg:
commands:
commitlint:
run: pnpm exec commitlint --edit $1
#commit-msg:
# commands:
# commitlint:
# run: pnpm exec commitlint --edit $1

View File

@ -15,6 +15,11 @@ export const DictEnum = {
WF_FORM_TYPE: 'wf_form_type', // 表单类型
WF_TASK_STATUS: 'wf_task_status', // 任务状态
WY_SF: 'wy_sf',
wy_sqlx: 'wy_sqlx', // 社区类型
sys_build_use_type: 'sis_build_use_type', // 建筑用途
wy_room_type: 'room_type', // 房间类型
wy_fjzt: 'wy_fjzt', // 房间状态
wy_direction_towards: 'direction_towards', // 房间朝向
SIS_ACCESS_CONTROL_DEVICE_TYPE: 'sis_access_control_device_type',
SIS_LIB_TYPE: 'sis_lib_type',

View File

@ -276,6 +276,43 @@ export function addFullName(
});
}
/**
*
* --
* @param treeData tree数据
* @param labelName
* @param splitStr
* @param callback
* @returns void
*/
export function handleNode(
treeData: any[],
labelName = 'label',
splitStr = '-',
callback: Function,
) {
function addFullNameProperty(
node: any,
parentNames: any[] = [],
parentNode: any = null,
) {
const fullNameParts = [...parentNames, node[labelName]];
node.fullName = fullNameParts.join(splitStr);
if (callback) {
callback(node, parentNode);
}
if (node.children && node.children.length > 0) {
node.children.forEach((childNode: any) => {
addFullNameProperty(childNode, fullNameParts, node);
});
}
}
treeData.forEach((item: any) => {
addFullNameProperty(item);
});
}
/**
* https://blog.csdn.net/Web_J/article/details/129281329
* nodeId ID