From 87fe0eb78f2026e63dffa8bacc0158e4ed1325b1 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 19 Jun 2025 16:55:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=A5=E9=A9=BB=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/{ => resident}/person/index.ts   |   0
 .../property/{ => resident}/person/model.d.ts |   0
 .../{resident_unit => resident/unit}/index.ts |   0
 .../unit}/model.d.ts                          |   0
 .../property/{ => resident}/person/data.ts    |   0
 .../property/{ => resident}/person/index.vue  |  16 +--
 .../{ => resident}/person/person-modal.vue    |   2 +-
 .../{resident_unit => resident/unit}/data.ts  | 110 ++++++------------
 .../unit}/index.vue                           |  42 +++----
 .../unit/unit-modal.vue}                      |   6 +-
 10 files changed, 62 insertions(+), 114 deletions(-)
 rename apps/web-antd/src/api/property/{ => resident}/person/index.ts (100%)
 rename apps/web-antd/src/api/property/{ => resident}/person/model.d.ts (100%)
 rename apps/web-antd/src/api/property/{resident_unit => resident/unit}/index.ts (100%)
 rename apps/web-antd/src/api/property/{resident_unit => resident/unit}/model.d.ts (100%)
 rename apps/web-antd/src/views/property/{ => resident}/person/data.ts (100%)
 rename apps/web-antd/src/views/property/{ => resident}/person/index.vue (93%)
 rename apps/web-antd/src/views/property/{ => resident}/person/person-modal.vue (99%)
 rename apps/web-antd/src/views/property/{resident_unit => resident/unit}/data.ts (56%)
 rename apps/web-antd/src/views/property/{resident_unit => resident/unit}/index.vue (79%)
 rename apps/web-antd/src/views/property/{resident_unit/resident_unit-modal.vue => resident/unit/unit-modal.vue} (96%)

diff --git a/apps/web-antd/src/api/property/person/index.ts b/apps/web-antd/src/api/property/resident/person/index.ts
similarity index 100%
rename from apps/web-antd/src/api/property/person/index.ts
rename to apps/web-antd/src/api/property/resident/person/index.ts
diff --git a/apps/web-antd/src/api/property/person/model.d.ts b/apps/web-antd/src/api/property/resident/person/model.d.ts
similarity index 100%
rename from apps/web-antd/src/api/property/person/model.d.ts
rename to apps/web-antd/src/api/property/resident/person/model.d.ts
diff --git a/apps/web-antd/src/api/property/resident_unit/index.ts b/apps/web-antd/src/api/property/resident/unit/index.ts
similarity index 100%
rename from apps/web-antd/src/api/property/resident_unit/index.ts
rename to apps/web-antd/src/api/property/resident/unit/index.ts
diff --git a/apps/web-antd/src/api/property/resident_unit/model.d.ts b/apps/web-antd/src/api/property/resident/unit/model.d.ts
similarity index 100%
rename from apps/web-antd/src/api/property/resident_unit/model.d.ts
rename to apps/web-antd/src/api/property/resident/unit/model.d.ts
diff --git a/apps/web-antd/src/views/property/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts
similarity index 100%
rename from apps/web-antd/src/views/property/person/data.ts
rename to apps/web-antd/src/views/property/resident/person/data.ts
diff --git a/apps/web-antd/src/views/property/person/index.vue b/apps/web-antd/src/views/property/resident/person/index.vue
similarity index 93%
rename from apps/web-antd/src/views/property/person/index.vue
rename to apps/web-antd/src/views/property/resident/person/index.vue
index 0922669c..038fea7b 100644
--- a/apps/web-antd/src/views/property/person/index.vue
+++ b/apps/web-antd/src/views/property/resident/person/index.vue
@@ -1,26 +1,22 @@
 <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 {
   personExport,
   personList,
   personRemove,
-} from '#/api/property/person';
-import type { PersonForm } from '#/api/property/person/model';
+} from '#/api/property/resident/person';
+import type { PersonForm } from '#/api/property/resident/person/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import personModal from './person-modal.vue';
@@ -138,8 +134,8 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:person:remove']" 
+            type="primary"
+            v-access:code="['property:person:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
diff --git a/apps/web-antd/src/views/property/person/person-modal.vue b/apps/web-antd/src/views/property/resident/person/person-modal.vue
similarity index 99%
rename from apps/web-antd/src/views/property/person/person-modal.vue
rename to apps/web-antd/src/views/property/resident/person/person-modal.vue
index a2336964..e011117a 100644
--- a/apps/web-antd/src/views/property/person/person-modal.vue
+++ b/apps/web-antd/src/views/property/resident/person/person-modal.vue
@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { personAdd, personInfo, personUpdate } from '#/api/property/person';
+import { personAdd, personInfo, personUpdate } from '#/api/property/resident/person';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
diff --git a/apps/web-antd/src/views/property/resident_unit/data.ts b/apps/web-antd/src/views/property/resident/unit/data.ts
similarity index 56%
rename from apps/web-antd/src/views/property/resident_unit/data.ts
rename to apps/web-antd/src/views/property/resident/unit/data.ts
index 18612db3..69011abc 100644
--- a/apps/web-antd/src/views/property/resident_unit/data.ts
+++ b/apps/web-antd/src/views/property/resident/unit/data.ts
@@ -1,24 +1,14 @@
-import type { FormSchemaGetter } from '#/adapter/form';
-import type { VxeGridProps } from '#/adapter/vxe-table';
+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: 'Input',
     fieldName: 'name',
