diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
diff --git a/src/views/business/manager/interchangeReceipt/list.vue b/src/views/business/manager/interchangeReceipt/list.vue
index 5572eef..f97b4b9 100644
--- a/src/views/business/manager/interchangeReceipt/list.vue
+++ b/src/views/business/manager/interchangeReceipt/list.vue
@@ -4,11 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery } from './interchangeReceipt-interface'
-import { printJSON } from '@/utils/printUtils'
+import { printJSON, printPdf } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import {
+  batchPrint,
   deleteReceiptList,
   getReceiptList,
+  getStream,
 } from '@/api/business/manager/interchangeReceipt'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -138,11 +140,6 @@
   $router.push(`/interchangeReceipt/${pageType}/${row.id}`)
 }
 
-// 点击打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
-
 // 点击删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
@@ -168,12 +165,42 @@
 }
 
 // 点击批量打印
-const batchPrint = () => {
+const handleBatchPrint = () => {
   if (checkoutList.value.length > 5) {
     ElMessage.warning('最多可进行5个交接单的打印')
     return false
   }
-  ElMessage.info('敬请期待')
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const params = checkoutList.value.map((item) => {
+    return {
+      id: item,
+    }
+  })
+  batchPrint(params).then((res) => {
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+    loading.close()
+  }).catch(() => { loading.close() })
+}
+const pdfStream = ref() as any // pdf流
+// 点击打印
+const print = (row: any) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: row.id, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
 }
 
 // ---------------------------------------钩子----------------------------------------
@@ -278,7 +305,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="batchPrint" />
+        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="handleBatchPrint" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -316,7 +343,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="print"
+                @click="print(row)"
               >
                 打印
               </el-button>

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
diff --git a/src/views/business/manager/interchangeReceipt/list.vue b/src/views/business/manager/interchangeReceipt/list.vue
index 5572eef..f97b4b9 100644
--- a/src/views/business/manager/interchangeReceipt/list.vue
+++ b/src/views/business/manager/interchangeReceipt/list.vue
@@ -4,11 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery } from './interchangeReceipt-interface'
-import { printJSON } from '@/utils/printUtils'
+import { printJSON, printPdf } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import {
+  batchPrint,
   deleteReceiptList,
   getReceiptList,
+  getStream,
 } from '@/api/business/manager/interchangeReceipt'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -138,11 +140,6 @@
   $router.push(`/interchangeReceipt/${pageType}/${row.id}`)
 }
 
-// 点击打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
-
 // 点击删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
@@ -168,12 +165,42 @@
 }
 
 // 点击批量打印
-const batchPrint = () => {
+const handleBatchPrint = () => {
   if (checkoutList.value.length > 5) {
     ElMessage.warning('最多可进行5个交接单的打印')
     return false
   }
-  ElMessage.info('敬请期待')
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const params = checkoutList.value.map((item) => {
+    return {
+      id: item,
+    }
+  })
+  batchPrint(params).then((res) => {
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+    loading.close()
+  }).catch(() => { loading.close() })
+}
+const pdfStream = ref() as any // pdf流
+// 点击打印
+const print = (row: any) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: row.id, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
 }
 
 // ---------------------------------------钩子----------------------------------------
@@ -278,7 +305,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="batchPrint" />
+        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="handleBatchPrint" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -316,7 +343,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="print"
+                @click="print(row)"
               >
                 打印
               </el-button>
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index 1876042..fb3cbb0 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -18,7 +18,7 @@
 import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/manager/order'
