Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/resident/person/data.ts

@@ -5,6 +5,7 @@ import { renderDict } from "#/utils/render"
 import { resident_unitList } from "#/api/property/resident/unit"
 import { authGroupList } from '#/api/sis/authGroup'
 import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model'
+import { toRaw } from 'vue'
 
 
 export const querySchema: FormSchemaGetter = () => [
@@ -151,15 +152,16 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '性别',
     fieldName: 'gender',
     component: "Select",
-    componentProps:{
+    componentProps: {
       options: getDictOptions('sys_user_sex')
     },
     rules: 'required',
   },
   {
-    label: '身份证号',
+    label: '证件号',
     fieldName: 'idCard',
     component: "Input",
+    rules: 'required',
   },
   {
     label: '邮箱',
@@ -221,11 +223,26 @@ export const modalSchema: FormSchemaGetter = () => [
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
+<<<<<<< HEAD
+=======
+    dependencies: {
+      show: (values) => {
+        return typeof (values.id) !== 'undefined'
+      },
+      triggerFields: ['id'],
+    }
+>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
   },
   {
     label: '通行权限组',
     fieldName: 'authGroupId',
     component: 'ApiSelect',
+    dependencies: {
+      show: (values) => {
+        return typeof (values.id) !== 'undefined'
+      },
+      triggerFields: ['id'],
+    },
     componentProps: {
       allowClear: true,
       resultField: 'list', // 根据API返回结构调整
@@ -244,7 +261,11 @@ export const modalSchema: FormSchemaGetter = () => [
         }
         return authGroupArr
       },
+<<<<<<< HEAD
     },
+=======
+    }
+>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
   },
   {
     label: '人脸图片',