diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index a55d8ae..bc6103a 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getPostList } from '@/api/system/post'
@@ -175,12 +175,29 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -209,12 +226,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
@@ -239,7 +256,6 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <!-- <dept-select v-model="listQuery.companyId" placeholder="所在单位" /> -->
         <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index a55d8ae..bc6103a 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getPostList } from '@/api/system/post'
@@ -175,12 +175,29 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -209,12 +226,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
@@ -239,7 +256,6 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <!-- <dept-select v-model="listQuery.companyId" placeholder="所在单位" /> -->
         <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index ca6d1fd..2ea7d85 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -5,6 +5,7 @@
 import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
 import { getPostList } from '@/api/system/post'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
@@ -158,15 +159,32 @@
     usePositionList.value = res.data
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 分系统
-    systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 分系统
+  //   systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
 }
 fetchDict()
@@ -174,15 +192,23 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   listQuery.subSystemId = ''
+  // if (newVal) {
+  //   getDeptTree({ pid: newVal }).then((res) => {
+  //     deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //     systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   })
+  // }
+  // else {
+  //   deptList.value = deptListAll.value
+  //   systemList.value = systemListAll.value
+  // }
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
-    systemList.value = systemListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index a55d8ae..bc6103a 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getPostList } from '@/api/system/post'
@@ -175,12 +175,29 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -209,12 +226,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
@@ -239,7 +256,6 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <!-- <dept-select v-model="listQuery.companyId" placeholder="所在单位" /> -->
         <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index ca6d1fd..2ea7d85 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -5,6 +5,7 @@
 import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
 import { getPostList } from '@/api/system/post'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
@@ -158,15 +159,32 @@
     usePositionList.value = res.data
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 分系统
-    systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 分系统
+  //   systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
 }
 fetchDict()
@@ -174,15 +192,23 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   listQuery.subSystemId = ''
+  // if (newVal) {
+  //   getDeptTree({ pid: newVal }).then((res) => {
+  //     deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //     systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   })
+  // }
+  // else {
+  //   deptList.value = deptListAll.value
+  //   systemList.value = systemListAll.value
+  // }
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
-    systemList.value = systemListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 0800622..ddfad73 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -16,7 +16,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
-import { getUserDept, getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
@@ -36,6 +36,7 @@
   create: '新增',
   detail: '详情',
 }
+const isAdmin = ref(false)
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const companyId = ref('')
@@ -155,6 +156,7 @@
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
   limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
+  companyId: [{ required: true, message: '所在单位必选', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -165,6 +167,8 @@
 const deviceQualityList = ref<{ id: string; value: string; name: string }[]>() // 质量状况
 // 部门
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 单位companyId
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 // 设备名称
 const deviceNameList = ref<string[]>([])
 // 规格型号
@@ -263,7 +267,7 @@
   }
 })
 // 设备相关，填充数据
-watch(() => ruleForm.value, (newVal) => {
+watch(() => ruleForm.value, (newVal, oldVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
   }
@@ -320,6 +324,26 @@
   deep: true,
   immediate: true,
 })
+watch(() => ruleForm.value.companyId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  if (newVal) {
+    if (isAdmin.value) {
+      console.log(456)
+      getUserDeptSon({ companyId: newVal }).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
+        }
+      })
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -345,10 +369,29 @@
       ruleForm.value.companyId = res.data.id
       companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
-      getDeptTree({ pid: res.data.id }).then((res1) => {
-        // console.log(res1.data, '23213213')
-        deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      })
+      // getDeptTree({ pid: res.data.id }).then((res1) => {
+      //   // console.log(res1.data, '23213213')
+      //   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 (res.data.fullName === '顶级' || res.data.version === '1') {
+        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 }))
+        })
+      }
+      else {
+        isAdmin.value = false
+        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
+          }
+        })
+      }
     })
   }
   else {
@@ -378,14 +421,14 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
   }
@@ -780,7 +823,11 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
-                <el-input v-model.trim="ruleForm.companyName" disabled />
+                <!-- companyList -->
+                <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
               </el-form-item>
             </el-col>
           </el-row>

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index a55d8ae..bc6103a 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getPostList } from '@/api/system/post'
@@ -175,12 +175,29 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -209,12 +226,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
@@ -239,7 +256,6 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <!-- <dept-select v-model="listQuery.companyId" placeholder="所在单位" /> -->
         <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index ca6d1fd..2ea7d85 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -5,6 +5,7 @@
 import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
 import { getPostList } from '@/api/system/post'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
