diff --git a/src/components.d.ts b/src/components.d.ts
index 558b652..ed47866 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']

diff --git a/src/components.d.ts b/src/components.d.ts
index 558b652..ed47866 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
new file mode 100644
index 0000000..98c86df
--- /dev/null
+++ b/src/components/SelectTree/index.vue
@@ -0,0 +1,181 @@
+<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
+      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
+      TreeProps类型  {value:'id',babel:'name',children:'children'}
+      最好是 符合elementui类型的树形结构
+       -->
+<!-- 树状选择器 -->
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+
+<script lang="ts">
+import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+interface PropsIter {
+  value: string
+  label: string
+  children: string
+  disabled?: boolean
+}
+interface TreeIter {
+  id: string
+  label: string
+  children?: TreeIter[]
+}
+export default defineComponent({
+  name: 'tree select',
+  props: {
+    // 组件绑定的options
+    options: {
+      type: Array as PropType<TreeIter[]>,
+      required: true
+    },
+    // 配置选项
+    keyProps: Object as PropType<PropsIter>,
+    // 双向绑定值
+    modelValue: [String, Number],
+    // 组件样式宽
+    width: {
+      type: String,
+      default: '240px'
+    },
+    // 空占位字符
+    placeholder: String,
+    TreeProps: {
+      type: Object,
+      default: () => ({
+        value: 'id',
+        label: 'label',
+        children: 'children'
+      })
+    }
+  },
+  setup(props, { emit }) {
+    const { modelValue } = toRefs(props)
+    const select: any = reactive({
+      value: modelValue.value,
+      currentNodeKey: '',
+      currentNodeLabel: ''
+    })
+    const treeSelect = ref<HTMLElement | null>(null)
+    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
+      select.currentNodeKey = data.id
+      select.currentNodeLabel = data.label || data.name
+      select.value = data.id;
+      (treeSelect.value as any).blur()
+      emit('update:modelValue', select.value)
+    }
+    // 筛选方法
+    const treeV2: any = ref<HTMLElement | null>(null)
+    const selectFilter = (query: string) => {
+      treeV2.value.filter(query)
+    }
+    // 筛选方法
+    const treeFilter = (query: string, node: TreeNode) => {
+      return node.label?.indexOf(query) !== -1
+    }
+    // 直接清空选择数据
+    const clearSelected = () => {
+      select.currentNodeKey = ''
+      select.currentNodeLabel = ''
+      select.value = ''
+      emit('update:modelValue', undefined)
+    }
+    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
+    const setCurrent = () => {
+      select.currentNodeKey = select.value
+      treeV2.value.setCurrentKey(select.value)
+      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
+      select.currentNodeLabel = data?.label || data?.name
+    }
+    // 监听外部清空数据源 清空组件数据
+    watch(modelValue, (v) => {
+      if (v === undefined && select.currentNodeKey !== '') {
+        clearSelected()
+      }
+      // 动态赋值
+      if (v) {
+        select.value = v
+        setCurrent()
+      }
+    })
+    // 回显数据
+    onMounted(async () => {
+      await nextTick()
+      if (select.value) {
+        setCurrent()
+      }
+    })
+    const { TreeProps } = toRefs(props)
+    return {
+      treeSelect,
+      treeV2,
+      TreeProps,
+      ...toRefs(select),
+      nodeClick,
+      selectFilter,
+      treeFilter,
+      clearSelected
+    }
+  }
+})
+</script>
+
+
+<style lang="scss" scoped>
+.tree_box {
+  width: 214px;
+}
+
+.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
+  height: auto;
+  max-height: 274px;
+  padding: 0;
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: normal;
+}
+
+ul li :deep(.el-tree .el-tree-node__content) {
+  height: auto;
+  padding: 0 20px;
+}
+
+.el-tree-node__label {
+  font-weight: normal;
+}
+
+.el-tree :deep(.is-current .el-tree-node__label) {
+  color: #409eff;
+  font-weight: 700;
+}
+
+.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
+  color: #606266;
+  font-weight: normal;
+}
+
+.selectInput {
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+
+.el-select {
+  width: 100% !important;
+}
+</style>
+

diff --git a/src/components.d.ts b/src/components.d.ts
index 558b652..ed47866 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
new file mode 100644
index 0000000..98c86df
--- /dev/null
+++ b/src/components/SelectTree/index.vue
@@ -0,0 +1,181 @@
+<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
+      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
+      TreeProps类型  {value:'id',babel:'name',children:'children'}
+      最好是 符合elementui类型的树形结构
+       -->
+<!-- 树状选择器 -->
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+
+<script lang="ts">
+import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+interface PropsIter {
+  value: string
+  label: string
+  children: string
+  disabled?: boolean
+}
+interface TreeIter {
+  id: string
+  label: string
+  children?: TreeIter[]
+}
+export default defineComponent({
+  name: 'tree select',
+  props: {
+    // 组件绑定的options
+    options: {
+      type: Array as PropType<TreeIter[]>,
+      required: true
+    },
+    // 配置选项
+    keyProps: Object as PropType<PropsIter>,
+    // 双向绑定值
+    modelValue: [String, Number],
+    // 组件样式宽
+    width: {
+      type: String,
+      default: '240px'
+    },
+    // 空占位字符
+    placeholder: String,
+    TreeProps: {
+      type: Object,
+      default: () => ({
+        value: 'id',
+        label: 'label',
+        children: 'children'
+      })
+    }
+  },
+  setup(props, { emit }) {
+    const { modelValue } = toRefs(props)
+    const select: any = reactive({
+      value: modelValue.value,
+      currentNodeKey: '',
+      currentNodeLabel: ''
+    })
+    const treeSelect = ref<HTMLElement | null>(null)
+    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
+      select.currentNodeKey = data.id
+      select.currentNodeLabel = data.label || data.name
+      select.value = data.id;
+      (treeSelect.value as any).blur()
+      emit('update:modelValue', select.value)
+    }
+    // 筛选方法
+    const treeV2: any = ref<HTMLElement | null>(null)
+    const selectFilter = (query: string) => {
+      treeV2.value.filter(query)
+    }
+    // 筛选方法
+    const treeFilter = (query: string, node: TreeNode) => {
+      return node.label?.indexOf(query) !== -1
+    }
+    // 直接清空选择数据
+    const clearSelected = () => {
+      select.currentNodeKey = ''
+      select.currentNodeLabel = ''
+      select.value = ''
+      emit('update:modelValue', undefined)
+    }
+    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
+    const setCurrent = () => {
+      select.currentNodeKey = select.value
+      treeV2.value.setCurrentKey(select.value)
+      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
+      select.currentNodeLabel = data?.label || data?.name
+    }
+    // 监听外部清空数据源 清空组件数据
+    watch(modelValue, (v) => {
+      if (v === undefined && select.currentNodeKey !== '') {
+        clearSelected()
+      }
+      // 动态赋值
+      if (v) {
+        select.value = v
+        setCurrent()
+      }
+    })
+    // 回显数据
+    onMounted(async () => {
+      await nextTick()
+      if (select.value) {
+        setCurrent()
+      }
+    })
+    const { TreeProps } = toRefs(props)
+    return {
+      treeSelect,
+      treeV2,
+      TreeProps,
+      ...toRefs(select),
+      nodeClick,
+      selectFilter,
+      treeFilter,
+      clearSelected
+    }
+  }
+})
+</script>
+
+
+<style lang="scss" scoped>
+.tree_box {
+  width: 214px;
+}
+
+.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
+  height: auto;
+  max-height: 274px;
+  padding: 0;
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: normal;
+}
+
+ul li :deep(.el-tree .el-tree-node__content) {
+  height: auto;
+  padding: 0 20px;
+}
+
+.el-tree-node__label {
+  font-weight: normal;
+}
+
+.el-tree :deep(.is-current .el-tree-node__label) {
+  color: #409eff;
+  font-weight: 700;
+}
+
+.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
+  color: #606266;
+  font-weight: normal;
+}
+
+.selectInput {
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+
+.el-select {
+  width: 100% !important;
+}
+</style>
+
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
index 138823a..68bee44 100644
--- a/src/views/system/tenant/editTenant.vue
+++ b/src/views/system/tenant/editTenant.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="EditTenant">
 import { defineExpose, nextTick, onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IdeviceForm } from './tenant_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
@@ -18,7 +19,7 @@
   makeDep: '绑定组织',
 }
 // 表单内容