-    label: '入驻单位名称',
-  },
-  {
-    component: 'Input',
-    fieldName: 'unitNumber',
-    label: '单位编号',
-  },
-  {
-    component: 'Select',
-    componentProps: {
-    },
-    fieldName: 'type',
-    label: '企业类型',
+    label: '单位名称',
   },
   {
     component: 'Input',
@@ -26,55 +16,36 @@ export const querySchema: FormSchemaGetter = () => [
     label: '联系人',
   },
   {
-    component: 'Input',
-    fieldName: 'phone',
-    label: '联系电话',
-  },
-  {
-    component: 'Textarea',
-    fieldName: 'location',
-    label: '入驻位置',
-  },
-  {
-    component: 'DatePicker',
+    component: 'Select',
     componentProps: {
-      showTime: true,
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      options: getDictOptions('wy_state'),
     },
-    fieldName: 'time',
-    label: '入驻时间',
-  },
-  {
-    component: 'Input',
     fieldName: 'state',
     label: '状态',
   },
-  {
-    component: 'Input',
-    fieldName: 'number',
-    label: '员工人数',
-  },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
+  {type: 'checkbox', width: 60},
   {
-    title: 'id',
+    title: '序号',
     field: 'id',
-  },
-  {
-    title: '入驻单位名称',
-    field: 'name',
+    slots: {
+      default: ({ rowIndex }) => {
+        return rowIndex + 1;
+      },
+    },
   },
   {
     title: '单位编号',
     field: 'unitNumber',
   },
   {
-    title: '企业类型',
+    title: '单位名称',
+    field: 'name',
+  },
+  {
+    title: '单位类型',
     field: 'type',
   },
   {
@@ -96,19 +67,28 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '状态',
     field: 'state',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.state, 'wy_state');
+      },
+    },
   },
   {
-    title: '员工人数',
+    title: '员工数量',
     field: 'number',
   },
   {
     title: '备注',
     field: 'remark',
   },
+  {
+    title: '创建时间',
+    field: 'createTime',
+  },
   {
     field: 'action',
     fixed: 'right',
-    slots: { default: 'action' },
+    slots: {default: 'action'},
     title: '操作',
     width: 180,
   },
@@ -125,24 +105,17 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
   {
-    label: '入驻单位名称',
+    label: '单位名称',
     fieldName: 'name',
     component: 'Input',
     rules: 'required',
+
   },
   {
-    label: '单位编号',
-    fieldName: 'unitNumber',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '企业类型',
+    label: '单位类型',
     fieldName: 'type',
     component: 'Input',
-    componentProps: {
-    },
-    rules: 'selectRequired',
+    rules: 'required',
   },
   {
     label: '联系人',
@@ -159,7 +132,7 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '入驻位置',
     fieldName: 'location',
-    component: 'Textarea',
+    component: 'Input',
     rules: 'required',
   },
   {
@@ -173,21 +146,10 @@ export const modalSchema: FormSchemaGetter = () => [
     },
     rules: 'required',
   },