@@ -158,15 +159,32 @@
     usePositionList.value = res.data
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 分系统
-    systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 分系统
+  //   systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
 }
 fetchDict()
@@ -174,15 +192,23 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   listQuery.subSystemId = ''
+  // if (newVal) {
+  //   getDeptTree({ pid: newVal }).then((res) => {
+  //     deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //     systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   })
+  // }
+  // else {
+  //   deptList.value = deptListAll.value
+  //   systemList.value = systemListAll.value
+  // }
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
-    systemList.value = systemListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 0800622..ddfad73 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -16,7 +16,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
-import { getUserDept, getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
@@ -36,6 +36,7 @@
   create: '新增',
   detail: '详情',
 }
+const isAdmin = ref(false)
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const companyId = ref('')
@@ -155,6 +156,7 @@
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
   limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
+  companyId: [{ required: true, message: '所在单位必选', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -165,6 +167,8 @@
 const deviceQualityList = ref<{ id: string; value: string; name: string }[]>() // 质量状况
 // 部门
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 单位companyId
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 // 设备名称
 const deviceNameList = ref<string[]>([])
 // 规格型号
@@ -263,7 +267,7 @@
   }
 })
 // 设备相关，填充数据
-watch(() => ruleForm.value, (newVal) => {
+watch(() => ruleForm.value, (newVal, oldVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
   }
@@ -320,6 +324,26 @@
   deep: true,
   immediate: true,
 })
+watch(() => ruleForm.value.companyId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  if (newVal) {
+    if (isAdmin.value) {
+      console.log(456)
+      getUserDeptSon({ companyId: newVal }).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
+        }
+      })
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -345,10 +369,29 @@
       ruleForm.value.companyId = res.data.id
       companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
-      getDeptTree({ pid: res.data.id }).then((res1) => {
-        // console.log(res1.data, '23213213')
-        deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      })
+      // getDeptTree({ pid: res.data.id }).then((res1) => {
+      //   // console.log(res1.data, '23213213')
+      //   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 (res.data.fullName === '顶级' || res.data.version === '1') {
+        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 }))
+        })
+      }
+      else {
+        isAdmin.value = false
+        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
+          }
+        })
+      }
     })
   }
   else {
@@ -378,14 +421,14 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
   }
@@ -780,7 +823,11 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
-                <el-input v-model.trim="ruleForm.companyName" disabled />
+                <!-- companyList -->
+                <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9f802ce..b67b240 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,7 +8,8 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
-import { getUserList } from '@/api/system/user'
+// import { getUserDeptSon, getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -301,6 +302,7 @@
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
 // 所在单位
+const companyInfo = ref<any>({})
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
 // 部门
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
@@ -353,13 +355,33 @@
     groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
   })
   // 单位部门
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    console.log(companyList, 'companyList')
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pid !== '0' && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = JSON.parse(JSON.stringify(deptList.value))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  // // 单位
+  // companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // console.log(companyList, 'companyList')
+  // // 部门
+  // deptList.value = res.data.filter((item: any) => item.pid !== '0' && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // deptListAll.value = JSON.parse(JSON.stringify(deptList.value))
+  // })
+  // getUserDeptSon({}).then((res) => {
+  //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -383,12 +405,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptIds = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f04f197..450e70c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -91,3 +91,19 @@
     url: '/system/company',
   })
 }
+// 获取单位下部门
+export function getUserDeptSon(params: any) {
+  return request({
+    url: '/system/userDeptList',
+    params,
+    method: 'get',
+  })
+}
+// 获取admin下的单位
+export function getAdminDept(params: any) {
+  return request({
+    url: '/system/companyList',
+    params,
+    method: 'get',
+  })
+}
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index aaf7291..868d386 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -7,6 +7,8 @@
 import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { getDictByCode } from '@/api/system/dict'