-let deviceForm: IdeviceForm = reactive({
+const deviceForm: Ref<IdeviceForm> = ref({
   id: '', // 主键
   tenantCode: '', // 项目编码
   tenantName: '', // 项目名称
@@ -34,7 +35,7 @@
 
 // 重置表单
 const resetForm = () => {
-  deviceForm = {
+  deviceForm.value = {
     tenantCode: '',
     tenantName: '',
     linkPerson: '',
@@ -44,17 +45,17 @@
   }
 }
 // 父子组件通信
-const initDialog = (dialogStatus: any, row = null) => {
+const initDialog = (dialogStatusValue: string, row: IdeviceForm) => {
   dialogFormVisible.value = true
-  dialogStatus.value = dialogStatus
-  if (dialogStatus === 'create') {
+  dialogStatus.value = dialogStatusValue
+  if (dialogStatus.value === 'create') {
     resetForm()
     nextTick(() => {
       dataFormRef.value.clearValidate()
     })
   }
   else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
-    deviceForm = {
+    deviceForm.value = {
       id: row.id,
       tenantCode: row.tenantCode,
       tenantName: row.tenantName,
@@ -71,7 +72,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      updateTenant(deviceForm).then((response) => {
+      updateTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -88,7 +89,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      addTenant(deviceForm).then((response) => {
+      addTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '新增成功',
@@ -114,7 +115,7 @@
 
 <template>
   <el-dialog
-    v-model:visible="dialogFormVisible"
+    v-model="dialogFormVisible"
     append-to-body
     :title="textMap[dialogStatus]"
   >

diff --git a/src/components.d.ts b/src/components.d.ts
index 558b652..ed47866 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
new file mode 100644
index 0000000..98c86df
--- /dev/null
+++ b/src/components/SelectTree/index.vue
@@ -0,0 +1,181 @@
+<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
+      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
+      TreeProps类型  {value:'id',babel:'name',children:'children'}
+      最好是 符合elementui类型的树形结构
+       -->
+<!-- 树状选择器 -->
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+
+<script lang="ts">
+import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+interface PropsIter {
+  value: string
+  label: string
+  children: string
+  disabled?: boolean
+}
+interface TreeIter {
+  id: string
+  label: string
+  children?: TreeIter[]
+}
+export default defineComponent({
+  name: 'tree select',
+  props: {
+    // 组件绑定的options
+    options: {
+      type: Array as PropType<TreeIter[]>,
+      required: true
+    },
+    // 配置选项
+    keyProps: Object as PropType<PropsIter>,
+    // 双向绑定值
+    modelValue: [String, Number],
+    // 组件样式宽
+    width: {
+      type: String,
+      default: '240px'
+    },
+    // 空占位字符
+    placeholder: String,
+    TreeProps: {
+      type: Object,
+      default: () => ({
+        value: 'id',
+        label: 'label',
+        children: 'children'
+      })
+    }
+  },
+  setup(props, { emit }) {
+    const { modelValue } = toRefs(props)
+    const select: any = reactive({
+      value: modelValue.value,
+      currentNodeKey: '',
+      currentNodeLabel: ''
+    })
+    const treeSelect = ref<HTMLElement | null>(null)
+    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
+      select.currentNodeKey = data.id
+      select.currentNodeLabel = data.label || data.name
+      select.value = data.id;
+      (treeSelect.value as any).blur()
+      emit('update:modelValue', select.value)
+    }
+    // 筛选方法
+    const treeV2: any = ref<HTMLElement | null>(null)
+    const selectFilter = (query: string) => {
+      treeV2.value.filter(query)
+    }
+    // 筛选方法
+    const treeFilter = (query: string, node: TreeNode) => {
+      return node.label?.indexOf(query) !== -1
+    }
+    // 直接清空选择数据
+    const clearSelected = () => {
+      select.currentNodeKey = ''
+      select.currentNodeLabel = ''
+      select.value = ''
+      emit('update:modelValue', undefined)
+    }
+    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
+    const setCurrent = () => {
+      select.currentNodeKey = select.value
+      treeV2.value.setCurrentKey(select.value)
+      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
+      select.currentNodeLabel = data?.label || data?.name
+    }
+    // 监听外部清空数据源 清空组件数据
+    watch(modelValue, (v) => {
+      if (v === undefined && select.currentNodeKey !== '') {
+        clearSelected()
+      }
+      // 动态赋值
+      if (v) {
+        select.value = v
+        setCurrent()
+      }
+    })
+    // 回显数据
+    onMounted(async () => {
+      await nextTick()
+      if (select.value) {
+        setCurrent()
+      }
+    })
+    const { TreeProps } = toRefs(props)
+    return {
+      treeSelect,
+      treeV2,
+      TreeProps,
+      ...toRefs(select),
+      nodeClick,
+      selectFilter,
+      treeFilter,
+      clearSelected
+    }
+  }
+})
+</script>
+
+
+<style lang="scss" scoped>
+.tree_box {
+  width: 214px;
+}
+
+.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
+  height: auto;
+  max-height: 274px;
+  padding: 0;
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: normal;
+}
+
+ul li :deep(.el-tree .el-tree-node__content) {
+  height: auto;
+  padding: 0 20px;
+}
+
+.el-tree-node__label {
+  font-weight: normal;
+}
+
+.el-tree :deep(.is-current .el-tree-node__label) {
+  color: #409eff;
+  font-weight: 700;
+}
+
+.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
+  color: #606266;
+  font-weight: normal;
+}
+
+.selectInput {
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+
+.el-select {
+  width: 100% !important;
+}
+</style>
+
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
index 138823a..68bee44 100644
--- a/src/views/system/tenant/editTenant.vue
+++ b/src/views/system/tenant/editTenant.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="EditTenant">
 import { defineExpose, nextTick, onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IdeviceForm } from './tenant_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
@@ -18,7 +19,7 @@
   makeDep: '绑定组织',
 }
 // 表单内容
-let deviceForm: IdeviceForm = reactive({
+const deviceForm: Ref<IdeviceForm> = ref({
   id: '', // 主键
   tenantCode: '', // 项目编码
   tenantName: '', // 项目名称
@@ -34,7 +35,7 @@
 
 // 重置表单
 const resetForm = () => {
-  deviceForm = {
+  deviceForm.value = {
     tenantCode: '',
     tenantName: '',
     linkPerson: '',
@@ -44,17 +45,17 @@
   }
 }
 // 父子组件通信
-const initDialog = (dialogStatus: any, row = null) => {
+const initDialog = (dialogStatusValue: string, row: IdeviceForm) => {
   dialogFormVisible.value = true
-  dialogStatus.value = dialogStatus
-  if (dialogStatus === 'create') {
+  dialogStatus.value = dialogStatusValue
+  if (dialogStatus.value === 'create') {
     resetForm()
     nextTick(() => {
       dataFormRef.value.clearValidate()
     })
   }
   else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
-    deviceForm = {
+    deviceForm.value = {
       id: row.id,
       tenantCode: row.tenantCode,
       tenantName: row.tenantName,
@@ -71,7 +72,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      updateTenant(deviceForm).then((response) => {
+      updateTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -88,7 +89,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      addTenant(deviceForm).then((response) => {
+      addTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '新增成功',
@@ -114,7 +115,7 @@
 
 <template>
   <el-dialog
-    v-model:visible="dialogFormVisible"
+    v-model="dialogFormVisible"
     append-to-body
     :title="textMap[dialogStatus]"
   >
diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue
index 9d0e751..141d7ac 100644
--- a/src/views/system/user/select.tree.vue
+++ b/src/views/system/user/select.tree.vue
@@ -72,7 +72,7 @@
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
       select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label
+      select.currentNodeLabel = data.label || data.name
       select.value = data.id;
       (treeSelect.value as any).blur()
       emit('update:modelValue', select.value)

diff --git a/src/components.d.ts b/src/components.d.ts
index 558b652..ed47866 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -28,6 +28,7 @@
     SearchArea: typeof import('./components/SearchArea/index.vue')['default']
     SearchBar: typeof import('./components/SearchBar/index.vue')['default']
     SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
+    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue
new file mode 100644
index 0000000..98c86df
--- /dev/null
+++ b/src/components/SelectTree/index.vue
@@ -0,0 +1,181 @@
+<!--  <tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构" :TreeProps="deptProps" />
+      参数:options   树形结构  例： [{value:'xxx',label:'xxx',children:[]}]
+      TreeProps类型  {value:'id',babel:'name',children:'children'}
+      最好是 符合elementui类型的树形结构
+       -->
+<!-- 树状选择器 -->
+<template>
+  <div class="tree_box" :style="width && { width: width.includes('px') ? width : width }">
+    <el-select v-model="value" clearable filterable ref="treeSelect" :placeholder="placeholder || '请选择'"
+      :filter-method="selectFilter" @clear="clearSelected">
+      <el-option :value="currentNodeKey" :label="currentNodeLabel">
+        <el-tree-v2 id="tree_v2" ref="treeV2" :data="options" :props="keyProps || TreeProps"
+          :current-node-key="currentNodeKey" default-expand-all @node-click="nodeClick" :expand-on-click-node="false"
+          :filter-method="treeFilter"></el-tree-v2>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+
+<script lang="ts">
+import { TreeNode } from 'element-plus/es/components/tree-v2/src/types'
+import { TreeNodeData } from 'element-plus/es/components/tree/src/tree.type'
+import { defineComponent, nextTick, onMounted, PropType, reactive, ref, toRefs, watch } from 'vue'
+interface PropsIter {
+  value: string
+  label: string
+  children: string
+  disabled?: boolean
+}
+interface TreeIter {
+  id: string
+  label: string
+  children?: TreeIter[]
+}
+export default defineComponent({
+  name: 'tree select',
+  props: {
+    // 组件绑定的options
+    options: {
+      type: Array as PropType<TreeIter[]>,
+      required: true
+    },
+    // 配置选项
+    keyProps: Object as PropType<PropsIter>,
+    // 双向绑定值
+    modelValue: [String, Number],
+    // 组件样式宽
+    width: {
+      type: String,
+      default: '240px'
+    },
+    // 空占位字符
+    placeholder: String,
+    TreeProps: {
+      type: Object,
+      default: () => ({
+        value: 'id',
+        label: 'label',
+        children: 'children'
+      })
+    }
+  },
+  setup(props, { emit }) {
+    const { modelValue } = toRefs(props)
+    const select: any = reactive({
+      value: modelValue.value,
+      currentNodeKey: '',
+      currentNodeLabel: ''
+    })
+    const treeSelect = ref<HTMLElement | null>(null)
+    const nodeClick = (data: TreeNodeData, node: TreeNode) => {
+      select.currentNodeKey = data.id
+      select.currentNodeLabel = data.label || data.name
+      select.value = data.id;
+      (treeSelect.value as any).blur()
+      emit('update:modelValue', select.value)
+    }
+    // 筛选方法
+    const treeV2: any = ref<HTMLElement | null>(null)
+    const selectFilter = (query: string) => {
+      treeV2.value.filter(query)
+    }
+    // 筛选方法
+    const treeFilter = (query: string, node: TreeNode) => {
+      return node.label?.indexOf(query) !== -1
+    }
+    // 直接清空选择数据
+    const clearSelected = () => {
+      select.currentNodeKey = ''
+      select.currentNodeLabel = ''
+      select.value = ''
+      emit('update:modelValue', undefined)
+    }
+    // setCurrent通过select.value 设置下拉选择tree 显示绑定的v-model值
+    const setCurrent = () => {
+      select.currentNodeKey = select.value
+      treeV2.value.setCurrentKey(select.value)
+      const data: TreeNodeData | undefined = treeV2.value.getCurrentNode(select.value)
+      select.currentNodeLabel = data?.label || data?.name
+    }
+    // 监听外部清空数据源 清空组件数据
+    watch(modelValue, (v) => {
+      if (v === undefined && select.currentNodeKey !== '') {
+        clearSelected()
+      }
+      // 动态赋值
+      if (v) {
+        select.value = v
+        setCurrent()
+      }
+    })
+    // 回显数据
+    onMounted(async () => {
+      await nextTick()
+      if (select.value) {
+        setCurrent()
+      }
+    })
+    const { TreeProps } = toRefs(props)
+    return {
+      treeSelect,
+      treeV2,
+      TreeProps,
+      ...toRefs(select),
+      nodeClick,
+      selectFilter,
+      treeFilter,
+      clearSelected
+    }
+  }
+})
+</script>
+
+
+<style lang="scss" scoped>
+.tree_box {
+  width: 214px;
+}
+
+.el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
+  height: auto;
+  max-height: 274px;
+  padding: 0;
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.el-select-dropdown__item.selected {
+  font-weight: normal;
+}
+
+ul li :deep(.el-tree .el-tree-node__content) {
+  height: auto;
+  padding: 0 20px;
+}
+
+.el-tree-node__label {
+  font-weight: normal;
+}
+
+.el-tree :deep(.is-current .el-tree-node__label) {
+  color: #409eff;
+  font-weight: 700;
+}
+
+.el-tree :deep(.is-current .el-tree-node__children .el-tree-node__label) {
+  color: #606266;
+  font-weight: normal;
+}
+
+.selectInput {
+  padding: 0 5px;
+  box-sizing: border-box;
+}
+
+.el-select {
+  width: 100% !important;
+}
+</style>
+
diff --git a/src/views/system/tenant/editTenant.vue b/src/views/system/tenant/editTenant.vue
index 138823a..68bee44 100644
--- a/src/views/system/tenant/editTenant.vue
+++ b/src/views/system/tenant/editTenant.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="EditTenant">
 import { defineExpose, nextTick, onMounted, reactive, ref } from 'vue'
+import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IdeviceForm } from './tenant_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
@@ -18,7 +19,7 @@
   makeDep: '绑定组织',
 }
 // 表单内容
-let deviceForm: IdeviceForm = reactive({
+const deviceForm: Ref<IdeviceForm> = ref({
   id: '', // 主键
   tenantCode: '', // 项目编码
   tenantName: '', // 项目名称
@@ -34,7 +35,7 @@
 
 // 重置表单
 const resetForm = () => {
-  deviceForm = {
+  deviceForm.value = {
     tenantCode: '',
     tenantName: '',
     linkPerson: '',
@@ -44,17 +45,17 @@
   }
 }
 // 父子组件通信
-const initDialog = (dialogStatus: any, row = null) => {
+const initDialog = (dialogStatusValue: string, row: IdeviceForm) => {
   dialogFormVisible.value = true
-  dialogStatus.value = dialogStatus
-  if (dialogStatus === 'create') {
+  dialogStatus.value = dialogStatusValue
+  if (dialogStatus.value === 'create') {
     resetForm()
     nextTick(() => {
       dataFormRef.value.clearValidate()
     })
   }
   else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail' || dialogStatus.value === 'makeDep') {
-    deviceForm = {
+    deviceForm.value = {
       id: row.id,
       tenantCode: row.tenantCode,
       tenantName: row.tenantName,
@@ -71,7 +72,7 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      updateTenant(deviceForm).then((response) => {
+      updateTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
@@ -88,7 +89,7 @@
 const createData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      addTenant(deviceForm).then((response) => {
+      addTenant(deviceForm.value).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '新增成功',
@@ -114,7 +115,7 @@
 
 <template>
   <el-dialog
-    v-model:visible="dialogFormVisible"
+    v-model="dialogFormVisible"
     append-to-body
     :title="textMap[dialogStatus]"
   >
diff --git a/src/views/system/user/select.tree.vue b/src/views/system/user/select.tree.vue
index 9d0e751..141d7ac 100644
--- a/src/views/system/user/select.tree.vue
+++ b/src/views/system/user/select.tree.vue
@@ -72,7 +72,7 @@
     const treeSelect = ref<HTMLElement | null>(null)
     const nodeClick = (data: TreeNodeData, node: TreeNode) => {
       select.currentNodeKey = data.id
-      select.currentNodeLabel = data.label
+      select.currentNodeLabel = data.label || data.name
       select.value = data.id;
       (treeSelect.value as any).blur()
       emit('update:modelValue', select.value)
diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue
index 10b37e6..43547ea 100644
--- a/src/views/system/user/user.add.vue
+++ b/src/views/system/user/user.add.vue
@@ -5,6 +5,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { addUser, updateUser } from '@/api/system/user'
 import { getRoleTreeList } from '@/api/system/role'
+import { getDeptTreeList } from '@/api/system/dept'
 import type { addInfo } from './user_interface'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
@@ -33,6 +34,7 @@
 })
 const emits = defineEmits(['resetData'])
 const roleTreeList = ref([])// 角色树列表数据
+const deptTreeList = ref([])
 const sexList = ref([])// 性别选项
 const textMap = reactive<{ update: string; create: string }>({
   update: '编辑用户',
@@ -87,6 +89,7 @@
     sexList.value = response.data
   })
   fetchRoleTree()
+  fetchDeptTree()
   dialogStatus.value = dialogStatusflag
   dialogFormVisible.value = true
   btnLoading.value = false
@@ -129,6 +132,14 @@
     }
   })
 }
+// 加载组织机构树形下拉
+const fetchDeptTree = () => {
+  getDeptTreeList().then((res) => {
+    if (res.data) { // 将列表转树结构
+      deptTreeList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
 // 重置表单
 const resetForm1 = () => {
   userForm.account = ''
@@ -263,8 +274,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptId">
-            <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]"
-              placeholder="请选择组织机构" />
+            <!-- <dept-select v-model="userForm.deptId" :dept-show="true" :default-expanded-keys="[userForm.roleid]"
+              placeholder="请选择组织机构" /> -->
+              <com-tree-select :options="deptTreeList" v-model="userForm.deptId" placeholder="选择组织机构"
+              :TreeProps="deptProps" />
           </el-form-item>
         </el-col>
       </el-row>