-  {
-    label: '状态',
-    fieldName: 'state',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '员工人数',
-    fieldName: 'number',
-    component: 'Input',
-    rules: 'required',
-  },
   {
     label: '备注',
     fieldName: 'remark',
     component: 'Textarea',
+    formItemClass: 'col-span-2'
   },
 ];
diff --git a/apps/web-antd/src/views/property/resident_unit/index.vue b/apps/web-antd/src/views/property/resident/unit/index.vue
similarity index 79%
rename from apps/web-antd/src/views/property/resident_unit/index.vue
rename to apps/web-antd/src/views/property/resident/unit/index.vue
index f58213e4..637723d9 100644
--- a/apps/web-antd/src/views/property/resident_unit/index.vue
+++ b/apps/web-antd/src/views/property/resident/unit/index.vue
@@ -1,29 +1,25 @@
 <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 {
   resident_unitExport,
   resident_unitList,
   resident_unitRemove,
-} from '#/api/property/resident_unit';
-import type { Resident_unitForm } from '#/api/property/resident_unit/model';
+} from '#/api/property/resident/unit';
+import type { Resident_unitForm } from '#/api/property/resident/unit/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
-import resident_unitModal from './resident_unit-modal.vue';
+import resident_unitModal from './unit-modal.vue';
 import { columns, querySchema } from './data';
 
 const formOptions: VbenFormProps = {
@@ -35,15 +31,6 @@ 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 = {
@@ -76,7 +63,7 @@ const gridOptions: VxeGridProps = {
     keyField: 'id',
   },
   // 表格全局唯一表示 保存列配置需要用到
-  id: 'property-resident_unit-index'
+  id: 'property-unit-index'
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
@@ -97,7 +84,10 @@ async function handleEdit(row: Required<Resident_unitForm>) {
   modalApi.setData({ id: row.id });
   modalApi.open();
 }
-
+async function handleInfo(row: Required<Resident_unitForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
 async function handleDelete(row: Required<Resident_unitForm>) {
   await resident_unitRemove(row.id);
   await tableApi.query();
@@ -130,7 +120,7 @@ function handleDownloadExcel() {
       <template #toolbar-tools>
         <Space>
           <a-button
-            v-access:code="['property:resident_unit:export']"
+            v-access:code="['property:unit:export']"
             @click="handleDownloadExcel"
           >
             {{ $t('pages.common.export') }}
@@ -138,14 +128,14 @@ function handleDownloadExcel() {
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
-            type="primary" 
-            v-access:code="['property:resident_unit:remove']" 
+            type="primary"
+            v-access:code="['property:unit:remove']"
             @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
           <a-button
             type="primary"
-            v-access:code="['property:resident_unit:add']"
+            v-access:code="['property:unit:add']"
             @click="handleAdd"
           >
             {{ $t('pages.common.add') }}
@@ -155,7 +145,7 @@ function handleDownloadExcel() {
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:resident_unit:edit']"
+            v-access:code="['property:unit:edit']"
             @click.stop="handleEdit(row)"
           >
             {{ $t('pages.common.edit') }}
@@ -168,7 +158,7 @@ function handleDownloadExcel() {
           >
             <ghost-button
               danger
-              v-access:code="['property:resident_unit:remove']"
+              v-access:code="['property:unit:remove']"
               @click.stop=""
             >
               {{ $t('pages.common.delete') }}
diff --git a/apps/web-antd/src/views/property/resident_unit/resident_unit-modal.vue b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
similarity index 96%
rename from apps/web-antd/src/views/property/resident_unit/resident_unit-modal.vue
rename to apps/web-antd/src/views/property/resident/unit/unit-modal.vue
index 3bf2dbed..ed599ac6 100644
--- a/apps/web-antd/src/views/property/resident_unit/resident_unit-modal.vue
+++ b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { resident_unitAdd, resident_unitInfo, resident_unitUpdate } from '#/api/property/resident_unit';
+import { resident_unitAdd, resident_unitInfo, resident_unitUpdate } from '#/api/property/resident/unit';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
@@ -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-[70%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,