+
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -43,6 +45,7 @@
   fullName: [{ required: true, message: '组织全称不可为空', trigger: ['blur', 'change'] }],
   pid: [{ required: true, message: '父组织必选', trigger: ['blur', 'change'] }],
   deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }],
+  version: [{ required: true, message: '单位分类必选', trigger: ['blur', 'change'] }],
   num: [{ required: true, message: '排序不可为空', trigger: 'blur' }, { pattern: /^\d+(\.\d+)?$/, trigger: ['blur', 'change'], message: '' }],
 })
 
@@ -121,6 +124,7 @@
 }
 
 const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+const companyClassify = ref<any[]>([])
 // 获取所有组织类型
 function getDeptType() {
   getDeptTypeList().then((res) => {
@@ -128,9 +132,15 @@
   })
 }
 getDeptType()
-
+const getDict = () => {
+  getDictByCode('eqptCompanyclassify').then((res) => {
+    companyClassify.value = res.data
+  })
+}
+getDict()
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
+  // getDict()
   dialogStatus.value = dialogstatus
   dialogVisible.value = true
   btnLoading.value = false
@@ -147,7 +157,7 @@
     formData.deptType = row.deptType
     formData.pid = row.pid
     formData.num = row.num
-    formData.version = row.version
+    formData.version = String(row.version)
     formData.tips = row.tips
   }
 }
@@ -217,6 +227,14 @@
             <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable />
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="grid-cell">
+          <el-form-item label="分类" prop="version">
+            <!-- <el-input v-model.trim="formData.tips" type="text" placeholder="非必填" clearable /> -->
+            <el-select v-model="formData.version" class="full-width-input" clearable placeholder="请选择">
+              <el-option v-for="(item, index) in companyClassify" :key="index" :label="item.name" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 6c06b8f..41ffa48 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -7,7 +7,7 @@
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import useUserStore from '@/store/modules/user'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
@@ -203,10 +203,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index 06f648c..415ef9e 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -7,7 +7,7 @@
 import { devcieOrderSelect } from '@/api/eqpt/device/info'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getPostList } from '@/api/system/post'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $props = defineProps({
   // 使用状态列表
@@ -192,10 +192,13 @@
     modelList.value = res.data.map((item: any) => item.model).sort()
   })
   // 获取当前用户所在单位
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res1) => {
-      deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
-    })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res1) => {
+  //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  //   })
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // 使用岗位
   getPostList({}).then((res) => {
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
index 023ddd9..931053c 100644
--- a/src/views/tested/MeasurementPlan/task/components/tableList.vue
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -99,6 +99,13 @@
     isUpload: false,
   },
   {
+    text: '出厂编号',
+    value: 'sampleManufactureNo',
+    required: false,
+    isBtn: false,
+    isUpload: false,
+  },
+  {
     text: '生产厂家',
     value: 'sampleManufacturer',
     required: false,
@@ -172,6 +179,7 @@
       sampleId: '',
       sampleNo: '',
       sampleName: '',
+      sampleManufactureNo: '',
       specialRequire: '',
       editable: true,
     })
@@ -231,6 +239,7 @@
           sampleNo: item.equipmentNo,
           sampleId: item.id,
           sampleName: item.equipmentName,
+          sampleManufactureNo: item.sampleManufactureNo,
           specialRequire: '',
           editable: true,
         })
@@ -250,6 +259,7 @@
         sampleNo: device.equipmentNo,
         sampleName: device.equipmentName,
         specialRequire: '',
+        sampleManufactureNo: device.sampleManufactureNo,
         editable: true,
       }
       list.value[selectRow.value] = row
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 1c31085..e45b72c 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -3,7 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { cancelTask, getListPage } from '@/api/eqpt/measurementPlan/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
@@ -188,8 +188,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).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 }))
+  // getDeptTree({ pid: '0' }).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 }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 接收状态
diff --git a/src/views/tested/dashboard/index.vue b/src/views/tested/dashboard/index.vue
index a41d456..9ab7f86 100644
--- a/src/views/tested/dashboard/index.vue
+++ b/src/views/tested/dashboard/index.vue
@@ -11,7 +11,7 @@
 import BarChartVerticalCircle from './components/BarChartVerticalCircle.vue'
 // import { delSchedule, getCalendarList } from '@/api/eqpt/dashboard/calendar'
 import { delSchedule, getBoardMessage, getCalendarList, getDeviceClassify, getDeviceStatus, getDeviceType, getMeasureDetail, getMeasureDetailTrend, inCheckInfo, inUseInfo, toCheckInfo } from '@/api/eqpt/dashboard/index'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
 import img1 from '@/assets/images/bench/在检设备.png'
 import img2 from '@/assets/images/bench/待检设备.png'