@@ -517,7 +517,10 @@
 // 监听委托方变化，请求使用部门
 watch(() => form.value.customerId, (newVal) => {
   if (newVal) {
-    getDeptTreeList({ pid: newVal }).then((res) => {
+    // getDeptTreeList({ pid: newVal }).then((res) => {
+    //   deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    // })
+    getAllDeptList({ pid: newVal }).then((res) => {
       deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
     })
   }
@@ -650,7 +653,7 @@
 
             <el-col :span="6">
               <el-form-item label="是否现场检定:" prop="isOnSiteCheck">
-                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail'">
+                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')">
                   <el-radio :label="1">
                     是
                   </el-radio>

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
diff --git a/src/views/business/manager/interchangeReceipt/list.vue b/src/views/business/manager/interchangeReceipt/list.vue
index 5572eef..f97b4b9 100644
--- a/src/views/business/manager/interchangeReceipt/list.vue
+++ b/src/views/business/manager/interchangeReceipt/list.vue
@@ -4,11 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery } from './interchangeReceipt-interface'
-import { printJSON } from '@/utils/printUtils'
+import { printJSON, printPdf } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import {
+  batchPrint,
   deleteReceiptList,
   getReceiptList,
+  getStream,
 } from '@/api/business/manager/interchangeReceipt'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -138,11 +140,6 @@
   $router.push(`/interchangeReceipt/${pageType}/${row.id}`)
 }
 
-// 点击打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
-
 // 点击删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
@@ -168,12 +165,42 @@
 }
 
 // 点击批量打印
-const batchPrint = () => {
+const handleBatchPrint = () => {
   if (checkoutList.value.length > 5) {
     ElMessage.warning('最多可进行5个交接单的打印')
     return false
   }
-  ElMessage.info('敬请期待')
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const params = checkoutList.value.map((item) => {
+    return {
+      id: item,
+    }
+  })
+  batchPrint(params).then((res) => {
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+    loading.close()
+  }).catch(() => { loading.close() })
+}
+const pdfStream = ref() as any // pdf流
+// 点击打印
+const print = (row: any) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: row.id, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
 }
 
 // ---------------------------------------钩子----------------------------------------
@@ -278,7 +305,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="batchPrint" />
+        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="handleBatchPrint" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -316,7 +343,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="print"
+                @click="print(row)"
               >
                 打印
               </el-button>
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index 1876042..fb3cbb0 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -18,7 +18,7 @@
 import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/manager/order'
@@ -517,7 +517,10 @@
 // 监听委托方变化，请求使用部门
 watch(() => form.value.customerId, (newVal) => {
   if (newVal) {
-    getDeptTreeList({ pid: newVal }).then((res) => {
+    // getDeptTreeList({ pid: newVal }).then((res) => {
+    //   deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    // })
+    getAllDeptList({ pid: newVal }).then((res) => {
       deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
     })
   }
@@ -650,7 +653,7 @@
 
             <el-col :span="6">
               <el-form-item label="是否现场检定:" prop="isOnSiteCheck">
-                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail'">
+                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')">
                   <el-radio :label="1">
                     是
                   </el-radio>
diff --git a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
index b5be0e8..92e8563 100644
--- a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
@@ -28,4 +28,5 @@
   fullScaleValue?: string // 指针式仪表满量程值---用于指针式万用表最大允许误差计算
   fullScaleValueUnit?: string // 指针式仪表满量程值单位---用于指针式万用表最大允许误差计算
   resolutionDigit?: number // 分辨力保留几位小数
+
 }

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
diff --git a/src/views/business/manager/interchangeReceipt/list.vue b/src/views/business/manager/interchangeReceipt/list.vue
index 5572eef..f97b4b9 100644
--- a/src/views/business/manager/interchangeReceipt/list.vue
+++ b/src/views/business/manager/interchangeReceipt/list.vue
@@ -4,11 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery } from './interchangeReceipt-interface'
-import { printJSON } from '@/utils/printUtils'
+import { printJSON, printPdf } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import {
+  batchPrint,
   deleteReceiptList,
   getReceiptList,
+  getStream,
 } from '@/api/business/manager/interchangeReceipt'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -138,11 +140,6 @@
   $router.push(`/interchangeReceipt/${pageType}/${row.id}`)
 }
 
-// 点击打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
-
 // 点击删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
@@ -168,12 +165,42 @@
 }
 
 // 点击批量打印
-const batchPrint = () => {
+const handleBatchPrint = () => {
   if (checkoutList.value.length > 5) {
     ElMessage.warning('最多可进行5个交接单的打印')
     return false
   }
-  ElMessage.info('敬请期待')
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const params = checkoutList.value.map((item) => {
+    return {
+      id: item,
+    }
+  })
+  batchPrint(params).then((res) => {
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+    loading.close()
+  }).catch(() => { loading.close() })
+}
+const pdfStream = ref() as any // pdf流
+// 点击打印
+const print = (row: any) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: row.id, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
 }
 
 // ---------------------------------------钩子----------------------------------------
@@ -278,7 +305,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="batchPrint" />
+        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="handleBatchPrint" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -316,7 +343,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="print"
+                @click="print(row)"
               >
                 打印
               </el-button>
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index 1876042..fb3cbb0 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -18,7 +18,7 @@
 import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/manager/order'
@@ -517,7 +517,10 @@
 // 监听委托方变化，请求使用部门
 watch(() => form.value.customerId, (newVal) => {
   if (newVal) {
-    getDeptTreeList({ pid: newVal }).then((res) => {
+    // getDeptTreeList({ pid: newVal }).then((res) => {
+    //   deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    // })
+    getAllDeptList({ pid: newVal }).then((res) => {
       deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
     })
   }
@@ -650,7 +653,7 @@
 
             <el-col :span="6">
               <el-form-item label="是否现场检定:" prop="isOnSiteCheck">
-                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail'">
+                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')">
                   <el-radio :label="1">
                     是
                   </el-radio>
diff --git a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
index b5be0e8..92e8563 100644
--- a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
@@ -28,4 +28,5 @@
   fullScaleValue?: string // 指针式仪表满量程值---用于指针式万用表最大允许误差计算
   fullScaleValueUnit?: string // 指针式仪表满量程值单位---用于指针式万用表最大允许误差计算
   resolutionDigit?: number // 分辨力保留几位小数
+
 }
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index 959033c..62a9951 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -71,6 +71,7 @@
   vpriUnit: 'V', // 电压转换系数单位
   vsec: '', // 电压转换系数
   vsecUnit: 'V', // 电压转换系数单位
+  remark: '', // 备注
 })
 const helpInstruction = ref('') // 辅助字段
 const helpFieldInstruction = ref('') // 辅助字段说明
@@ -523,6 +524,7 @@
     form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 标准装置code
     form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 标准装置名称
     infoId.value = res.data.id
+    form.value.remark = res.data.remark // 备注
     emits('giveInfoId', infoId.value)
     itemCategoryName.value = res.data.itemCategoryName // 检定项分类名称
     measureDataCalibratorList.value = res.data.equipmentList.map((item: any) => {
@@ -744,17 +746,19 @@
   fetchClassificationListQuery.value.categoryName = categoryName // 设备分类型名称
   fetchClassificationListQuery.value.belongStandardEquipment = belongStandardEquipment // 检校标准装置名称
   getClassificationList(fetchClassificationListQuery.value).then((response) => {
-    if (user.bizLabCode === 'H') { // 当前用户是海口实验室的
-      form.value.measureAddress = response.data.rows[0].labH
-    }
-    else if (user.bizLabCode === 'X') { // 当前用户是西昌实验室的
-      form.value.measureAddress = response.data.rows[0].labX
-    }
-    if (form.value.measureAddress) {
-      const index = positionList.value.findIndex((item: { name: string }) => item.name === form.value.measureAddress)
-      if (index !== -1) {
-        form.value.temperature = positionList.value[index].temperature
-        form.value.humidity = positionList.value[index].humidity
+    if (pageType.value === 'add') {
+      if (user.bizLabCode === 'H') { // 当前用户是海口实验室的
+        form.value.measureAddress = response.data.rows[0].labH
+      }
+      else if (user.bizLabCode === 'X') { // 当前用户是西昌实验室的
+        form.value.measureAddress = response.data.rows[0].labX
+      }
+      if (form.value.measureAddress) {
+        const index = positionList.value.findIndex((item: { name: string }) => item.name === form.value.measureAddress)
+        if (index !== -1) {
+          form.value.temperature = positionList.value[index].temperature
+          form.value.humidity = positionList.value[index].humidity
+        }
       }
     }
     if (response.data.rows.length) {
@@ -1649,6 +1653,30 @@
     />
   </detail-block>
 
+  <el-form
+    v-if="current === 'measure-data'"
+    ref="formRef"
+    :model="form"
+    label-width="140"
+    label-position="right"
+    style="margin-top: 20px;"
+  >
+    <el-row>
+      <!-- 备注 -->
+      <el-col :span="12">
+        <el-form-item label="备注:" prop="remark">
+          <el-input
+            v-model="form.remark"
+            autosize
+            type="textarea"
+            :disabled="pageType === 'detail'"
+            :placeholder="pageType === 'detail' ? ' ' : '请输入备注'"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+
   <!-- 选择标准装置组件 -->
   <select-standard
     ref="selectStandardRef"

diff --git a/src/api/business/manager/interchangeReceipt.ts b/src/api/business/manager/interchangeReceipt.ts
index 20e6441..588d0c9 100644
--- a/src/api/business/manager/interchangeReceipt.ts
+++ b/src/api/business/manager/interchangeReceipt.ts
@@ -1,6 +1,6 @@
 /**
  * 设备交接单
-*/
+ */
 import request from '../../index'
 import type { IListQuery } from '@/views/business/manager/interchangeReceipt/interchangeReceipt-interface'
 const prefix = '/business/interchange'
@@ -61,7 +61,14 @@
 }
 
 // 查询样品列表
-export function getSampleList(data: { customerId: string; customerName: string; sampleName: string; sampleNo: string; offset: number; limit: number }) {
+export function getSampleList(data: {
+  customerId: string
+  customerName: string
+  sampleName: string
+  sampleNo: string
+  offset: number
+  limit: number
+}) {
   return request({
     url: `${prefix}/listPageByInterchange?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
@@ -78,3 +85,22 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/interchange/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 批量打印
+export function batchPrint(data: any) {
+  return request({
+    url: '/business/interchange/batchPrint',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index eaf221c..de9e792 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -90,6 +90,7 @@
   })
 }
 
+// 组织部门
 export function getDept(params?: { deptId?: string }) {
   return request({
     url: '/system/dept/listPage',
@@ -97,3 +98,4 @@
     params,
   })
 }
+
diff --git a/src/components.d.ts b/src/components.d.ts
index 37a7e06..2461bf8 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -30,7 +30,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/NormalTable copy/index.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index a884b89..bd7042d 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -51,6 +51,10 @@
     type: Boolean,
     default: false,
   },
+  deptNotControlledByPermissions: { // 查询部门不熟当前用户的权限控制
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 // ------------------------------定义props参数---------------------------------------------
@@ -106,11 +110,20 @@
       })
     }
     else {
-      getDeptTreeList().then((res) => {
-        const list = res.data
-        dictStore.setAllDeptList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
     }
   }
   else { // 如果指定了需要展示的部门类型
@@ -139,11 +152,20 @@
       })
     }
     else {
-      getDeptTreeList({ deptType: props.deptType }).then((res) => {
-        const list = res.data
-        dictStore.setAllCompanyList(list)
-        refreshList(list)
-      })
+      if (props.deptNotControlledByPermissions) { // 无权限控制
+        getDept().then((res) => {
+          const list = res.data
+          dictStore.setAllDeptList(list)
+          refreshList(list)
+        })
+      }
+      else {
+        getDeptTreeList({ deptType: props.deptType }).then((res) => {
+          const list = res.data
+          dictStore.setAllCompanyList(list)
+          refreshList(list)
+        })
+      }
     }
   }
 }
diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue
index 64cf1f3..24f6843 100644
--- a/src/components/dialog/selectDeptTree.vue
+++ b/src/components/dialog/selectDeptTree.vue
@@ -1,13 +1,23 @@
 <!-- 部门树选择 -->
 <script setup lang="ts" name="SelectEmployeesDialog">
+import { Switch } from '@element-plus/icons-vue'
 import { getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['change'])
 const visibleDialog = ref(false)
-const selectDeptTreeRef = ref()
 const list = ref([]) as any
 const checkoutList = ref([]) as any
 const loading = ref(false)
+const tree = ref()
+// 全部组织id, 用于全选
+const allDeptIds = ref([])
+// 树展开状态
+const treeExpand = ref(true)
+// 全选
+const nodeCheckedAll = ref(false)
+// 父子联动
+const treeCheckStrictly = ref(false)
+
 // 查询参数
 const listQuery = ref({
   deptName: '', // 部门名称
@@ -18,13 +28,14 @@
   loading.value = true
   getDeptList(listQuery.value).then((res) => {
     const tempList = res.data.list
+    allDeptIds.value = tempList.map((item: { id: string }) => item.id)
     list.value = toTreeList(tempList, '0', false)
     loading.value = false
   })
 }
 
 const handleCheckChange = () => {
-  checkoutList.value = selectDeptTreeRef.value.getCheckedNodes()
+  checkoutList.value = tree.value.getCheckedNodes()
   console.log('全部选中的节点')
   console.log(checkoutList.value)
 }
@@ -51,22 +62,62 @@
   closeDialog()
 }
 
+/**
+ * 改变树节点展开状态，递归
+ * @param node 改变的节点
+ * @param value 展开/折叠
+ */
+function changeTreeNodeStatus(node: any, value: boolean) {
+  node.expanded = value // 给当前节点赋值
+  if (node.childNodes) {
+    for (let i = 0; i < node.childNodes.length; i++) { // 给子节点赋值
+      node.childNodes[i].expanded = value
+      if (node.childNodes[i].childNodes && node.childNodes[i].childNodes!.length > 0) { // 如果子节点还有子节点，递归
+        changeTreeNodeStatus(node.childNodes[i], value)
+      }
+    }
+  }
+}
+
+// 点击展开或折叠按钮
+function expandOrCollapse() {
+  treeExpand.value = !treeExpand.value
+  changeTreeNodeStatus(tree.value.store.root, treeExpand.value)
+}
+// 全选或全不选
+function handleCheckedTreeNodeAll(value: any) {
+  tree.value.setCheckedKeys(value ? allDeptIds.value : [])
+}
+
 defineExpose({ initDialog })
 </script>
 
 <template>
   <el-dialog v-model="visibleDialog" title="选择部门" width="500px" append-to-body>
+    <div class="tool-line">
+      <el-button :icon="Switch" style="margin-bottom: 10px;" @click="expandOrCollapse">
+        展开/折叠
+      </el-button>
+      <el-checkbox v-model="nodeCheckedAll" style="margin-left: 16px;" @change="handleCheckedTreeNodeAll">
+        全选
+      </el-checkbox>
+      <el-checkbox v-model="treeCheckStrictly">
+        父子联动
+      </el-checkbox>
+    </div>
     <el-tree
-      ref="selectDeptTreeRef"
+      ref="tree"
       v-loading="loading"
       :data="list"
       show-checkbox
       :accordion="true"
       :default-expand-all="true"
+      :check-strictly="!treeCheckStrictly"
       :props="{
         children: 'children',
         label: 'fullName',
       }"
+      node-key="id"
       @check-change="handleCheckChange"
     />
     <template #footer>
diff --git a/src/components/showPhoto/index.vue b/src/components/showPhoto/index.vue
index 1882f61..07a7a7a 100644
--- a/src/components/showPhoto/index.vue
+++ b/src/components/showPhoto/index.vue
@@ -16,6 +16,10 @@
     type: String,
     default: '100px',
   },
+  fit: {
+    type: String,
+    default: 'cover',
+  },
 })
 const isPhoto = computed(() => {
   return props.minioFileName.split('.')[1] === 'png' || props.minioFileName.split('.')[1] === 'jpg' || props.minioFileName.split('.')[1] === 'jpeg'
@@ -45,7 +49,7 @@
       :style="{ width: props.width, height: props.height }"
       :src="url"
       :preview-src-list="[url]"
-      fit="cover"
+      :fit="props.fit"
     />
     <el-link
       v-else :href="url" type="primary"
diff --git a/src/views/business/manager/interchangeReceipt/detail.vue b/src/views/business/manager/interchangeReceipt/detail.vue
index 95ce66e..53faf03 100644
--- a/src/views/business/manager/interchangeReceipt/detail.vue
+++ b/src/views/business/manager/interchangeReceipt/detail.vue
@@ -22,6 +22,7 @@
 import {
   addInterchangeReceipt,
   getInterchangeReceiptDetail,
+  getStream,
   updateInterchangeReceipt,
 } from '@/api/business/manager/interchangeReceipt'
 import { getUserList } from '@/api/system/user'
@@ -29,7 +30,7 @@
 import { toTreeList } from '@/utils/structure'
 import canvasDialog from '@/components/canvas/canvasDialog.vue'
 import { uploadApi } from '@/api/system/notice'
-
+import { printJSON, printPdf } from '@/utils/printUtils'
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -38,6 +39,7 @@
 const user = useUserStore() // 用户信息
 const pageType = ref('add') // 页面类型: add, edit, detail
 const infoId = ref('') // id
+const pdfStream = ref() as any // pdf流
 const ruleFormRef = ref() // 表单ref
 // 表单
 const form: Ref<IForm> = ref({
@@ -347,7 +349,10 @@
           labCode: user.bizLabCode, // 实验室代码
         }
         if (pageType.value === 'edit') { // 编辑
-          updateInterchangeReceipt(params).then(() => {
+          updateInterchangeReceipt({
+            ...params,
+            id: infoId.value,
+          }).then(() => {
             ElMessage.success('已保存')
             loading.close()
             pageType.value = 'detail'
@@ -358,7 +363,8 @@
         if (pageType.value === 'add') { // 新建
           addInterchangeReceipt(params).then((res) => {
             ElMessage.success('已保存')
-            form.value.interchangeNo = res.data
+            form.value.interchangeNo = res.data.interchangeNo
+            infoId.value = res.data.id
             loading.close()
             pageType.value = 'detail'
           }).catch(() => {
@@ -373,10 +379,7 @@
 const edit = () => {
   pageType.value = 'edit'
 }
-// 打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
+
 // ---------------------------------------------扫描--------------------------------------
 const scanSampleRef = ref()
 // 点击扫描收添加
@@ -537,38 +540,27 @@
       form.value.signatureTime = dayjs().format('YYYY-MM-DD HH-mm:ss') // 签名时间
       ElMessage.success('上传成功')
       canvasDialogRef.value.close() // 关闭对话框
-      loading.close()
-      ElMessageBox.confirm(
-        '签名成功，是否保存签名?',
-        'Warning',
-        {
-          confirmButtonText: '保存',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      )
-        .then(() => {
-          // 保存签名
-          const params = {
-            ...form.value,
-            delivererTel: form.value.delivererTel, // 委托方电话
-            sampleIdList: list.value.map(item => item.sampleId),
-            deviceTotal: list.value.length, // 设备总量
-            labCode: user.bizLabCode, // 实验室代码
-          }
-          const loading = ElLoading.service({
-            lock: true,
-            background: 'rgba(255, 255, 255, 0.8)',
-          })
-          updateInterchangeReceipt(params).then(() => {
-            printSignaturePicture.value = res.data[0] // 打印签名
-            ElMessage.success('已保存签名')
-            loading.close()
-            pageType.value = 'detail'
-          }).catch(() => {
-            loading.close()
-          })
-        })
+      // 保存签名
+      const params = {
+        ...form.value,
+        delivererTel: form.value.delivererTel, // 委托方电话
+        sampleIdList: list.value.map(item => item.sampleId),
+        deviceTotal: list.value.length, // 设备总量
+        labCode: user.bizLabCode, // 实验室代码
+        id: infoId.value,
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        background: 'rgba(255, 255, 255, 0.8)',
+      })
+      updateInterchangeReceipt(params).then(() => {
+        printSignaturePicture.value = res.data[0] // 打印签名
+        ElMessage.success('已保存签名')
+        loading.close()
+        pageType.value = 'detail'
+      }).catch(() => {
+        loading.close()
+      })
     }
     else {
       ElMessage.error(res.message)
@@ -576,6 +568,21 @@
     }
   })
 }
+
+// 点击打印
+const print = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
+}
 // ----------------------------------------------------钩子----------------------------------------------------
 onMounted(async () => {
   getDict().then(() => {
@@ -944,6 +951,7 @@
             <show-photo
               style="position: absolute;left: 220px; top: -40px;"
               :minio-file-name="minioFileNameAutograph"
+              fit="contain"
             />
           </div>
           <div style="margin-top: 30px;">
@@ -957,7 +965,7 @@
         <div class="deliverer-time">
           <div style="display: flex;">
             <span class="text-title">送检人/取件人:</span>
-            <show-photo style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
+            <show-photo fit="contain" style="position: absolute;left: 220px; top: -40px;" :minio-file-name="printSignaturePicture" />
           </div>
           <div style="margin-top: 30px;">
             <span class="time" style="margin-top: 20px;">时ㅤ间: </span>
diff --git a/src/views/business/manager/interchangeReceipt/list.vue b/src/views/business/manager/interchangeReceipt/list.vue
index 5572eef..f97b4b9 100644
--- a/src/views/business/manager/interchangeReceipt/list.vue
+++ b/src/views/business/manager/interchangeReceipt/list.vue
@@ -4,11 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IList, IListQuery } from './interchangeReceipt-interface'
-import { printJSON } from '@/utils/printUtils'
+import { printJSON, printPdf } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import {
+  batchPrint,
   deleteReceiptList,
   getReceiptList,
+  getStream,
 } from '@/api/business/manager/interchangeReceipt'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -138,11 +140,6 @@
   $router.push(`/interchangeReceipt/${pageType}/${row.id}`)
 }
 
-// 点击打印
-const print = () => {
-  ElMessage.info('敬请期待')
-}
-
 // 点击删除
 const del = (row: IList) => {
   ElMessageBox.confirm(
@@ -168,12 +165,42 @@
 }
 
 // 点击批量打印
-const batchPrint = () => {
+const handleBatchPrint = () => {
   if (checkoutList.value.length > 5) {
     ElMessage.warning('最多可进行5个交接单的打印')
     return false
   }
-  ElMessage.info('敬请期待')
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const params = checkoutList.value.map((item) => {
+    return {
+      id: item,
+    }
+  })
+  batchPrint(params).then((res) => {
+    const pdfStream = new Blob([res.data])
+    const blobUrl = URL.createObjectURL(pdfStream)
+    printPdf(blobUrl)
+    loading.close()
+  }).catch(() => { loading.close() })
+}
+const pdfStream = ref() as any // pdf流
+// 点击打印
+const print = (row: any) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: row.id, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    loading.close()
+    const blobUrl = URL.createObjectURL(pdfStream.value)
+    printPdf(blobUrl)
+  })
 }
 
 // ---------------------------------------钩子----------------------------------------
@@ -278,7 +305,7 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="batchPrint" />
+        <icon-button icon="icon-batchPrint" title="批量打印" type="primary" @click="handleBatchPrint" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -316,7 +343,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="print"
+                @click="print(row)"
               >
                 打印
               </el-button>
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index 1876042..fb3cbb0 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -18,7 +18,7 @@
 import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import useUserStore from '@/store/modules/user'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import { getAllDeptList, getDept, getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 
 import { addOrder, getOrderDetail, updateOrder } from '@/api/business/manager/order'
@@ -517,7 +517,10 @@
 // 监听委托方变化，请求使用部门
 watch(() => form.value.customerId, (newVal) => {
   if (newVal) {
-    getDeptTreeList({ pid: newVal }).then((res) => {
+    // getDeptTreeList({ pid: newVal }).then((res) => {
+    //   deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
+    // })
+    getAllDeptList({ pid: newVal }).then((res) => {
       deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any
     })
   }
@@ -650,7 +653,7 @@
 
             <el-col :span="6">
               <el-form-item label="是否现场检定:" prop="isOnSiteCheck">
-                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail'">
+                <el-radio-group v-model="form.isOnSiteCheck" :disabled="pageType === 'detail' || (pageType === 'edit' && form.receiveStatus === '2')">
                   <el-radio :label="1">
                     是
                   </el-radio>
diff --git a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
index b5be0e8..92e8563 100644
--- a/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/first/first-interface.ts
@@ -28,4 +28,5 @@
   fullScaleValue?: string // 指针式仪表满量程值---用于指针式万用表最大允许误差计算
   fullScaleValueUnit?: string // 指针式仪表满量程值单位---用于指针式万用表最大允许误差计算
   resolutionDigit?: number // 分辨力保留几位小数
+
 }
diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index 959033c..62a9951 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -71,6 +71,7 @@
   vpriUnit: 'V', // 电压转换系数单位
   vsec: '', // 电压转换系数
   vsecUnit: 'V', // 电压转换系数单位
+  remark: '', // 备注
 })
 const helpInstruction = ref('') // 辅助字段
 const helpFieldInstruction = ref('') // 辅助字段说明
@@ -523,6 +524,7 @@
     form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 标准装置code
     form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 标准装置名称
     infoId.value = res.data.id
+    form.value.remark = res.data.remark // 备注
     emits('giveInfoId', infoId.value)
     itemCategoryName.value = res.data.itemCategoryName // 检定项分类名称
     measureDataCalibratorList.value = res.data.equipmentList.map((item: any) => {
@@ -744,17 +746,19 @@
   fetchClassificationListQuery.value.categoryName = categoryName // 设备分类型名称
   fetchClassificationListQuery.value.belongStandardEquipment = belongStandardEquipment // 检校标准装置名称
   getClassificationList(fetchClassificationListQuery.value).then((response) => {
-    if (user.bizLabCode === 'H') { // 当前用户是海口实验室的
-      form.value.measureAddress = response.data.rows[0].labH
-    }
-    else if (user.bizLabCode === 'X') { // 当前用户是西昌实验室的
-      form.value.measureAddress = response.data.rows[0].labX
-    }
-    if (form.value.measureAddress) {
-      const index = positionList.value.findIndex((item: { name: string }) => item.name === form.value.measureAddress)
-      if (index !== -1) {
-        form.value.temperature = positionList.value[index].temperature
-        form.value.humidity = positionList.value[index].humidity
+    if (pageType.value === 'add') {
+      if (user.bizLabCode === 'H') { // 当前用户是海口实验室的
+        form.value.measureAddress = response.data.rows[0].labH
+      }
+      else if (user.bizLabCode === 'X') { // 当前用户是西昌实验室的
+        form.value.measureAddress = response.data.rows[0].labX
+      }
+      if (form.value.measureAddress) {
+        const index = positionList.value.findIndex((item: { name: string }) => item.name === form.value.measureAddress)
+        if (index !== -1) {
+          form.value.temperature = positionList.value[index].temperature
+          form.value.humidity = positionList.value[index].humidity
+        }
       }
     }
     if (response.data.rows.length) {
@@ -1649,6 +1653,30 @@
     />
   </detail-block>
 
+  <el-form
+    v-if="current === 'measure-data'"
+    ref="formRef"
+    :model="form"
+    label-width="140"
+    label-position="right"
+    style="margin-top: 20px;"
+  >
+    <el-row>
+      <!-- 备注 -->
+      <el-col :span="12">
+        <el-form-item label="备注:" prop="remark">
+          <el-input
+            v-model="form.remark"
+            autosize
+            type="textarea"
+            :disabled="pageType === 'detail'"
+            :placeholder="pageType === 'detail' ? ' ' : '请输入备注'"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+
   <!-- 选择标准装置组件 -->
   <select-standard
     ref="selectStandardRef"
diff --git a/src/views/business/taskMeasure/measureData/measureData-interface.ts b/src/views/business/taskMeasure/measureData/measureData-interface.ts
index 098984c..3621221 100644
--- a/src/views/business/taskMeasure/measureData/measureData-interface.ts
+++ b/src/views/business/taskMeasure/measureData/measureData-interface.ts
@@ -77,6 +77,8 @@
   vpriUnit: string // 电压转换系数单位
   vsec: string // 电压转换系数
   vsecUnit: string // 电压转换系数单位
+
+  remark?: string // 备注
 }
 
 export interface ITempelateForm {