diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6eea68a..b5e5941 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -48,9 +48,11 @@
   usePositionId: '', // 使用岗位
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -91,7 +93,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -116,6 +118,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -202,6 +209,8 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
@@ -255,12 +264,13 @@
 const deptList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -274,18 +284,50 @@
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
-  // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // // 部门
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -323,6 +365,11 @@
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+      </search-item>companyList
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-tree-select
@@ -340,6 +387,10 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6eea68a..b5e5941 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -48,9 +48,11 @@
   usePositionId: '', // 使用岗位
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -91,7 +93,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -116,6 +118,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -202,6 +209,8 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
@@ -255,12 +264,13 @@
 const deptList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -274,18 +284,50 @@
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
-  // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // // 部门
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -323,6 +365,11 @@
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+      </search-item>companyList
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-tree-select
@@ -340,6 +387,10 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 4266a44..98be2f0 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -639,6 +639,7 @@
   if (tableFlage.value) {
     // 普通表格
     if (list.value.length) {
+      console.log(listQuery, 'listQuerylistQuerylistQuery')
       const loading = ElLoading.service({
         lock: true,
         text: 'Loading',
@@ -649,6 +650,7 @@
         offset: undefined,
         limit: undefined,
         ids: selectList.value.map(item => item.id),
+        directorId: $props.statusName === '全部' && checked.value ? userStore.id : '',
       }
       exportDevice(data).then((res) => {
         exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6eea68a..b5e5941 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -48,9 +48,11 @@
   usePositionId: '', // 使用岗位
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -91,7 +93,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -116,6 +118,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -202,6 +209,8 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
@@ -255,12 +264,13 @@
 const deptList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -274,18 +284,50 @@
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
-  // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // // 部门
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -323,6 +365,11 @@
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+      </search-item>companyList
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-tree-select
@@ -340,6 +387,10 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 4266a44..98be2f0 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -639,6 +639,7 @@
   if (tableFlage.value) {
     // 普通表格
     if (list.value.length) {
+      console.log(listQuery, 'listQuerylistQuerylistQuery')
       const loading = ElLoading.service({
         lock: true,
         text: 'Loading',
@@ -649,6 +650,7 @@
         offset: undefined,
         limit: undefined,
         ids: selectList.value.map(item => item.id),
+        directorId: $props.statusName === '全部' && checked.value ? userStore.id : '',
       }
       exportDevice(data).then((res) => {
         exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 5cbb55f..bf80939 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -291,6 +291,11 @@
   // 原生上传
   // console.log(event.target.files)
   if (event.target.files?.length !== 0) {
+    if (!event.target.files[0].type.includes('zip')) {
+      ElMessage.warning('请上传zip格式文件')
+      fileRef.value.value = ''
+      return
+    }
     // 创建formdata对象
     const fd = new FormData()
     fd.append('file', event.target.files[0])
@@ -426,7 +431,7 @@
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx,.zip,.rar" @change="onFileChange">
       </template>

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6eea68a..b5e5941 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -48,9 +48,11 @@
   usePositionId: '', // 使用岗位
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -91,7 +93,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -116,6 +118,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -202,6 +209,8 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
@@ -255,12 +264,13 @@
 const deptList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -274,18 +284,50 @@
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
-  // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // // 部门
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -323,6 +365,11 @@
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+      </search-item>companyList
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-tree-select
@@ -340,6 +387,10 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 4266a44..98be2f0 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -639,6 +639,7 @@
   if (tableFlage.value) {
     // 普通表格
     if (list.value.length) {
+      console.log(listQuery, 'listQuerylistQuerylistQuery')
       const loading = ElLoading.service({
         lock: true,
         text: 'Loading',
@@ -649,6 +650,7 @@
         offset: undefined,
         limit: undefined,
         ids: selectList.value.map(item => item.id),
+        directorId: $props.statusName === '全部' && checked.value ? userStore.id : '',
       }
       exportDevice(data).then((res) => {
         exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 5cbb55f..bf80939 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -291,6 +291,11 @@
   // 原生上传
   // console.log(event.target.files)
   if (event.target.files?.length !== 0) {
+    if (!event.target.files[0].type.includes('zip')) {
+      ElMessage.warning('请上传zip格式文件')
+      fileRef.value.value = ''
+      return
+    }
     // 创建formdata对象
     const fd = new FormData()
     fd.append('file', event.target.files[0])
@@ -426,7 +431,7 @@
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx,.zip,.rar" @change="onFileChange">
       </template>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 4cccf26..cec8ccb 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -287,7 +287,7 @@
         <el-input v-model.trim="listQuery.subcontractorNo" placeholder="机构编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.companyName" placeholder="单位名称" clearable />
+        <el-input v-model.trim="listQuery.companyName" placeholder="机构名称" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="联系人" clearable />

diff --git a/src/api/eqpt/document/index.ts b/src/api/eqpt/document/index.ts
index 636a5e4..4c59b53 100644
--- a/src/api/eqpt/document/index.ts
+++ b/src/api/eqpt/document/index.ts
@@ -5,9 +5,9 @@
 // 分页列表
 export function getListPage(params: object) {
   return request({
-    url: '/file/listPage',
-    method: 'get',
-    params,
+    url: `/file/listPage?offset=${params.offset}&limit=${params.limit}`,
+    method: 'post',
+    data: params,
   })
 }
 // 新建
diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue
index 8b9a022..f5eedcb 100644
--- a/src/views/tested/MeasurementPlan/plan/components/list.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/list.vue
@@ -12,12 +12,14 @@
 import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
+import useUserStore from '@/store/modules/user'
 const $props = defineProps({
   statusName: {
     type: String,
     default: '',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -369,6 +371,9 @@
   reject: '/tested/pmetering/plan/reject',
   add: '/tested/pmetering/plan/add',
 })
+const isAdmin = computed(() => {
+  return userStore.roleNames.join().includes('管理员')
+})
 </script>
 
 <template>
@@ -431,7 +436,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
-        <el-button type="primary" @click="summary">
+        <el-button v-if="isAdmin" type="primary" @click="summary">
           汇总年度计划
         </el-button>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-year" title="新增年计划" @click="handler({}, 'create', 'year')" />
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index eddafff..8c135a9 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -41,6 +41,8 @@
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  directorName: '',
+  companyId: '',
   usageStatusList: [],
 })
 const loadingTable = ref<boolean>(false)
@@ -82,7 +84,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -107,6 +109,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -144,9 +151,11 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
+    companyId: '',
     usageStatusList: [],
   }
   search()
@@ -223,12 +232,13 @@
 const usePositionList = ref<any[]>([])
 // 使用状态列表
 const usageStatusList = ref()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -243,11 +253,11 @@
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
   // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -256,8 +266,40 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     usageStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -297,6 +339,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-tree-select
           v-model="listQuery.deptIds"
           style="width: 100%;"
@@ -312,6 +359,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/MeasurementPlan/plan/components/summary.vue b/src/views/tested/MeasurementPlan/plan/components/summary.vue
index 53b7158..1854304 100644
--- a/src/views/tested/MeasurementPlan/plan/components/summary.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/summary.vue
@@ -3,8 +3,10 @@
 import dataList from './dataList.vue'
 import { expandSummary, exportSummary, getSummary } from '@/api/eqpt/measurementPlan/paln'
 import { exportFile } from '@/utils/exportUtils'
+import useUserStore from '@/store/modules/user'
 const $router = useRouter()
 const $route = useRoute()
+const userStore = useUserStore()
 // 关闭
 const close = () => {
   $router.go(-1)
@@ -21,9 +23,11 @@
   summaryName: '',
   year: '',
 })
+const isAdmin = ref(false)
 // 获取初始数据
 const fetchData = () => {
   const data = JSON.parse($route.query.data as string)
+  isAdmin.value = data.isAdmin ? data.deptId : null
   getSummary({
     companyId: data.commpanyId,
     deptId: data.isAdmin ? null : data.deptId,
@@ -96,7 +100,7 @@
               <el-input v-model.trim="ruleForm.companyName" disabled style="width: 100%;" />
             </el-form-item>
           </el-col>
-          <el-col v-if="ruleForm.deptName" :span="6">
+          <el-col v-if="!isAdmin" :span="6">
             <el-form-item label="部门" prop="deptName">
               <el-input v-model.trim="ruleForm.deptName" disabled style="width: 100%;" />
             </el-form-item>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index 5dec4e5..5d568d1 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -99,6 +99,11 @@
   },
 ])
 const list = ref<IlistObjType[]>([])
+watch(() => $props.data, (newVal) => {
+  if (newVal) {
+    list.value = newVal.map((item: any) => ({ ...item, editable: true }))
+  }
+})
 // 检查数据列表
 function checkCertificateList() {
   return useCheckList(list.value as any, columns.value as any, '计划列表')
@@ -110,13 +115,13 @@
   }
 }
 // 双击行显示输入框
-const dblclickRow = (row: IlistObjType) => {
-  if ($route.path.includes('detail')) {
-    return
-  }
-  setAllRowReadable()
-  row.editable = true
-}
+// const dblclickRow = (row: IlistObjType) => {
+//   if ($route.path.includes('detail')) {
+//     return
+//   }
+//   setAllRowReadable()
+//   row.editable = true
+// }
 const SelectionList = ref()
 // 表格选中
 const handleSelectionChange = (e: IlistObjType[]) => {
@@ -125,7 +130,7 @@
 // 添加行
 const addRow = () => {
   if (checkCertificateList()) {
-    setAllRowReadable()
+    // setAllRowReadable()
     list.value.push({
       equipmentName: '',
       model: '',
@@ -206,7 +211,7 @@
   }
 }
 const initDialog = () => {
-  list.value = $props.data as IlistObjType[]
+  list.value = $props.data.map((item: any) => ({ ...item, editable: true }))
 }
 // 批量增加
 const batch = () => {
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index c3b0baa..fd1924c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -393,7 +393,7 @@
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
       </template>
       <!-- 普通表格 -->
       <normal-table
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index 039db1b..2608f40 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -120,6 +127,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    companyId: '',
+    directorName: '',
   }
   search()
 }
@@ -194,6 +203,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -217,11 +227,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -230,10 +240,42 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
 
 fetchDeptTree()
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 // 监听设备名称下拉框，修改规格型号
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -270,6 +312,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -291,6 +338,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable>
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index bec4b1c..0f99b4e 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, getUserDeptSon } from '@/api/system/user'
+import { getAdminDept, getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
@@ -27,6 +27,8 @@
   useSign: '',
   certificateValidStart: '',
   certificateValidEnd: '',
+  companyId: '',
+  directorName: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -55,7 +57,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -80,6 +82,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -119,6 +126,8 @@
     useSign: '',
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
   }
   search()
 }
@@ -169,6 +178,7 @@
 const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
@@ -192,11 +202,11 @@
   // getUserDeptSon({ }).then((res) => {
   //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
   // })
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
@@ -205,8 +215,39 @@
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptId = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 
 // 监听设备名称下拉框，修改规格型号
@@ -245,6 +286,11 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
         <!-- <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
           <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select> -->
@@ -266,6 +312,9 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
         <el-select v-model="listQuery.usageStatusList" multiple placeholder="使用状态" clearable style="width: 100%;">
           <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index 6eea68a..b5e5941 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -48,9 +48,11 @@
   usePositionId: '', // 使用岗位
   certificateValidStart: '',
   certificateValidEnd: '',
+  directorName: '',
   checkDestination: $props.checkDestinationValue, // 检定去向
   limit: 5,
   offset: 1,
+  companyId: '',
 })
 const loadingTable = ref<boolean>(false)
 const list = ref([]) // 表格数据
@@ -91,7 +93,7 @@
     align: 'center',
   },
   {
-    text: '所在单位',
+    text: '使用单位',
     value: 'companyName',
     align: 'center',
   },
@@ -116,6 +118,11 @@
     align: 'center',
   },
   {
+    text: '使用状态',
+    value: 'usageStatusName',
+    align: 'center',
+  },
+  {
     text: '检定(校准)单位',
     value: 'checkOrganization',
     align: 'center',
@@ -202,6 +209,8 @@
     usePositionId: '', // 使用岗位
     certificateValidStart: '',
     certificateValidEnd: '',
+    directorName: '',
+    companyId: '',
     checkDestination: $props.checkDestinationValue, // 检定去向
     limit: 5,
     offset: 1,
@@ -255,12 +264,13 @@
 const deptList = ref<any[]>([])
 // 使用岗位
 const usePositionList = ref<any[]>([])
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
+  // getDeptTreeList().then((res) => {
+  //   if (res.data) { // 将列表转树结构
+  //     deptTreeList.value = toTreeList(res.data, '0', true)
+  //   }
+  // })
   // 在用信息
   getDictByCode('eqptDeviceInUse').then((res) => {
     inUseList.value = res.data
@@ -274,18 +284,50 @@
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model))).sort()
   })
-  // 部门
-  getUserDept().then((res) => {
-    getDeptTreeList({ pid: res.data.id }).then((res) => {
-      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
-    })
-  })
+  // // 部门
+  // getUserDept().then((res) => {
+  //   getDeptTreeList({ pid: res.data.id }).then((res) => {
+  //     deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+  //   })
+  // })
   // 使用岗位
   getPostList({}).then((res) => {
     usePositionList.value = res.data
   })
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || 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,
+        },
+      ]
+    }
+  })
 }
-
+// 监听单位，修改部门
+watch(() => listQuery.value.companyId, (newVal) => {
+  listQuery.value.deptIds = ''
+  if (newVal) {
+    // getUserDeptSon({ companyId: newVal }).then((res) => {
+    //   deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+    // })
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
 fetchDeptTree()
 watch(() => listQuery.value.equipmentName, (newVal) => {
   if (newVal) {
@@ -323,6 +365,11 @@
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
+      </search-item>companyList
+      <search-item>
+        <el-select v-model="listQuery.companyId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-tree-select
@@ -340,6 +387,10 @@
         </el-select>
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 4266a44..98be2f0 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -639,6 +639,7 @@
   if (tableFlage.value) {
     // 普通表格
     if (list.value.length) {
+      console.log(listQuery, 'listQuerylistQuerylistQuery')
       const loading = ElLoading.service({
         lock: true,
         text: 'Loading',
@@ -649,6 +650,7 @@
         offset: undefined,
         limit: undefined,
         ids: selectList.value.map(item => item.id),
+        directorId: $props.statusName === '全部' && checked.value ? userStore.id : '',
       }
       exportDevice(data).then((res) => {
         exportFile(res.data, $props.equipmentType === '1' ? '设备信息' : '特种设备')
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 5cbb55f..bf80939 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -291,6 +291,11 @@
   // 原生上传
   // console.log(event.target.files)
   if (event.target.files?.length !== 0) {
+    if (!event.target.files[0].type.includes('zip')) {
+      ElMessage.warning('请上传zip格式文件')
+      fileRef.value.value = ''
+      return
+    }
     // 创建formdata对象
     const fd = new FormData()
     fd.append('file', event.target.files[0])
@@ -426,7 +431,7 @@
         <icon-button v-if="proxy.hasPerm(permUrl.add)" icon="icon-add" title="新增" @click="handler({}, 'create')" />
         <icon-button v-if="proxy.hasPerm(permUrl.import)" icon="icon-import" title="批量导入" @click="batchImport" />
         <icon-button icon="icon-template" title="模板下载" @click="useTemplateDownload('外送证书管理模块')" />
-        <icon-button icon="icon-export" title="导出" @click="exportList" />
+        <!-- <icon-button icon="icon-export" title="导出" @click="exportList" /> -->
         <icon-button icon="icon-print" title="打印" @click="printList" />
         <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx,.zip,.rar" @change="onFileChange">
       </template>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 4cccf26..cec8ccb 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -287,7 +287,7 @@
         <el-input v-model.trim="listQuery.subcontractorNo" placeholder="机构编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.companyName" placeholder="单位名称" clearable />
+        <el-input v-model.trim="listQuery.companyName" placeholder="机构名称" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.directorName" placeholder="联系人" clearable />
diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue
index 04215b8..ad5fe16 100644
--- a/src/views/tested/subpackage/task/components/list.vue
+++ b/src/views/tested/subpackage/task/components/list.vue
@@ -275,13 +275,7 @@
   immediate: true,
 })
 const permUrl = ref({
-  edit: '/tested/subpackage/review/edit',
-  del: '/tested/subpackage/review/delete',
-  submit: '/tested/subpackage/review/submit',
-  cancel: '/tested/subpackage/review/cancel',
-  agree: '/tested/subpackage/review/agree',
-  reject: '/tested/subpackage/review/reject',
-  add: '/tested/subpackage/review/add',
+  add: '/tested/subpackage/task/add',
 })
 // 创建单位
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
@@ -390,37 +384,37 @@
                 查看
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="primary" size="small"
                 @click="handler(scope.row, 'update')"
               >
                 编辑
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
                 @click="approveHandler(scope.row, 'agree')"
               >
                 同意
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
                 @click="approveHandler(scope.row, 'refuse')"
               >
                 拒绝
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
                 @click="submit(scope.row)"
               >
                 提交
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.add)" link type="primary" size="small"
                 @click="canHandler(scope.row)"
               >
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.add) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除