@@ -440,11 +440,14 @@
 }
 // ------------------------------------------------------------------------------------
 onMounted(async () => {
-  const user = await getUserDept()
-  companyId.value = user.data.id
-  // 获取当前用户所在单位
-  getDeptTreeList({ pid: user.data.id }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // const user = await getUserDept()
+  // companyId.value = user.data.id
+  // // 获取当前用户所在单位
+  // getDeptTreeList({ pid: user.data.id }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pid === user.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
+  // })
+  getUserDeptSon({}).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   calcBlockSize()
   selectedDate.value = dayjs().format('YYYY-MM')
diff --git a/src/views/tested/device/certificate/index.vue b/src/views/tested/device/certificate/index.vue
index a55d8ae..bc6103a 100644
--- a/src/views/tested/device/certificate/index.vue
+++ b/src/views/tested/device/certificate/index.vue
@@ -4,7 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getCertificateList } from '@/api/eqpt/device/certificate'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
-import { getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue'
 import { getPostList } from '@/api/system/post'
@@ -175,12 +175,29 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -209,12 +226,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
@@ -239,7 +256,6 @@
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <!-- <dept-select v-model="listQuery.companyId" placeholder="所在单位" /> -->
         <el-select v-model="listQuery.companyId" filterable placeholder="所在单位">
           <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
diff --git a/src/views/tested/device/group/components/list.vue b/src/views/tested/device/group/components/list.vue
index ca6d1fd..2ea7d85 100644
--- a/src/views/tested/device/group/components/list.vue
+++ b/src/views/tested/device/group/components/list.vue
@@ -5,6 +5,7 @@
 import useUserStore from '@/store/modules/user'
 import { delGroup, getGroupList } from '@/api/eqpt/device/group'
 import { getPostList } from '@/api/system/post'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptList, getDeptTree, getDeptTreeList, getDeptTreeListByPid } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
 const userStore = useUserStore()
@@ -158,15 +159,32 @@
     usePositionList.value = res.data
   })
   // 获取使用单位
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    // 分系统
-    systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  //   // 单位
+  //   companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 部门
+  //   deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   deptListAll.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   // 分系统
+  //   systemList.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   systemListAll.value = res.data.filter((item: any) => item.fullName.includes('系统')).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    // companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
 }
 fetchDict()
@@ -174,15 +192,23 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptId = ''
   listQuery.subSystemId = ''
+  // if (newVal) {
+  //   getDeptTree({ pid: newVal }).then((res) => {
+  //     deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //     systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  //   })
+  // }
+  // else {
+  //   deptList.value = deptListAll.value
+  //   systemList.value = systemListAll.value
+  // }
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pid === newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      systemList.value = res.data.filter((item: any) => item.pid !== newVal).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
-    systemList.value = systemListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 0800622..ddfad73 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -16,7 +16,7 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
-import { getUserDept, getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { equipmentLabelBind } from '@/api/reader'
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
@@ -36,6 +36,7 @@
   create: '新增',
   detail: '详情',
 }
+const isAdmin = ref(false)
 // 对话框类型：create,update
 const dialogStatus = ref('create')
 const companyId = ref('')
@@ -155,6 +156,7 @@
   directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
   limitInstruction: [{ required: true, message: '限用说明必填', trigger: ['blur', 'change'] }],
+  companyId: [{ required: true, message: '所在单位必选', trigger: ['blur', 'change'] }],
 })
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
@@ -165,6 +167,8 @@
 const deviceQualityList = ref<{ id: string; value: string; name: string }[]>() // 质量状况
 // 部门
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 单位companyId
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 // 设备名称
 const deviceNameList = ref<string[]>([])
 // 规格型号
@@ -263,7 +267,7 @@
   }
 })
 // 设备相关，填充数据
