diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 0be0814..4cccf26 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -204,7 +204,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportDirectory(data).then((res) => {
-      exportFile(res.data, '分包方名录')
+      exportFile(res.data, '外送机构名录')
       loading.close()
     })
       .catch((_) => {

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 0be0814..4cccf26 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -204,7 +204,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportDirectory(data).then((res) => {
-      exportFile(res.data, '分包方名录')
+      exportFile(res.data, '外送机构名录')
       loading.close()
     })
       .catch((_) => {
diff --git a/src/views/tested/subpackage/task/components/ApprovalDialog.vue b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
index 65e0563..858045e 100644
--- a/src/views/tested/subpackage/task/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
@@ -3,7 +3,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import useUserStore from '@/store/modules/user'
-import { handlerApproval } from '@/api/eqpt/subpackage/review'
+import { handlerApproval } from '@/api/eqpt/subpackage/task'
 /**
  * 审批弹窗
  */

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 0be0814..4cccf26 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -204,7 +204,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportDirectory(data).then((res) => {
-      exportFile(res.data, '分包方名录')
+      exportFile(res.data, '外送机构名录')
       loading.close()
     })
       .catch((_) => {
diff --git a/src/views/tested/subpackage/task/components/ApprovalDialog.vue b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
index 65e0563..858045e 100644
--- a/src/views/tested/subpackage/task/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
@@ -3,7 +3,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import useUserStore from '@/store/modules/user'
-import { handlerApproval } from '@/api/eqpt/subpackage/review'
+import { handlerApproval } from '@/api/eqpt/subpackage/task'
 /**
  * 审批弹窗
  */
diff --git a/src/views/tested/subpackage/task/components/deviceTable.vue b/src/views/tested/subpackage/task/components/deviceTable.vue
index 276a79c..f2cec1f 100644
--- a/src/views/tested/subpackage/task/components/deviceTable.vue
+++ b/src/views/tested/subpackage/task/components/deviceTable.vue
@@ -21,31 +21,31 @@
   {
     text: '规格型号',
     value: 'model',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '生产厂家',
     value: 'manufacturer',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '上次送检单位',
-    value: 'manufactureNo',
-    required: true,
+    value: 'checkOrganization',
+    required: false,
     type: 'text',
   },
   {
@@ -58,7 +58,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value as any, '受检设备信息')
+  return useCheckList(list.value, columns.value as any, '外送设备清单')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -102,6 +102,7 @@
       equipmentId: item.id,
       id: null,
       groupId: null,
+      editable: true,
     })
   })
 }
@@ -145,9 +146,16 @@
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <span v-if="scope.row.editable && item.type === 'text'">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`" class="input"
           />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]"
+            type="date"
+            :placeholder="`${item.text}`"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
         </template>
       </el-table-column>
     </el-table>

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 0be0814..4cccf26 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -204,7 +204,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportDirectory(data).then((res) => {
-      exportFile(res.data, '分包方名录')
+      exportFile(res.data, '外送机构名录')
       loading.close()
     })
       .catch((_) => {
diff --git a/src/views/tested/subpackage/task/components/ApprovalDialog.vue b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
index 65e0563..858045e 100644
--- a/src/views/tested/subpackage/task/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
@@ -3,7 +3,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import useUserStore from '@/store/modules/user'
-import { handlerApproval } from '@/api/eqpt/subpackage/review'
+import { handlerApproval } from '@/api/eqpt/subpackage/task'
 /**
  * 审批弹窗
  */
diff --git a/src/views/tested/subpackage/task/components/deviceTable.vue b/src/views/tested/subpackage/task/components/deviceTable.vue
index 276a79c..f2cec1f 100644
--- a/src/views/tested/subpackage/task/components/deviceTable.vue
+++ b/src/views/tested/subpackage/task/components/deviceTable.vue
@@ -21,31 +21,31 @@
   {
     text: '规格型号',
     value: 'model',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '生产厂家',
     value: 'manufacturer',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '上次送检单位',
-    value: 'manufactureNo',
-    required: true,
+    value: 'checkOrganization',
+    required: false,
     type: 'text',
   },
   {
@@ -58,7 +58,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value as any, '受检设备信息')
+  return useCheckList(list.value, columns.value as any, '外送设备清单')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -102,6 +102,7 @@
       equipmentId: item.id,
       id: null,
       groupId: null,
+      editable: true,
     })
   })
 }
@@ -145,9 +146,16 @@
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <span v-if="scope.row.editable && item.type === 'text'">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`" class="input"
           />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]"
