综合管理

2025-06-27 15:16:06 +08:00
parent ca24234e57
commit 01ddd1174a
20 changed files with 139 additions and 318 deletions
--- a/apps/web-antd/src/views/property/building/building-detail.vue
+++ b/apps/web-antd/src/views/property/building/building-detail.vue
@@ -14,7 +14,6 @@ const [BasicModal, modalApi] = useVbenModal({
 });

 const buildingDetail = shallowRef<null | Building>(null);
-
 async function handleOpenChange(open: boolean) {
  if (!open) {
    return null;
@@ -22,7 +21,6 @@ async function handleOpenChange(open: boolean) {
  modalApi.modalLoading(true);
  const {id} = modalApi.getData() as { id: number | string };
  const response = await buildingInfo(id);
-  // 赋值
  buildingDetail.value = response;
  modalApi.modalLoading(false);
 }
@@ -31,15 +29,15 @@ async function handleOpenChange(open: boolean) {
 <template>
  <BasicModal :footer="false" :fullscreen-button="false" title="建筑管理信息" class="w-[70%]">
    <Descriptions v-if="buildingDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
-      <DescriptionsItem label="园区编码">
+      <DescriptionsItem label="小区/园区">
        {{ buildingDetail.communityCode }}
      </DescriptionsItem>
-      <DescriptionsItem label="建筑编码">
-        {{ buildingDetail.buildingCode }}
-      </DescriptionsItem>
      <DescriptionsItem label="建筑名称">
        {{ buildingDetail.buildingName }}
      </DescriptionsItem>
+      <DescriptionsItem label="建筑编码">
+        {{ buildingDetail.buildingCode }}
+      </DescriptionsItem>
      <DescriptionsItem label="省">
        {{ buildingDetail.province }}
      </DescriptionsItem>
@@ -96,11 +94,6 @@ async function handleOpenChange(open: boolean) {
      <DescriptionsItem label="组织编码">
        {{ buildingDetail.orgCode }}
      </DescriptionsItem>
-      <DescriptionsItem label="数据状态" v-if="buildingDetail.dataState!=null">
-        <component
-          :is="renderDict(buildingDetail.dataState,'wy_qylx')"
-        />
-      </DescriptionsItem>
      <DescriptionsItem label="修改时间">
        {{ buildingDetail.modifyTime }}
      </DescriptionsItem>
--- a/apps/web-antd/src/views/property/building/building-modal.vue
+++ b/apps/web-antd/src/views/property/building/building-modal.vue
@@ -1,30 +1,24 @@
 <script setup lang="ts">
 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 { buildingAdd, buildingInfo, buildingUpdate } from '#/api/property/building';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';

 const emit = defineEmits<{ reload: [] }>();
-
 const isUpdate = ref(false);
+
 const title = computed(() => {
  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });

 const [BasicForm, formApi] = useVbenForm({
  commonConfig: {
-    // 默认占满两列
    formItemClass: 'col-span-2',
-    // 默认label宽度 px
    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
    componentProps: {
      class: 'w-full',
    }
@@ -42,7 +36,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );

 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
  class: 'w-[550px]',
  fullscreenButton: false,
  onBeforeClose,
@@ -53,16 +46,13 @@ 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 buildingInfo(id);
      await formApi.setValues(record);
    }
    await markInitialized();
-
    modalApi.modalLoading(false);
  },
 });
@@ -74,7 +64,6 @@ async function handleConfirm() {
    if (!valid) {
      return;
    }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
    const data = cloneDeep(await formApi.getValues());
    await (isUpdate.value ? buildingUpdate(data) : buildingAdd(data));
    resetInitialized();
--- a/apps/web-antd/src/views/property/building/data.ts
+++ b/apps/web-antd/src/views/property/building/data.ts
@@ -1,6 +1,5 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';

@@ -8,46 +7,42 @@ export const querySchema: FormSchemaGetter = () => [
  {
    component: 'Input',
    fieldName: 'communityCode',
-    label: '园区编码',
-  },
-  {
-    component: 'Input',
-    fieldName: 'buildingCode',
-    label: '建筑编码',
+    label: '小区/园区',
  },
  {
    component: 'Input',
    fieldName: 'buildingName',
    label: '建筑名称',
  },
+  {
+    component: 'Input',
+    fieldName: 'buildingCode',
+    label: '建筑编码',
+  },
  {
    component: 'Select',
    componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
      options: getDictOptions('wy_cqxz'),
    },
    fieldName: 'cqxz',
    label: '产权性质',
  },
-  {
-    component: 'Input',
-    fieldName: 'dataState',
-    label: '数据状态',
-  }
 ];

-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
  { type: 'checkbox', width: 60 },
  {
-    title: '园区编码',
-    field: 'communityCode',
-    width: 'auto'
+    title: '序号',
+    field: 'id',
+    slots: {
+      default: ({ rowIndex }) => {
+        return (rowIndex + 1).toString();
+      },
+    },
  },
  {
-    title: '建筑编码',
-    field: 'buildingCode',
+    title: '小区/园区',
+    field: 'communityCode',
    width: 'auto'
  },
  {
@@ -55,6 +50,11 @@ export const columns: VxeGridProps['columns'] = [
    field: 'buildingName',
    width: 'auto'
  },
+  {
+    title: '建筑编码',
+    field: 'buildingCode',
+    width: 'auto'
+  },
  {
    title: '地址',
    field: 'addr',
@@ -66,7 +66,6 @@ export const columns: VxeGridProps['columns'] = [
    width: 'auto',
    slots: {
      default: ({ row }) => {
-        // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
        return renderDict(row.cqxz, 'wy_cqxz');
      },
    },
@@ -121,11 +120,6 @@ export const columns: VxeGridProps['columns'] = [
    field: 'bzcg',
    width: 'auto'
  },
-  {
-    title: '数据状态',
-    field: 'dataState',
-    width: 'auto'
-  },
  {
    title: '修改时间',
    field: 'modifyTime',
@@ -151,17 +145,11 @@ export const modalSchema: FormSchemaGetter = () => [
    },
  },
  {
-    label: '园区编码',
+    label: '小区/园区',
    fieldName: 'communityCode',
    component: 'Input',
    rules: 'required',
  },
-  {
-    label: '建筑编码',
-    fieldName: 'buildingCode',
-    component: 'Input',
-    rules: 'required',
-  },
  {
    label: '建筑名称',
    fieldName: 'buildingName',
@@ -169,8 +157,8 @@ export const modalSchema: FormSchemaGetter = () => [
    rules: 'required',
  },
  {
-    label: '组织编码',
-    fieldName: 'orgCode',
+    label: '建筑编码',
+    fieldName: 'buildingCode',
    component: 'Input',
    rules: 'required',
  },
@@ -215,7 +203,6 @@ export const modalSchema: FormSchemaGetter = () => [
    fieldName: 'cqxz',
    component: 'Select',
    componentProps: {
-      // 可选从DictEnum中获取 DictEnum.WY_CQXZ 便于维护
      options: getDictOptions('wy_cqxz'),
    },
    rules: 'selectRequired',
@@ -233,7 +220,7 @@ export const modalSchema: FormSchemaGetter = () => [
    rules: 'required',
  },
  {
-    label: '图地编号',
+    label: '土地编号',
    fieldName: 'tdbh',
    component: 'Input',
    rules: 'required',
@@ -284,20 +271,5 @@ export const modalSchema: FormSchemaGetter = () => [
    label: '排序字段',
    fieldName: 'sort',
    component: 'Input',
-  },
-  {
-    label: '数据状态',
-    fieldName: 'dataState',
-    component: 'Input',
-  },
-  {
-    label: '修改时间',
-    fieldName: 'modifyTime',
-    component: 'DatePicker',
-    componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-    },
  }
 ];
--- a/apps/web-antd/src/views/property/building/index.vue
+++ b/apps/web-antd/src/views/property/building/index.vue
@@ -2,13 +2,11 @@
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
 import {
  useVbenVxeGrid,
  vxeCheckboxChecked,
  type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
  buildingExport,
  buildingList,
@@ -16,12 +14,9 @@ import {
 } from '#/api/property/building';
 import type { BuildingForm } from '#/api/property/building/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
 import buildingModal from './building-modal.vue';
 import buildingDetail from './building-detail.vue';
 import { columns, querySchema } from './data';
-import unitInfoModal from "#/views/property/resident/unit/unit-detail.vue";
-import type {Resident_unitForm} from "#/api/property/resident/unit/model";

 const formOptions: VbenFormProps = {
  commonConfig: {
@@ -32,28 +27,13 @@ const formOptions: VbenFormProps = {
  },
  schema: querySchema(),
  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };

 const gridOptions: VxeGridProps = {
  checkboxConfig: {
-    // 高亮
    highlight: true,
-    // 翻页时保留选中状态
    reserve: true,
-    // 点击行选中
-    // trigger: 'row',
  },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
  columns,
  height: 'auto',
  keepSource: true,
@@ -72,7 +52,6 @@ const gridOptions: VxeGridProps = {
  rowConfig: {
    keyField: 'id',
  },
-  // 表格全局唯一表示 保存列配置需要用到
  id: 'property-building-index'
 };

@@ -84,13 +63,16 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
 const [BuildingModal, modalApi] = useVbenModal({
  connectedComponent: buildingModal,
 });
+
 const [buildingDetailModal, buildingDetailApi] = useVbenModal({
  connectedComponent: buildingDetail,
 });
+
 async function handleInfo(row: Required<BuildingForm>) {
-  // buildingDetailApi.setData({ id: row.id });
+  buildingDetailApi.setData({ id: row.id });
  buildingDetailApi.open();
 }
+
 function handleAdd() {
  modalApi.setData({});
  modalApi.open();
@@ -153,12 +135,6 @@ function handleDownloadExcel() {
          >
            {{ $t('pages.common.add') }}
          </a-button>
-          <a-button
-            type="primary"
-            @click="handleInfo"
-          >
-            {{ $t('pages.common.info') }}
-          </a-button>
        </Space>
      </template>
      <template #action="{ row }">