-watch(() => ruleForm.value, (newVal) => {
+watch(() => ruleForm.value, (newVal, oldVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
   }
@@ -320,6 +324,26 @@
   deep: true,
   immediate: true,
 })
+watch(() => ruleForm.value.companyId, (newVal) => {
+  if ($route.path.includes('detail') || isFrist.value) {
+    return
+  }
+  if (newVal) {
+    if (isAdmin.value) {
+      console.log(456)
+      getUserDeptSon({ companyId: newVal }).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
+        }
+      })
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -345,10 +369,29 @@
       ruleForm.value.companyId = res.data.id
       companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
-      getDeptTree({ pid: res.data.id }).then((res1) => {
-        // console.log(res1.data, '23213213')
-        deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-      })
+      // getDeptTree({ pid: res.data.id }).then((res1) => {
+      //   // console.log(res1.data, '23213213')
+      //   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 (res.data.fullName === '顶级' || res.data.version === '1') {
+        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 }))
+        })
+      }
+      else {
+        isAdmin.value = false
+        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
+          }
+        })
+      }
     })
   }
   else {
@@ -378,14 +421,14 @@
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         openSubmission()
-        fetchDept(ruleForm.value.companyId)
+        fetchDept('0')
       })
     }
   }
@@ -780,7 +823,11 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
-                <el-input v-model.trim="ruleForm.companyName" disabled />
+                <!-- companyList -->
+                <el-select v-if="isAdmin" v-model="ruleForm.companyId" filterable placeholder="所在单位" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-input v-else v-model.trim="ruleForm.companyName" :disabled="!($route.path.includes('create') && isAdmin)" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9f802ce..b67b240 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -8,7 +8,8 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
-import { getUserList } from '@/api/system/user'
+// import { getUserDeptSon, getUserList } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
@@ -301,6 +302,7 @@
 const modelList = ref<any[]>([])
 const allList = ref<any[]>([])
 // 所在单位
+const companyInfo = ref<any>({})
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
 // 部门
 const deptList = ref<{ id: string; value: string; name: string }[]>([])
@@ -353,13 +355,33 @@
     groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
   })
   // 单位部门
-  getDeptTree({ pid: '0' }).then((res) => {
-    // 单位
-    companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    console.log(companyList, 'companyList')
-    // 部门
-    deptList.value = res.data.filter((item: any) => item.pid !== '0' && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
-    deptListAll.value = JSON.parse(JSON.stringify(deptList.value))
+  // getDeptTree({ pid: '0' }).then((res) => {
+  // // 单位
+  // companyList.value = res.data.filter((item: any) => item.pid === '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // console.log(companyList, 'companyList')
+  // // 部门
+  // deptList.value = res.data.filter((item: any) => item.pid !== '0' && item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // deptListAll.value = JSON.parse(JSON.stringify(deptList.value))
+  // })
+  // getUserDeptSon({}).then((res) => {
+  //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDept().then((res) => {
+    companyInfo.value = res.data
+    if (res.data.fullName === '顶级' || res.data.version === '1') {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
   })
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -383,12 +405,12 @@
 watch(() => listQuery.companyId, (newVal) => {
   listQuery.deptIds = ''
   if (newVal) {
-    getDeptTree({ pid: newVal }).then((res) => {
-      deptList.value = res.data.filter((item: any) => item.pids.split(',').length === 3).map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    getUserDeptSon({ companyId: newVal }).then((res) => {
+      deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
     })
   }
   else {
-    deptList.value = deptListAll.value
+    deptList.value = []
   }
 }, {
   deep: true,
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index d04e3c9..69f8764 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -9,7 +9,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { getTaskList } from '@/api/eqpt/device/task'
-import { getUserDept } from '@/api/system/user'
+import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
 const { proxy } = getCurrentInstance() as any
@@ -282,8 +282,11 @@
   })
   // 获取当前用户所在单位
   // getUserDept().then((res) => {
-  getDeptTree({ pid: '0' }).then((res1) => {
-    deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // getDeptTree({ pid: '0' }).then((res1) => {
+  //   deptList.value = res1.data.filter((item: any) => item.pids.split(',').length === 3 && item.pid !== '0').map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // })
+  getUserDeptSon({ }).then((res) => {
+    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   })
   // })
   // 使用岗位