综合管理

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',
-    },
   }
 ];