diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />
diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue
index efbac4a..082e261 100644
--- a/src/views/system/user/selecTree.vue
+++ b/src/views/system/user/selecTree.vue
@@ -141,7 +141,7 @@
 
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   height: auto;
-  max-height: 274px;
+  // max-height: 274px;/
   padding: 0;
   overflow: hidden;
   overflow-y: auto;

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />
diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue
index efbac4a..082e261 100644
--- a/src/views/system/user/selecTree.vue
+++ b/src/views/system/user/selecTree.vue
@@ -141,7 +141,7 @@
 
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   height: auto;
-  max-height: 274px;
+  // max-height: 274px;/
   padding: 0;
   overflow: hidden;
   overflow-y: auto;
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 7722110..5df8a88 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -372,15 +372,17 @@
   immediate: true,
 })
 watch(() => ruleForm.value.companyId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
-  }
+  // if ($route.path.includes('detail')) {
+  //   return
+  // }
   if (newVal) {
     if (isAdmin.value) {
+      ruleForm.value.deptId = ''
       getUserDeptSon({ companyId: newVal }).then((res) => {
-        // console.log(res.data, '11111')
+        console.log(res.data, '管理员部门')
         deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         if (deptList.value.length === 1) {
+          // if (isFrist.value) { return }
           ruleForm.value.deptId = deptList.value[0].id
         }
       })
@@ -404,22 +406,32 @@
   ruleFormRef.value?.resetFields()
   const fetchDept = () => {
     getUserDept().then((res) => {
-      ruleForm.value.companyId = res.data.id
-      companyId.value = res.data.id
-      ruleForm.value.companyName = res.data.fullName
       if (res.data.fullName === '顶级' || res.data.version === '1') {
-        ruleForm.value.companyId = ''
-        ruleForm.value.companyName = ''
+        // if ($route.params.type === 'create') {
+        //   ruleForm.value.companyId = ''
+        //   ruleForm.value.companyName = ''
+        // }
         isAdmin.value = true
         getAdminDept({}).then((res) => {
-          console.log(res.data, '管理员')
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         })
+        getUserDeptSon({ companyId: ruleForm.value.companyId }).then((res) => {
+          // console.log(res.data, '管理员部门')
+          deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+          if (deptList.value.length === 1) {
+            if (isFrist.value) { return }
+            ruleForm.value.deptId = deptList.value[0].id
+          }
+        })
       }
       else {
         isAdmin.value = false
+        if ($route.params.type === 'update') {
+          ruleForm.value.companyId = res.data.id
+          companyId.value = res.data.id
+          ruleForm.value.companyName = res.data.fullName
+        }
         getUserDeptSon({ companyId: res.data.id }).then((res) => {
-        // console.log(res.data, '11111')
           deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
           if (deptList.value.length === 1) {
             ruleForm.value.deptId = deptList.value[0].id
@@ -448,11 +460,6 @@
         isFrist.value = false
       }, 2000)
     }
-    // const fetchDept = (pid: string) => {
-    //   getDeptTree({ pid }).then((res1) => {
-    //     deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    //   })
-    // }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
@@ -466,7 +473,6 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
@@ -474,7 +480,6 @@
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />
diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue
index efbac4a..082e261 100644
--- a/src/views/system/user/selecTree.vue
+++ b/src/views/system/user/selecTree.vue
@@ -141,7 +141,7 @@
 
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   height: auto;
-  max-height: 274px;
+  // max-height: 274px;/
   padding: 0;
   overflow: hidden;
   overflow-y: auto;
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 7722110..5df8a88 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -372,15 +372,17 @@
   immediate: true,
 })
 watch(() => ruleForm.value.companyId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
-  }
+  // if ($route.path.includes('detail')) {
+  //   return
+  // }
   if (newVal) {
     if (isAdmin.value) {
+      ruleForm.value.deptId = ''
       getUserDeptSon({ companyId: newVal }).then((res) => {
-        // console.log(res.data, '11111')
+        console.log(res.data, '管理员部门')
         deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         if (deptList.value.length === 1) {
+          // if (isFrist.value) { return }
           ruleForm.value.deptId = deptList.value[0].id
         }
       })
@@ -404,22 +406,32 @@
   ruleFormRef.value?.resetFields()
   const fetchDept = () => {
     getUserDept().then((res) => {
-      ruleForm.value.companyId = res.data.id
-      companyId.value = res.data.id
-      ruleForm.value.companyName = res.data.fullName
       if (res.data.fullName === '顶级' || res.data.version === '1') {
-        ruleForm.value.companyId = ''
-        ruleForm.value.companyName = ''
+        // if ($route.params.type === 'create') {
+        //   ruleForm.value.companyId = ''
+        //   ruleForm.value.companyName = ''
+        // }
         isAdmin.value = true
         getAdminDept({}).then((res) => {
-          console.log(res.data, '管理员')
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         })
+        getUserDeptSon({ companyId: ruleForm.value.companyId }).then((res) => {
+          // console.log(res.data, '管理员部门')
+          deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+          if (deptList.value.length === 1) {
+            if (isFrist.value) { return }
+            ruleForm.value.deptId = deptList.value[0].id
+          }
+        })
       }
       else {
         isAdmin.value = false
+        if ($route.params.type === 'update') {
+          ruleForm.value.companyId = res.data.id
+          companyId.value = res.data.id
+          ruleForm.value.companyName = res.data.fullName
+        }
         getUserDeptSon({ companyId: res.data.id }).then((res) => {
-        // console.log(res.data, '11111')
           deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
           if (deptList.value.length === 1) {
             ruleForm.value.deptId = deptList.value[0].id
@@ -448,11 +460,6 @@
         isFrist.value = false
       }, 2000)
     }
-    // const fetchDept = (pid: string) => {
-    //   getDeptTree({ pid }).then((res1) => {
-    //     deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    //   })
-    // }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
@@ -466,7 +473,6 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
@@ -474,7 +480,6 @@
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 01bc5ec..940191a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -711,7 +711,12 @@
         ElMessage.success(response.message)
       }
       else {
-        ElMessage.warning(response.message)
+        ElMessage({
+          message: response.message,
+          type: 'warning',
+          duration: 0,
+          showClose: true,
+        })
       }
     }).catch(() => {
       fileRef.value.value = ''

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />
diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue
index efbac4a..082e261 100644
--- a/src/views/system/user/selecTree.vue
+++ b/src/views/system/user/selecTree.vue
@@ -141,7 +141,7 @@
 
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   height: auto;
-  max-height: 274px;
+  // max-height: 274px;/
   padding: 0;
   overflow: hidden;
   overflow-y: auto;
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 7722110..5df8a88 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -372,15 +372,17 @@
   immediate: true,
 })
 watch(() => ruleForm.value.companyId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
-  }
+  // if ($route.path.includes('detail')) {
+  //   return
+  // }
   if (newVal) {
     if (isAdmin.value) {
+      ruleForm.value.deptId = ''
       getUserDeptSon({ companyId: newVal }).then((res) => {
-        // console.log(res.data, '11111')
+        console.log(res.data, '管理员部门')
         deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         if (deptList.value.length === 1) {
+          // if (isFrist.value) { return }
           ruleForm.value.deptId = deptList.value[0].id
         }
       })
@@ -404,22 +406,32 @@
   ruleFormRef.value?.resetFields()
   const fetchDept = () => {
     getUserDept().then((res) => {
-      ruleForm.value.companyId = res.data.id
-      companyId.value = res.data.id
-      ruleForm.value.companyName = res.data.fullName
       if (res.data.fullName === '顶级' || res.data.version === '1') {
-        ruleForm.value.companyId = ''
-        ruleForm.value.companyName = ''
+        // if ($route.params.type === 'create') {
+        //   ruleForm.value.companyId = ''
+        //   ruleForm.value.companyName = ''
+        // }
         isAdmin.value = true
         getAdminDept({}).then((res) => {
-          console.log(res.data, '管理员')
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         })
+        getUserDeptSon({ companyId: ruleForm.value.companyId }).then((res) => {
+          // console.log(res.data, '管理员部门')
+          deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+          if (deptList.value.length === 1) {
+            if (isFrist.value) { return }
+            ruleForm.value.deptId = deptList.value[0].id
+          }
+        })
       }
       else {
         isAdmin.value = false
+        if ($route.params.type === 'update') {
+          ruleForm.value.companyId = res.data.id
+          companyId.value = res.data.id
+          ruleForm.value.companyName = res.data.fullName
+        }
         getUserDeptSon({ companyId: res.data.id }).then((res) => {
-        // console.log(res.data, '11111')
           deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
           if (deptList.value.length === 1) {
             ruleForm.value.deptId = deptList.value[0].id
@@ -448,11 +460,6 @@
         isFrist.value = false
       }, 2000)
     }
-    // const fetchDept = (pid: string) => {
-    //   getDeptTree({ pid }).then((res1) => {
-    //     deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    //   })
-    // }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
@@ -466,7 +473,6 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
@@ -474,7 +480,6 @@
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 01bc5ec..940191a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -711,7 +711,12 @@
         ElMessage.success(response.message)
       }
       else {
-        ElMessage.warning(response.message)
+        ElMessage({
+          message: response.message,
+          type: 'warning',
+          duration: 0,
+          showClose: true,
+        })
       }
     }).catch(() => {
       fileRef.value.value = ''
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 3d3357d..7731a64 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -298,7 +298,13 @@
         reset()
       }
       else {
-        ElMessage.warning(response.message)
+        // ElMessage.warning(response.message)
+        ElMessage({
+          message: response.message,
+          type: 'warning',
+          duration: 0,
+          showClose: true,
+        })
       }
     }).catch(() => {
       fileRef.value.value = ''

diff --git a/public/config/config.json b/public/config/config.json
index 32d78df..187a5bc 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"计量业务系统",
-  "versionByEqpt":"1.2.0.7",
+  "versionByEqpt":"1.2.0.9",
   "baseUrl": "http://111.198.10.15:21611",
   "baseUrlBusiness": "http://111.198.10.15:21606",
   "baseUrlLaboratory": "http://111.198.10.15:21610",
diff --git a/src/views/system/installation/editDialog.vue b/src/views/system/installation/editDialog.vue
index 15b8051..8ced2c7 100644
--- a/src/views/system/installation/editDialog.vue
+++ b/src/views/system/installation/editDialog.vue
@@ -6,6 +6,8 @@
 import { getPostList } from '@/api/system/post'
 import { addLocation, updateLocation } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -122,6 +124,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -130,7 +140,16 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+             -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/installation/list.vue b/src/views/system/installation/list.vue
index 55c49e5..384fb27 100644
--- a/src/views/system/installation/list.vue
+++ b/src/views/system/installation/list.vue
@@ -7,6 +7,8 @@
 import { delLocation, getLocationListPage } from '@/api/system/installation'
 import type { IPostList } from '@/views/system/post/post-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   installLocation: '',
   positionId: '',
@@ -109,6 +111,14 @@
   })
 }
 fetchPost()
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -119,7 +129,15 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.positionId" placeholder="岗位名称" filterable clearablestyle="width: 100%;">
diff --git a/src/views/system/post/editDialog.vue b/src/views/system/post/editDialog.vue
index c10017a..cb9f3b9 100644
--- a/src/views/system/post/editDialog.vue
+++ b/src/views/system/post/editDialog.vue
@@ -4,6 +4,9 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IRuleForm } from './post-interface'
 import { addPost, updatePost } from '@/api/system/post'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -110,6 +113,19 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    console.log(data, 'data')
+    deptList.value = toTreeList(data)
+    console.log(deptList.value, 'truee')
+  })
+}
+fetchDict()
+// const deptProps = reactive({
+//   parent: 'pid', value: 'id', label: 'name', children: 'children',
+// })
 </script>
 
 <template>
@@ -118,7 +134,19 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="所在组织" prop="subSystemId">
-            <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+            <!-- <dept-select v-model="areaForm.subSystemId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" /> -->
+            <!-- <com-tree-select
+              v-model="areaForm.subSystemId" :options="deptList" placeholder="所在单位/部门/分系统"
+              :tree-props="deptProps" style="width: 100%;"
+            /> -->
+            <el-tree-select
+              v-model="areaForm.subSystemId"
+              :data="deptList"
+              check-strictly
+              :render-after-expand="false"
+              placeholder="所在单位/部门/分系统"
+              style="width: 100%;"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/system/post/list.vue b/src/views/system/post/list.vue
index 5a73ed6..d7e8457 100644
--- a/src/views/system/post/list.vue
+++ b/src/views/system/post/list.vue
@@ -6,6 +6,8 @@
 import { delPost, getPostListPage } from '@/api/system/post'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptList, getDeptTree } from '@/api/system/dept'
+import { judgeTree, toTreeList } from '@/utils/structure'
 const listQuery = reactive<IlistQuery>({
   searchId: '',
   positionName: '',
@@ -98,6 +100,14 @@
   //     loading.close()
   //   })
 }
+const deptList = ref<any[]>([])
+const fetchDict = () => {
+  getDeptList({}).then((res) => {
+    const data = res.data.list.filter((item: any) => item.fullName !== '顶级').map((item: any) => ({ ...item, label: item.fullName, value: item.id }))
+    deptList.value = toTreeList(data)
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -108,7 +118,16 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+        <!-- <dept-select v-model="listQuery.searchId" :need-top="false" placeholder="所在单位/部门/分系统" style="width: 100%;" />
+         -->
+        <el-tree-select
+          v-model="listQuery.searchId"
+          :data="deptList"
+          check-strictly
+          :render-after-expand="false"
+          placeholder="所在单位/部门/分系统"
+          style="width: 100%;"
+        />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.positionName" placeholder="岗位名称" clearable class="w-50 m-2" />
diff --git a/src/views/system/user/selecTree.vue b/src/views/system/user/selecTree.vue
index efbac4a..082e261 100644
--- a/src/views/system/user/selecTree.vue
+++ b/src/views/system/user/selecTree.vue
@@ -141,7 +141,7 @@
 
 .el-scrollbar .el-scrollbar__view .el-select-dropdown__item {
   height: auto;
-  max-height: 274px;
+  // max-height: 274px;/
   padding: 0;
   overflow: hidden;
   overflow-y: auto;
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 7722110..5df8a88 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -372,15 +372,17 @@
   immediate: true,
 })
 watch(() => ruleForm.value.companyId, (newVal) => {
-  if ($route.path.includes('detail') || isFrist.value) {
-    return
-  }
+  // if ($route.path.includes('detail')) {
+  //   return
+  // }
   if (newVal) {
     if (isAdmin.value) {
+      ruleForm.value.deptId = ''
       getUserDeptSon({ companyId: newVal }).then((res) => {
-        // console.log(res.data, '11111')
+        console.log(res.data, '管理员部门')
         deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         if (deptList.value.length === 1) {
+          // if (isFrist.value) { return }
           ruleForm.value.deptId = deptList.value[0].id
         }
       })
@@ -404,22 +406,32 @@
   ruleFormRef.value?.resetFields()
   const fetchDept = () => {
     getUserDept().then((res) => {
-      ruleForm.value.companyId = res.data.id
-      companyId.value = res.data.id
-      ruleForm.value.companyName = res.data.fullName
       if (res.data.fullName === '顶级' || res.data.version === '1') {
-        ruleForm.value.companyId = ''
-        ruleForm.value.companyName = ''
+        // if ($route.params.type === 'create') {
+        //   ruleForm.value.companyId = ''
+        //   ruleForm.value.companyName = ''
+        // }
         isAdmin.value = true
         getAdminDept({}).then((res) => {
-          console.log(res.data, '管理员')
           companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
         })
+        getUserDeptSon({ companyId: ruleForm.value.companyId }).then((res) => {
+          // console.log(res.data, '管理员部门')
+          deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+          if (deptList.value.length === 1) {
+            if (isFrist.value) { return }
+            ruleForm.value.deptId = deptList.value[0].id
+          }
+        })
       }
       else {
         isAdmin.value = false
+        if ($route.params.type === 'update') {
+          ruleForm.value.companyId = res.data.id
+          companyId.value = res.data.id
+          ruleForm.value.companyName = res.data.fullName
+        }
         getUserDeptSon({ companyId: res.data.id }).then((res) => {
-        // console.log(res.data, '11111')
           deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
           if (deptList.value.length === 1) {
             ruleForm.value.deptId = deptList.value[0].id
@@ -448,11 +460,6 @@
         isFrist.value = false
       }, 2000)
     }
-    // const fetchDept = (pid: string) => {
-    //   getDeptTree({ pid }).then((res1) => {
-    //     deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    //   })
-    // }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
@@ -466,7 +473,6 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
@@ -474,7 +480,6 @@
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        // fetchDept('0')
         fetchDept()
       })
     }
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 01bc5ec..940191a 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -711,7 +711,12 @@
         ElMessage.success(response.message)
       }
       else {
-        ElMessage.warning(response.message)
+        ElMessage({
+          message: response.message,
+          type: 'warning',
+          duration: 0,
+          showClose: true,
+        })
       }
     }).catch(() => {
       fileRef.value.value = ''
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 3d3357d..7731a64 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -298,7 +298,13 @@
         reset()
       }
       else {
-        ElMessage.warning(response.message)
+        // ElMessage.warning(response.message)
+        ElMessage({
+          message: response.message,
+          type: 'warning',
+          duration: 0,
+          showClose: true,
+        })
       }
     }).catch(() => {
       fileRef.value.value = ''
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 39eff94..2e1933d 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -284,6 +284,12 @@
       else {
         fileRef.value.value = ''
         // ElMessage.error(res.message)
+        // ElMessage({
+        //   message: res.message,
+        //   type: 'warning',
+        //   duration: 0,
+        //   showClose: true,
+        // })
         loading.close()
       }
     }).catch(() => {