+            type="date"
+            :placeholder="`${item.text}`"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/task/components/edit.vue b/src/views/tested/subpackage/task/components/edit.vue
index 71db3ac..0f17b9f 100644
--- a/src/views/tested/subpackage/task/components/edit.vue
+++ b/src/views/tested/subpackage/task/components/edit.vue
@@ -12,8 +12,13 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
-import { getUserDept } from '@/api/system/user'
-import { cancelReview, deleteReview, editReview, getDetail, submitReview } from '@/api/eqpt/subpackage/review'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+// import { printPdf } from '@/utils/printUtils'
+import { getFiles } from '@/utils/download'
+import { exportFile, printContent } from '@/utils/exportUtils'
+import { cancelReview, deleteReview, editReview, getDetail, printPageApi, submitReview } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -65,24 +70,52 @@
 })
 
 // 获取下拉框数据
-const reasonList = ref<{ id: string; value: string; name: string }[]>() // 规模
-const fetchSelectData = () => {
-  // 分包原因
-  getDictByCode('eqptSubpackageReason').then((res) => {
-    reasonList.value = res.data
-  })
-}
-fetchSelectData()
+// const reasonList = ref<{ id: string; value: string; name: string }[]>() // 规模
+// const fetchSelectData = () => {
+// 分包原因
+// getDictByCode('eqptSubpackageReason').then((res) => {
+//   reasonList.value = res.data
+// })
+// }
+const isAdmin = ref(false)
+const flag = ref(false)
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// fetchSelectData()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
+  getUserDept().then((res) => {
+    flag.value = true
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      isAdmin.value = true
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      isAdmin.value = false
+      ruleForm.value.createCompanyId = res.data.id
+      ruleForm.value.createCompanyName = res.data.fullName
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
+    }
+    setTimeout(() => {
+      flag.value = false
+    })
+  })
   if (!$route.path.includes('create')) {
-    // const data = JSON.parse($route.query.row as string)
-    // getDetail({ id: data.id }).then((res) => {
-    //   const data = res.data
-    //   ruleForm.value = data
-    // })
+    const data = JSON.parse($route.query.row as string)
+    getDetail({ id: data.id }).then((res) => {
+      flag.value = true
+      const data = res.data
+      ruleForm.value = data
+      setTimeout(() => {
+        flag.value = false
+      })
+    })
   }
   if ($route.path.includes('create')) {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -91,15 +124,24 @@
     ruleForm.value.deliverer = userStore.name
     // ruleForm.value.createDeptId = userStore.deptId
     // ruleForm.value.createDeptName = userStore.deptName
-    // // getUserDept().then((res) => {
-    // //   ruleForm.value.createDeptId = res.data.id
-    // //   ruleForm.value.createDeptName = res.data.fullName
-    // // })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
   initDialog()
 })
+watch(() => ruleForm.value.createCompanyId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  if ($route.path.includes('detail') || !isAdmin.value || flag.value) { return }
+  ruleForm.value.createDeptId = ''
+})
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -125,6 +167,10 @@
           ruleForm.value.id = submitId.value
         }
         ruleForm.value.equipmentList = deviceRef.value.list
+        if (isAdmin.value) {
+          ruleForm.value.createCompanyName = companyList.value.filter(item => item.value === ruleForm.value.createCompanyId)[0]?.name
+          ruleForm.value.createDeptName = deptList.value.filter((item: any) => item.value === ruleForm.value.createDeptId)[0]?.label
+        }
         editReview(ruleForm.value).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
@@ -173,7 +219,7 @@
 // 编辑
 const editForm = () => {
   $router.push({
-    path: '/reviewpage/update',
+    path: '/rtaskpage/update',
     query: { ...$route.query },
   })
 }
@@ -242,6 +288,16 @@
   agree: '/tested/subpackage/review/agree',
   reject: '/tested/subpackage/review/reject',
 })
+// 打印
+const printPage = () => {
+  printPageApi({
+    id: ruleForm.value.id,
+    pdf: true,
+  }).then((res) => {
+    // printContent(res.data)
+    printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
+  })
+}
 </script>
 
 <template>
@@ -273,6 +329,9 @@
         <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
           取消
         </el-button>
+        <el-button v-if="statusName === '全部'" type="primary" @click="printPage">
+          打印
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -298,12 +357,26 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="申请单位" prop="createCompanyId">
-                <el-input v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled />
+                <!-- <el-input v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled /> -->
+                <el-select v-if="isAdmin && !$route.path.includes('detail')" v-model="ruleForm.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-input v-else v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="申请部门" prop="createDeptId">
-                <el-input v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled />
+                <!-- <el-input v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled /> -->
+                <el-tree-select
+                  v-if="isAdmin && !$route.path.includes('detail')"
+                  v-model="ruleForm.createDeptId"
+                  style="width: 100%;"
+                  :data="deptList"
+                  :render-after-expand="false"
+                  check-strictly
+                  placeholder="申请部门"
+                />
+                <el-input v-else v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -357,19 +430,19 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="地址" prop="address">
-                <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
+                <el-input v-model.trim="ruleForm.address" :placeholder="$route.path.includes('detail') ? ' ' : '地址'" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="邮编" prop="postcode">
-                <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
+                <el-input v-model.trim="ruleForm.postcode" :placeholder="$route.path.includes('detail') ? ' ' : '邮编'" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="传真" prop="fax">
-                <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
+                <el-input v-model.trim="ruleForm.fax" :placeholder="$route.path.includes('detail') ? ' ' : '传真'" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="6">

diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index f28c108..453b8c8 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -164,3 +164,11 @@
     responseType: 'blob',
   })
 }
+// 获取默认实验室
+export function getDefaultLab(data: any) {
+  return request({
+    url: '/plan/defaultLab',
+    method: 'get',
+    params: data,
+  })
+}
diff --git a/src/api/eqpt/measurementPlan/task.ts b/src/api/eqpt/measurementPlan/task.ts
index f64a7af..37e69a2 100644
--- a/src/api/eqpt/measurementPlan/task.ts
+++ b/src/api/eqpt/measurementPlan/task.ts
@@ -99,11 +99,11 @@
 
 export function delTask(id: string) {
   return request({
-    url: '/business/order/approval/delete',
+    url: `/business/order/approval/delete?id=${id}`,
     method: 'post',
-    data: {
-      id,
-    },
+    // data: {
+    //   id,
+    // },
   })
 }
 export function handlerApproval(type: string, data: object) {
@@ -113,3 +113,12 @@
     data,
   })
 }
+
+export function exportTask(data: object) {
+  return request({
+    url: '/business/order/allExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c5b9b0e..538c233 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -45,7 +45,7 @@
 // 保存编辑
 export function editDirectory(data: object, type: string) {
   console.log($route, 'route')
-  if (type === '全部' && window.location.href.includes('update')) {
+  if (type === 'create') {
     return request({
       // url: '/subcontractor/update',
       url: '/subcontractor/add',
@@ -55,11 +55,19 @@
   }
   else {
     return request({
-      url: '/subcontractor/approval/saveOrUpdate',
+      // url: '/subcontractor/update',
+      url: '/subcontractor/update',
       method: 'post',
       data,
     })
   }
+  // else {
+  //   return request({
+  //     url: '/subcontractor/approval/saveOrUpdate',
+  //     method: 'post',
+  //     data,
+  //   })
+  // }
 }
 // 提交
 export function submitDirectory(data: object) {
diff --git a/src/api/eqpt/subpackage/task.ts b/src/api/eqpt/subpackage/task.ts
index 4046aec..ed8cfe1 100644
--- a/src/api/eqpt/subpackage/task.ts
+++ b/src/api/eqpt/subpackage/task.ts
@@ -4,7 +4,7 @@
 import request from '@/api/index'
 
 // 不同状态列表分页
-export function getListPage(params: any, statusName: string) {
+export function getListPage1(params: any, statusName: string) {
   if (statusName === '全部') {
     return request({
       url: `/subcontract/order/allPage?limit=${params.limit}&offset=${params.offset}`,
@@ -51,14 +51,7 @@
   })
 }
 // 导出
-export function exportReview(data: object) {
-  return request({
-    url: '/subcontract/review/allExport',
-    method: 'post',
-    data,
-    responseType: 'blob',
-  })
-}
+
 // 提交
 export function submitReview(data: object) {
   return request({
@@ -90,3 +83,13 @@
     data,
   })
 }
+// dayin
+
+export function printPageApi(data: object) {
+  return request({
+    url: '/subcontract/order/exportFile',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index 1fd97c4..9a186dd 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -138,8 +138,10 @@
       ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
       ruleForm.value.createUserId = userStore.id
       ruleForm.value.createUserName = userStore.name
-      // ruleForm.value.createDeptId = userStore.deptId
-      // ruleForm.value.createDeptName = userStore.deptName
+      if (!isAdmin.value) {
+        ruleForm.value.createDeptId = userStore.deptId
+        ruleForm.value.createDeptName = userStore.deptName
+      }
       await fetchCommpany()
       if (typeFlag.value === '0') {
         ruleForm.value.planName = `${userStore.deptName}${new Date().getFullYear()}年年度计量计划`
diff --git a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
index 1ad5959..eddafff 100644
--- a/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/selectDevice.vue
@@ -343,7 +343,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/plan/components/table.vue b/src/views/tested/MeasurementPlan/plan/components/table.vue
index a2843ce..5dec4e5 100644
--- a/src/views/tested/MeasurementPlan/plan/components/table.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/table.vue
@@ -5,6 +5,7 @@
 import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue'
 import { useCheckList } from '@/utils/useCheckList'
 import type { IlistObjType } from '@/views/tested/device/info/components/interface'
+import { getDefaultLab } from '@/api/eqpt/measurementPlan/paln'
 const $props = defineProps({
   data: {
     type: Array,
@@ -159,19 +160,20 @@
   }
 }
 // 选择设备
-const confirm = (device: any) => {
+const confirm = async (device: any) => {
   if (Array.isArray(device)) {
     // 多选
-    device.forEach((item) => {
+    device.forEach(async (item) => {
       if (list.value.every(citem => citem.equipmentId !== item.id)) {
+        const data = await getDefaultLab({ companyId: item.companyId })
         list.value.push({
           ...item,
           equipmentId: item.id,
           id: null,
           groupId: null,
           editable: true,
-          checkDestinationName: item.checkDestination === '1' ? '计量室' : '外送',
-          planMeasureCompany: item.checkDestination === '1' ? '' : item.checkOrganization,
+          checkDestinationName: item.checkDestination === '1' ? '计量室' : item.checkDestination === '2' ? '外送' : '',
+          planMeasureCompany: data.data,
           planId: '',
           planName: '',
           planNo: '',
@@ -186,6 +188,7 @@
       ElMessage.warning('选择设备重复')
       return
     }
+    const data = await getDefaultLab({ companyId: device.companyId })
     const row = {
       ...device,
       equipmentId: device.id,
@@ -195,8 +198,9 @@
       planId: '',
       planName: '',
       planNo: '',
-      checkDestinationName: device.checkDestination === '1' ? '计量室' : '外送',
-      planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      checkDestinationName: device.checkDestination === '1' ? '计量室' : device.checkDestination === '2' ? '外送' : '',
+      // planMeasureCompany: device.checkDestination === '1' ? '' : device.checkOrganization,
+      planMeasureCompany: data.data,
     }
     list.value[selectRow.value] = row
   }
diff --git a/src/views/tested/MeasurementPlan/task/components/list.vue b/src/views/tested/MeasurementPlan/task/components/list.vue
index d9d4fff..50f443c 100644
--- a/src/views/tested/MeasurementPlan/task/components/list.vue
+++ b/src/views/tested/MeasurementPlan/task/components/list.vue
@@ -1,13 +1,14 @@
 <!-- 任务单管理表格 -->
 <script lang="ts" setup name="TaskList">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelTask, cancelTask1, delTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
+import { cancelTask, cancelTask1, delTask, exportTask, getListPage, submitTask } from '@/api/eqpt/measurementPlan/task'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getPostList } from '@/api/system/post'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptTree, getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const $props = defineProps({
   statusName: {
@@ -106,11 +107,11 @@
     value: 'requireOverTime',
     align: 'center',
   },
-  {
-    text: '接收状态',
-    value: 'receiveStatusName',
-    align: 'center',
-  },
+  // {
+  //   text: '接收状态',
+  //   value: 'receiveStatusName',
+  //   align: 'center',
+  // },
 ])
 const list = ref([])
 const total = ref(0)
@@ -217,6 +218,38 @@
     })
   })
 }
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
+// 导出列表
+const exportList = () => {
+  if (list.value.length) {
+    const loading = ElLoading.service({
+      lock: true,
+      text: 'Loading',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+    const data = {
+      ...listQuery,
+      offset: undefined,
+      limit: undefined,
+      ids: selectList.value.map(item => item.id),
+    }
+    exportTask(data).then((res) => {
+      exportFile(res.data, '计量计划')
+      loading.close()
+    })
+      .catch((_) => {
+        loading.close()
+      })
+  }
+  else {
+    ElMessage.warning('无可导出内容')
+  }
+}
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
@@ -360,23 +393,23 @@
     <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" />
       </template>
       <!-- 普通表格 -->
       <normal-table
         :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
+        :is-showmulti-select="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="接收状态" align="center">
+            <template #default="scope">
+              {{ scope.row.receiveStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
               <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.edit)" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
-                编辑
-              </el-button>
-              <el-button v-if="proxy.hasPerm(permUrl.cancel)" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
-                取消
               </el-button> -->
               <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
                 查看
@@ -412,11 +445,17 @@
                 取消
               </el-button>
               <el-button
-                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit)" link type="danger" size="small"
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="danger" size="small"
                 @click="delHandler(scope.row)"
               >
                 删除
               </el-button>
+              <!-- <el-button v-if="proxy.hasPerm(permUrl.edit) && $props.statusName === '全部'" link type="primary" :disabled="scope.row.receiveStatusName !== '未接收'" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button> -->
+              <el-button v-if="proxy.hasPerm(permUrl.cancel) && $props.statusName === '全部'" :disabled="scope.row.receiveStatusName !== '未接收'" link type="danger" size="small" @click="cancelHandler(scope.row)">
+                取消
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
index b2e136b..039db1b 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -185,7 +191,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -208,8 +214,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -259,9 +270,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
index ca32c48..bec4b1c 100644
--- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
+++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue
@@ -9,6 +9,7 @@
 import { getPostList } from '@/api/system/post'
 import { getUserDept, getUserDeptSon } from '@/api/system/user'
 import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const userStore = useUserStore()
 const dialogFormVisible = ref(false)
@@ -54,12 +55,12 @@
     align: 'center',
   },
   {
-    text: '使用单位',
+    text: '所在单位',
     value: 'companyName',
     align: 'center',
   },
   {
-    text: '所在部门',
+    text: '使用部门',
     value: 'deptName',
     align: 'center',
   },
@@ -69,8 +70,8 @@
     align: 'center',
   },
   {
-    text: '使用状态',
-    value: 'usageStatusName',
+    text: '负责人',
+    value: 'directorName',
     align: 'center',
   },
   {
@@ -79,6 +80,11 @@
     align: 'center',
   },
   {
+    text: '检定(校准)单位',
+    value: 'checkOrganization',
+    align: 'center',
+  },
+  {
     text: '证书有效期',
     value: 'certificateValid',
     align: 'center',
@@ -160,7 +166,7 @@
 // 使用岗位
 const usePositionList = ref<any[]>([])
 // 部门
-const deptList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any[]>([])
 // 获取使用状态列表
 const useStatusList = ref<{ id: string; value: string; name: string }[]>()
 const fetchDeptTree = () => {
@@ -183,8 +189,13 @@
   //     deptList.value = res1.data.filter((item: any) => item.pid === res.data.id).map((item: any) => ({ id: item.id, value: item.id, name: item.name }))
   //   })
   // })
-  getUserDeptSon({ }).then((res) => {
-    deptList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+  // 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 })))
+    })
   })
   // 使用岗位
   getPostList({}).then((res) => {
@@ -234,9 +245,19 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.deptId" filterable placeholder="使用部门" style="width: 100%;">
+        <!-- <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>
+        </el-select> -->
+        <search-item>
+          <el-tree-select
+            v-model="listQuery.deptId"
+            style="width: 100%;"
+            :data="deptList"
+            :render-after-expand="false"
+            check-strictly
+            placeholder="使用部门"
+          />
+        </search-item>
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
diff --git a/src/views/tested/device/group/components/selectDevice.vue b/src/views/tested/device/group/components/selectDevice.vue
index fe62245..6eea68a 100644
--- a/src/views/tested/device/group/components/selectDevice.vue
+++ b/src/views/tested/device/group/components/selectDevice.vue
@@ -374,7 +374,7 @@
         <template #columns>
           <el-table-column label="检定去向" align="center">
             <template #default="scope">
-              {{ scope.row.checkDestination === '1' ? '计量室' : '外送' }}
+              {{ scope.row.checkDestination === '1' ? '计量室' : scope.row.checkDestination === '2' ? '外送' : '' }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 9915799..4266a44 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -336,6 +336,7 @@
   })
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
+    meterIdentifyList.value?.push({ name: '空', id: '1', value: '66' })
   })
   // 安装位置
   getLocationList().then((res) => {
diff --git a/src/views/tested/device/info/components/showPhoto.vue b/src/views/tested/device/info/components/showPhoto.vue
index 20148da..72ab7f3 100644
--- a/src/views/tested/device/info/components/showPhoto.vue
+++ b/src/views/tested/device/info/components/showPhoto.vue
@@ -23,22 +23,26 @@
 const $route = useRoute()
 const urlList = ref()
 const getPhoto = () => {
+  console.log(props.minioFileName, 'props.minioFileName')
   if (props.minioFileName) {
     // getPhotoUrl(props.minioFileName).then((res) => {
     //   url.value = res.data
     // })
     const arr = props.minioFileName.split(',')
-    urlList.value = arr.map((item) => {
-      return {
-        minioFileName: item,
-        url: '',
-      }
-    })
-    urlList.value.forEach((item: any) => {
-      getPhotoUrl(item.minioFileName).then((res) => {
-        item.url = res.data
+    console.log(arr, 'arrarrarr')
+    if (arr.length) {
+      urlList.value = arr.map((item) => {
+        return {
+          minioFileName: item,
+          url: '',
+        }
       })
-    })
+      urlList.value.forEach((item: any) => {
+        getPhotoUrl(item.minioFileName).then((res) => {
+          item.url = res.data
+        })
+      })
+    }
   }
   else {
     urlList.value = []
diff --git a/src/views/tested/subpackage/certificate/index.vue b/src/views/tested/subpackage/certificate/index.vue
index 6e3fb3c..5cbb55f 100644
--- a/src/views/tested/subpackage/certificate/index.vue
+++ b/src/views/tested/subpackage/certificate/index.vue
@@ -275,7 +275,7 @@
     fd.append('ids', data.ids as any)
     fd.append('subcontractorName', data.subcontractorName)
     exportCertificate(fd).then((res) => {
-      exportFile(res.data, '分包方证书')
+      exportFile(res.data, '外送证书')
       loading.close()
     })
       .catch((_) => {
@@ -386,7 +386,7 @@
         <el-input v-model.trim="listQuery.equipmentManufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentManufacture" placeholder="生产厂家" clearable />
+        <el-input v-model.trim="listQuery.equipmentManufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
         <!-- <el-input v-model.trim="listQuery.subcontractorName" placeholder="检定(校准)机构" clearable /> -->
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index d559e2a..40f81c8 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -192,6 +192,7 @@
     getDetail({ id: data.id }).then((res) => {
       const data = res.data
       ruleForm.value = data.subcontractor
+      console.log(res.data, 'res.data')
       personList.value = data.staffList
       capacityList.value = data.abilityList
       certificateList.value = data.certificateListsaveForm
@@ -242,7 +243,7 @@
           certificateList: [], // 分包证书
           staffList: personRef.value.list, // 分包人员
         }
-        editDirectory(data, $route.query.statusName as string).then((res) => {
+        editDirectory(data, $route.params.type as string).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
           if (statusName === '已取消' || statusName === '未通过') {
@@ -383,7 +384,7 @@
 const deleteFile1 = (fileName: string) => {
   ruleForm.value.businessAbilityFile = ''
 }
-const deleteFile2 = () => {
+const deleteFile2 = (fileName: string) => {
   const data = ruleForm.value.attachments.split(',')
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.attachments = filterData.length ? filterData.join(',') : ''
@@ -476,28 +477,28 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="规模" prop="scale">
-                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? '' : '选择规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.scale" :placeholder="$route.path.includes('detail') ? ' ' : '选择规模'" style="width: 100%;">
                   <el-option v-for="item in companySize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="业务规模" prop="businessScale">
-                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? '' : '选择业务规模'" style="width: 100%;">
+                <el-select v-model="ruleForm.businessScale" :placeholder="$route.path.includes('detail') ? ' ' : '选择业务规模'" style="width: 100%;">
                   <el-option v-for="item in businessSize" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约评级" prop="performanceRating">
-                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? '' : '选择履约评级'" style="width: 100%;">
+                <el-select v-model="ruleForm.performanceRating" :placeholder="$route.path.includes('detail') ? ' ' : '选择履约评级'" style="width: 100%;">
                   <el-option v-for="item in performance" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="整体评价" prop="overallEvaluation">
-                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? '' : '选择整体评价'" style="width: 100%;">
+                <el-select v-model="ruleForm.overallEvaluation" :placeholder="$route.path.includes('detail') ? ' ' : '选择整体评价'" style="width: 100%;">
                   <el-option v-for="item in evaluation" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 0be0814..4cccf26 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -204,7 +204,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportDirectory(data).then((res) => {
-      exportFile(res.data, '分包方名录')
+      exportFile(res.data, '外送机构名录')
       loading.close()
     })
       .catch((_) => {
diff --git a/src/views/tested/subpackage/task/components/ApprovalDialog.vue b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
index 65e0563..858045e 100644
--- a/src/views/tested/subpackage/task/components/ApprovalDialog.vue
+++ b/src/views/tested/subpackage/task/components/ApprovalDialog.vue
@@ -3,7 +3,7 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import useUserStore from '@/store/modules/user'
-import { handlerApproval } from '@/api/eqpt/subpackage/review'
+import { handlerApproval } from '@/api/eqpt/subpackage/task'
 /**
  * 审批弹窗
  */
diff --git a/src/views/tested/subpackage/task/components/deviceTable.vue b/src/views/tested/subpackage/task/components/deviceTable.vue
index 276a79c..f2cec1f 100644
--- a/src/views/tested/subpackage/task/components/deviceTable.vue
+++ b/src/views/tested/subpackage/task/components/deviceTable.vue
@@ -21,31 +21,31 @@
   {
     text: '规格型号',
     value: 'model',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '出厂编号',
     value: 'manufactureNo',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '生产厂家',
     value: 'manufacturer',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '证书有效期',
     value: 'certificateValid',
-    required: true,
+    required: false,
     type: 'text',
   },
   {
     text: '上次送检单位',
-    value: 'manufactureNo',
-    required: true,
+    value: 'checkOrganization',
+    required: false,
     type: 'text',
   },
   {
@@ -58,7 +58,7 @@
 const list = ref<any[]>([])
 // 检查数据列表
 function checkCertificateList() {
-  return useCheckList(list.value, columns.value as any, '受检设备信息')
+  return useCheckList(list.value, columns.value as any, '外送设备清单')
 }
 // 将列表置为不可编辑状态
 function setAllRowReadable() {
@@ -102,6 +102,7 @@
       equipmentId: item.id,
       id: null,
       groupId: null,
+      editable: true,
     })
   })
 }
@@ -145,9 +146,16 @@
           <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
           <span v-if="scope.row.editable && item.type === 'text'">{{ scope.row[item.value] }}</span>
           <el-input
-            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]" :autofocus="true"
+            v-if="scope.row.editable && item.type === 'input'" v-model="scope.row[item.value]"
             :placeholder="`${item.text}`" class="input"
           />
+          <el-date-picker
+            v-if="scope.row.editable && item.type === 'date'" v-model="scope.row[item.value]"
+            type="date"
+            :placeholder="`${item.text}`"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/tested/subpackage/task/components/edit.vue b/src/views/tested/subpackage/task/components/edit.vue
index 71db3ac..0f17b9f 100644
--- a/src/views/tested/subpackage/task/components/edit.vue
+++ b/src/views/tested/subpackage/task/components/edit.vue
@@ -12,8 +12,13 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
-import { getUserDept } from '@/api/system/user'
-import { cancelReview, deleteReview, editReview, getDetail, submitReview } from '@/api/eqpt/subpackage/review'
+import { getAdminDept, getUserDept } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+// import { printPdf } from '@/utils/printUtils'
+import { getFiles } from '@/utils/download'
+import { exportFile, printContent } from '@/utils/exportUtils'
+import { cancelReview, deleteReview, editReview, getDetail, printPageApi, submitReview } from '@/api/eqpt/subpackage/task'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -65,24 +70,52 @@
 })
 
 // 获取下拉框数据
-const reasonList = ref<{ id: string; value: string; name: string }[]>() // 规模
-const fetchSelectData = () => {
-  // 分包原因
-  getDictByCode('eqptSubpackageReason').then((res) => {
-    reasonList.value = res.data
-  })
-}
-fetchSelectData()
+// const reasonList = ref<{ id: string; value: string; name: string }[]>() // 规模
+// const fetchSelectData = () => {
+// 分包原因
+// getDictByCode('eqptSubpackageReason').then((res) => {
+//   reasonList.value = res.data
+// })
+// }
+const isAdmin = ref(false)
+const flag = ref(false)
+// 创建单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+const deptList = ref<any>([])
+// fetchSelectData()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
+  getUserDept().then((res) => {
+    flag.value = true
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      isAdmin.value = true
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      isAdmin.value = false
+      ruleForm.value.createCompanyId = res.data.id
+      ruleForm.value.createCompanyName = res.data.fullName
+      ruleForm.value.createDeptId = userStore.deptId
+      ruleForm.value.createDeptName = userStore.deptName
+    }
+    setTimeout(() => {
+      flag.value = false
+    })
+  })
   if (!$route.path.includes('create')) {
-    // const data = JSON.parse($route.query.row as string)
-    // getDetail({ id: data.id }).then((res) => {
-    //   const data = res.data
-    //   ruleForm.value = data
-    // })
+    const data = JSON.parse($route.query.row as string)
+    getDetail({ id: data.id }).then((res) => {
+      flag.value = true
+      const data = res.data
+      ruleForm.value = data
+      setTimeout(() => {
+        flag.value = false
+      })
+    })
   }
   if ($route.path.includes('create')) {
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -91,15 +124,24 @@
     ruleForm.value.deliverer = userStore.name
     // ruleForm.value.createDeptId = userStore.deptId
     // ruleForm.value.createDeptName = userStore.deptName
-    // // getUserDept().then((res) => {
-    // //   ruleForm.value.createDeptId = res.data.id
-    // //   ruleForm.value.createDeptName = res.data.fullName
-    // // })
+    // getUserDept().then((res) => {
+    //   ruleForm.value.createDeptId = res.data.id
+    //   ruleForm.value.createDeptName = res.data.fullName
+    // })
   }
 }
 onMounted(() => {
   initDialog()
 })
+watch(() => ruleForm.value.createCompanyId, (newVal) => {
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id })))
+    })
+  }
+  if ($route.path.includes('detail') || !isAdmin.value || flag.value) { return }
+  ruleForm.value.createDeptId = ''
+})
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -125,6 +167,10 @@
           ruleForm.value.id = submitId.value
         }
         ruleForm.value.equipmentList = deviceRef.value.list
+        if (isAdmin.value) {
+          ruleForm.value.createCompanyName = companyList.value.filter(item => item.value === ruleForm.value.createCompanyId)[0]?.name
+          ruleForm.value.createDeptName = deptList.value.filter((item: any) => item.value === ruleForm.value.createDeptId)[0]?.label
+        }
         editReview(ruleForm.value).then((res) => {
           disabledSave.value = false
           submitId.value = res.data
@@ -173,7 +219,7 @@
 // 编辑
 const editForm = () => {
   $router.push({
-    path: '/reviewpage/update',
+    path: '/rtaskpage/update',
     query: { ...$route.query },
   })
 }
@@ -242,6 +288,16 @@
   agree: '/tested/subpackage/review/agree',
   reject: '/tested/subpackage/review/reject',
 })
+// 打印
+const printPage = () => {
+  printPageApi({
+    id: ruleForm.value.id,
+    pdf: true,
+  }).then((res) => {
+    // printContent(res.data)
+    printContent(getFiles(res.data, 'application/pdf;chartset=UTF-8'))
+  })
+}
 </script>
 
 <template>
@@ -273,6 +329,9 @@
         <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
           取消
         </el-button>
+        <el-button v-if="statusName === '全部'" type="primary" @click="printPage">
+          打印
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
@@ -298,12 +357,26 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="申请单位" prop="createCompanyId">
-                <el-input v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled />
+                <!-- <el-input v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled /> -->
+                <el-select v-if="isAdmin && !$route.path.includes('detail')" v-model="ruleForm.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">
+                  <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+                <el-input v-else v-model.trim="ruleForm.createCompanyName" placeholder="申请单位" disabled style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="申请部门" prop="createDeptId">
-                <el-input v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled />
+                <!-- <el-input v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled /> -->
+                <el-tree-select
+                  v-if="isAdmin && !$route.path.includes('detail')"
+                  v-model="ruleForm.createDeptId"
+                  style="width: 100%;"
+                  :data="deptList"
+                  :render-after-expand="false"
+                  check-strictly
+                  placeholder="申请部门"
+                />
+                <el-input v-else v-model.trim="ruleForm.createDeptName" placeholder="申请部门" disabled style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -357,19 +430,19 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="地址" prop="address">
-                <el-input v-model.trim="ruleForm.address" placeholder="地址" disabled />
+                <el-input v-model.trim="ruleForm.address" :placeholder="$route.path.includes('detail') ? ' ' : '地址'" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="邮编" prop="postcode">
-                <el-input v-model.trim="ruleForm.postcode" placeholder="邮编" disabled />
+                <el-input v-model.trim="ruleForm.postcode" :placeholder="$route.path.includes('detail') ? ' ' : '邮编'" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="传真" prop="fax">
-                <el-input v-model.trim="ruleForm.fax" placeholder="传真" disabled />
+                <el-input v-model.trim="ruleForm.fax" :placeholder="$route.path.includes('detail') ? ' ' : '传真'" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="6">
diff --git a/src/views/tested/subpackage/task/components/list.vue b/src/views/tested/subpackage/task/components/list.vue
index 20d9a10..a22b440 100644
--- a/src/views/tested/subpackage/task/components/list.vue
+++ b/src/views/tested/subpackage/task/components/list.vue
@@ -3,7 +3,8 @@
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import ApprovalDialog from './ApprovalDialog.vue'
-import { cancelReview, deleteReview, exportReview, getListPage, submitReview } from '@/api/eqpt/subpackage/task'
+import { cancelReview, deleteReview, exportReview, getListPage1, submitReview } from '@/api/eqpt/subpackage/task'
+import { getListPage } from '@/api/eqpt/subpackage/directory'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 import { getAdminDept, getUserDept } from '@/api/system/user'
@@ -97,7 +98,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  getListPage(listQuery, $props.statusName).then((response) => {
+  getListPage1(listQuery, $props.statusName).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     listLoading.value = false
@@ -211,7 +212,7 @@
       ids: selectList.value.map(item => item.id),
     }
     exportReview(data).then((res) => {
-      exportFile(res.data, '分包方评审表')
+      exportFile(res.data, '外送任务单')
       loading.close()
     })
       .catch((_) => {
@@ -285,6 +286,8 @@
 // 创建单位
 const companyList = ref<{ id: string; value: string; name: string }[]>([])
 const deptList = ref<any>([])
+// 检定单位
+const measureCompanyList = ref<{ id: string; value: string; name: string }[]>()
 const fetchCommpany = () => {
   // 获取单位
   getUserDept().then((res) => {
@@ -303,6 +306,10 @@
       ]
     }
   })
+  getListPage({ offset: 1, limit: 9999 }, '全部').then((res) => {
+    console.log(res.data, '1111')
+    measureCompanyList.value = res.data.rows.map((item: any) => ({ name: item.companyName, value: item.id, id: item.id }))
+  })
 }
 fetchCommpany()
 watch(() => listQuery.createCompanyId, (newVal) => {
@@ -328,7 +335,10 @@
         <el-input v-model.trim="listQuery.orderNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable />
+        <!-- <el-input v-model.trim="listQuery.subcontractorCompanyName" placeholder="外送机构名称" clearable /> -->
+        <el-select v-model="listQuery.subcontractorCompanyName" filterable placeholder="外送机构名称" style="width: 100%;">
+          <el-option v-for="item in measureCompanyList" :key="item.id" :label="item.name" :value="item.name" />
+        </el-select>
       </search-item>
       <search-item>
         <el-select v-model="listQuery.createCompanyId" clearable filterable placeholder="申请单位" style="width: 100%;">