diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 114d99c..3ea677c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,4 +1,3 @@
-<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -103,6 +102,8 @@
 const initDialog = (row: any) => {
   title.value = row.title
   name.value = row.name
+  console.log(title.value, name.value)
+
   fetchData()
   // 状态管理
   if ($route.query.title !== '新建') {

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 114d99c..3ea677c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,4 +1,3 @@
-<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -103,6 +102,8 @@
 const initDialog = (row: any) => {
   title.value = row.title
   name.value = row.name
+  console.log(title.value, name.value)
+
   fetchData()
   // 状态管理
   if ($route.query.title !== '新建') {
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index d15e456..7514689 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -375,6 +375,7 @@
       </el-col>
       <el-col :span="8">
         <bench-col
+          style="overflow: auto;"
           icon="icon-calendar"
           title="工作日历"
           :height="bigBlockHeight"

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 114d99c..3ea677c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,4 +1,3 @@
-<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -103,6 +102,8 @@
 const initDialog = (row: any) => {
   title.value = row.title
   name.value = row.name
+  console.log(title.value, name.value)
+
   fetchData()
   // 状态管理
   if ($route.query.title !== '新建') {
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index d15e456..7514689 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -375,6 +375,7 @@
       </el-col>
       <el-col :span="8">
         <bench-col
+          style="overflow: auto;"
           icon="icon-calendar"
           title="工作日历"
           :height="bigBlockHeight"
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index 8295b9e..bafe9a5 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -5,10 +5,12 @@
 import type { DateModelType } from 'element-plus'
 import { number } from 'echarts'
 import type { IApprovalMessageListQuery } from '../workbench-interface'
+import { useChangePage } from './useChangePage'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getApprovalMessageList } from '@/api/workbench/workbench'
+import { changeWorkbenchApproveStatus, getApprovalMessageList } from '@/api/workbench/workbench'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+
 import { formUrl } from '@/utils/scheduleDict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -28,7 +30,7 @@
   endTime: '', // 通知结束时间
   messageSourceModule: '', // 来源模块（字典code）
   startTime: '', // 通知开始时间
-  status: '', // 已读1未读0
+  status: '0', // 已读1未读0
   offset: 1,
   limit: 20,
 })
@@ -41,9 +43,9 @@
 const columns = ref<TableColumn[]>([
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '主题', value: 'messageTitle', align: 'center' },
-  // { text: '来源模块', value: 'messageSourceModuleName', align: 'center' }
-  { text: '来源模块', value: 'messageContent', align: 'center' },
-  { text: '处理情况', value: 'statusName', align: 'center', width: '100' },
+  { text: '来源模块', value: 'messageSourceModuleName', align: 'center' },
+  { text: '具体内容', value: 'messageContent', align: 'center' },
+  { text: '处理情况', value: 'statusName', align: 'center', width: '100', styleFilter: (row: any) => { return row.statusName == '未处理' ? 'color: #f56c6c' : row.statusName == '已处理' ? 'color: #6ebf8a' : '' } },
 ])
 
 // 获取审批提醒列表页
@@ -55,12 +57,13 @@
   }
   const param = {
     ...listQuery.value,
-    // status: Number(listQuery.value.status),
+    status: listQuery.value.status === '' ? '' : Number(listQuery.value.status),
   }
   getApprovalMessageList(param).then((response) => {
-    list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
+    list.value = response.data.rows.map((item: { messageContent: string; statusName: string ; status: string; messageTitle: string }) => {
       return {
         ...item,
+        messageContent: item.messageTitle === '结果通知' ? `${item.messageContent}审批已通过` : item.messageContent,
         statusName: item.status == '1' ? '已处理' : '未处理',
       }
     })
@@ -92,7 +95,7 @@
     endTime: '', // 通知结束时间
     messageSourceModule: '', // 来源模块（字典code）
     startTime: '', // 通知开始时间
-    status: '', // 已读1未读0
+    status: '0', // 已读1未读0
     offset: 1,
     limit: 20,
   }
@@ -117,17 +120,57 @@
     messageSourceModuleList.value = response.data
   })
 }
+/**
+ * 离开守卫：通过路由规则，离开该组件时被调用
+ * to 包含的内容是切换后的路由对象，也就是跳转后的路由对象
+ * from，包含的内容的是切换前的路由对象，也就是跳转前的路由对象
+ *next()，是否往下执行，执行的话，如果不写的话路由就不会跳转，操作将会终止
+ */
+onBeforeRouteLeave((to, from, next) => {
+  console.log(to)
+  if (to.path === '/standard/Applydetail') { // 更换、暂停、撤销、恢复、复查
+    switch (to.query.applyType) {
+      case '1':
+        to.meta.activeMenu = '/standard/changeApply'
+        to.meta.title = '更换申请'
+        break
+      case '2':
+        to.meta.activeMenu = '/standard/pauseApply'
+        to.meta.title = '暂停申请'
+        break
+      case '3':
+        to.meta.activeMenu = '/standard/cancelApply'
+        to.meta.title = '撤销申请'
+        break
+      case '4':
+        to.meta.activeMenu = '/standard/resumeApply'
+        to.meta.title = '恢复申请'
+        break
+      case '5':
+        to.meta.activeMenu = '/standard/checkApply'
+        to.meta.title = '复查申请'
+        break
+    }
+  }
+
+  // if (to.meta.title === '设备闲置申请' || to.meta.title === '设备封存申请' || to.meta.title === '设备启封申请' || to.meta.title === '设备报废申请' || to.meta.title === '设备处置申请') {
+
+  //  }
+  next()
+})
 
 // 跳转详情页
 const detail = (row: any) => {
-  sessionStorage.setItem('workbenchApproveId', row.id)
-  $router.push({
-    // path: formUrl[row.formId],
-    path: '/contractManagement/list',
-    query: {
-      fromModule: 'workbench',
-    },
-  })
+  sessionStorage.setItem('workbenchApproveParams', JSON.stringify(row))
+  if (row.messageContent === '结果通知') {
+    changeWorkbenchApproveStatus({
+      id: row.id,
+      status: 1,
+    })
+  }
+  else {
+    useChangePage($router, formUrl[row.formId], row)
+  }
 }
 
 onMounted(async () => {

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 114d99c..3ea677c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,4 +1,3 @@
-<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -103,6 +102,8 @@
 const initDialog = (row: any) => {
   title.value = row.title
   name.value = row.name
+  console.log(title.value, name.value)
+
   fetchData()
   // 状态管理
   if ($route.query.title !== '新建') {
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index d15e456..7514689 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -375,6 +375,7 @@
       </el-col>
       <el-col :span="8">
         <bench-col
+          style="overflow: auto;"
           icon="icon-calendar"
           title="工作日历"
           :height="bigBlockHeight"
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index 8295b9e..bafe9a5 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -5,10 +5,12 @@
 import type { DateModelType } from 'element-plus'
 import { number } from 'echarts'
 import type { IApprovalMessageListQuery } from '../workbench-interface'
+import { useChangePage } from './useChangePage'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getApprovalMessageList } from '@/api/workbench/workbench'
+import { changeWorkbenchApproveStatus, getApprovalMessageList } from '@/api/workbench/workbench'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+
 import { formUrl } from '@/utils/scheduleDict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -28,7 +30,7 @@
   endTime: '', // 通知结束时间
   messageSourceModule: '', // 来源模块（字典code）
   startTime: '', // 通知开始时间
-  status: '', // 已读1未读0
+  status: '0', // 已读1未读0
   offset: 1,
   limit: 20,
 })
@@ -41,9 +43,9 @@
 const columns = ref<TableColumn[]>([
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '主题', value: 'messageTitle', align: 'center' },
-  // { text: '来源模块', value: 'messageSourceModuleName', align: 'center' }
-  { text: '来源模块', value: 'messageContent', align: 'center' },
-  { text: '处理情况', value: 'statusName', align: 'center', width: '100' },
+  { text: '来源模块', value: 'messageSourceModuleName', align: 'center' },
+  { text: '具体内容', value: 'messageContent', align: 'center' },
+  { text: '处理情况', value: 'statusName', align: 'center', width: '100', styleFilter: (row: any) => { return row.statusName == '未处理' ? 'color: #f56c6c' : row.statusName == '已处理' ? 'color: #6ebf8a' : '' } },
 ])
 
 // 获取审批提醒列表页
@@ -55,12 +57,13 @@
   }
   const param = {
     ...listQuery.value,
-    // status: Number(listQuery.value.status),
+    status: listQuery.value.status === '' ? '' : Number(listQuery.value.status),
   }
   getApprovalMessageList(param).then((response) => {
-    list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
+    list.value = response.data.rows.map((item: { messageContent: string; statusName: string ; status: string; messageTitle: string }) => {
       return {
         ...item,
+        messageContent: item.messageTitle === '结果通知' ? `${item.messageContent}审批已通过` : item.messageContent,
         statusName: item.status == '1' ? '已处理' : '未处理',
       }
     })
@@ -92,7 +95,7 @@
     endTime: '', // 通知结束时间
     messageSourceModule: '', // 来源模块（字典code）
     startTime: '', // 通知开始时间
-    status: '', // 已读1未读0
+    status: '0', // 已读1未读0
     offset: 1,
     limit: 20,
   }
@@ -117,17 +120,57 @@
     messageSourceModuleList.value = response.data
   })
 }
+/**
+ * 离开守卫：通过路由规则，离开该组件时被调用
+ * to 包含的内容是切换后的路由对象，也就是跳转后的路由对象
+ * from，包含的内容的是切换前的路由对象，也就是跳转前的路由对象
+ *next()，是否往下执行，执行的话，如果不写的话路由就不会跳转，操作将会终止
+ */
+onBeforeRouteLeave((to, from, next) => {
+  console.log(to)
+  if (to.path === '/standard/Applydetail') { // 更换、暂停、撤销、恢复、复查
+    switch (to.query.applyType) {
+      case '1':
+        to.meta.activeMenu = '/standard/changeApply'
+        to.meta.title = '更换申请'
+        break
+      case '2':
+        to.meta.activeMenu = '/standard/pauseApply'
+        to.meta.title = '暂停申请'
+        break
+      case '3':
+        to.meta.activeMenu = '/standard/cancelApply'
+        to.meta.title = '撤销申请'
+        break
+      case '4':
+        to.meta.activeMenu = '/standard/resumeApply'
+        to.meta.title = '恢复申请'
+        break
+      case '5':
+        to.meta.activeMenu = '/standard/checkApply'
+        to.meta.title = '复查申请'
+        break
+    }
+  }
+
+  // if (to.meta.title === '设备闲置申请' || to.meta.title === '设备封存申请' || to.meta.title === '设备启封申请' || to.meta.title === '设备报废申请' || to.meta.title === '设备处置申请') {
+
+  //  }
+  next()
+})
 
 // 跳转详情页
 const detail = (row: any) => {
-  sessionStorage.setItem('workbenchApproveId', row.id)
-  $router.push({
-    // path: formUrl[row.formId],
-    path: '/contractManagement/list',
-    query: {
-      fromModule: 'workbench',
-    },
-  })
+  sessionStorage.setItem('workbenchApproveParams', JSON.stringify(row))
+  if (row.messageContent === '结果通知') {
+    changeWorkbenchApproveStatus({
+      id: row.id,
+      status: 1,
+    })
+  }
+  else {
+    useChangePage($router, formUrl[row.formId], row)
+  }
 }
 
 onMounted(async () => {
diff --git a/src/views/workbench/approve/useChangePage.ts b/src/views/workbench/approve/useChangePage.ts
new file mode 100644
index 0000000..471e0e6
--- /dev/null
+++ b/src/views/workbench/approve/useChangePage.ts
@@ -0,0 +1,129 @@
+const standardDict = { // 测量设备
+  '/standard/changeApply': '更换申请',
+  '/standard/pauseApply': '暂停申请',
+  '/standard/cancelApply': '撤销申请',
+  '/standard/resumeApply': '恢复申请',
+  '/standard/checkApply': '复查申请',
+  '/stateManage/unusedApply': '设备闲置申请',
+  '/stateManage/sealupApply': '设备封存申请',
+  '/stateManage/openApply': '设备启封申请',
+  '/stateManage/scrapApply': '设备报废申请',
+  '/stateManage/handleApply': '设备处置申请',
+}
+const standardApplyType = { // 标准装置申请类型
+  更换申请: '1',
+  暂停申请: '2',
+  撤销申请: '3',
+  恢复申请: '4',
+  复查申请: '5',
+} as any
+
+/**
+ * 审批提醒跳转业务系统详情
+ * @param $router 路由
+ * @param url // 跳转路径
+ * @param row // 参数
+ */
+
+export function useChangePage($router: any, url: string, row: any) {
+  if (url === '/file/approve') { // 文件审批
+    console.log('文件审批')
+    $router.push({
+      name: 'approveDetail',
+      query: {
+        title: '详情',
+        ...row.skipParamsObject,
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  else if (url === '/train/trainPlanApprove') { // 培训计划审批
+    console.log('培训计划审批')
+    $router.push({
+      path: `/train/trainPlanApprove/2/${row.businessId}`, // 2待审批
+      query: {
+        ...row.skipParamsObject,
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  else if (url === '/source/approve') { // 溯源供方审批
+    $router.push({
+      path: `/source/approve/2/${row.businessId}`,
+      query: {
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  // 标准装置更换申请、暂停、撤销、复查、恢复
+  else if (url === '/standard/changeApply' || url === '/standard/pauseApply' || url === '/standard/cancelApply' || url === '/standard/resumeApply' || url === '/standard/checkApply') {
+    const routeMetaTitle = standardDict[url]
+    const applyType = standardApplyType[routeMetaTitle] // 申请类型
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+      },
+      query: {
+        title: '详情',
+        id: row.businessId,
+        routeMetaTitle,
+        applyType,
+        formId: row.formId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        taskId: row.taskId,
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  // 设备闲置申请、封存、启封、报废、处置
+  else if (url === '/stateManage/unusedApply' || url === '/stateManage/sealupApply' || url === '/stateManage/openApply' || url === '/stateManage/scrapApply' || url === '/stateManage/handleApply') {
+    $router.push({
+      name: 'stateManageDetail',
+      params: {
+        type: 'detail',
+        id: row.businessId,
+      },
+      query: {
+        title: '详情',
+        name: standardDict[url],
+        // applyType: props.applyType,
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        taskId: row.taskId,
+      },
+    })
+  }
+  else if (url === '/receive/applyList' || url === '/borrow/borrowapply') { // 设备领用、借用
+    const path = url === '/receive/applyList' ? '/receive/detail' : '/borrow/detail'
+    $router.push({
+      path,
+      query: {
+        typeValue: 'detail',
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+        decisionItem: `${row.decisionItem}`,
+      },
+    })
+  }
+}

diff --git a/src/api/reader.ts b/src/api/reader.ts
index d21d618..efe1fa4 100644
--- a/src/api/reader.ts
+++ b/src/api/reader.ts
@@ -2,17 +2,27 @@
 import axios from 'axios'
 import request from './index'
 const readerType: { [key: string]: string } = {
-  readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
+  readerWriter: '/proxy/business/readWriter/gunAndTId/readList', // 有线扫码枪和大读写器
+  // readerWriter: '/proxy/business/readWriter/tId/readList', // 读写器
 }
 // 获取大读写器读写内容
 export function getReadList(type: string) {
   return axios.get(readerType[type])
 }
 
-// 获取读写器识别的样品列表
+// 获取读写器识别的样品列表(除了新增委托书详情中的扫描按钮之外的业务中的扫描使用)
 export function getReaderSampleList(data: Object) {
   return request({
-    url: '/business/readWriter/sample/readList',
+    url: '/business/readWriter/sample/label/readList',
+    method: 'post',
+    data,
+  })
+}
+
+// 标签绑定（设备收发）
+export function tagBinding(data: Object) {
+  return request({
+    url: '/device/dispatch/label/bind',
     method: 'post',
     data,
   })
diff --git a/src/api/workbench/workbench.ts b/src/api/workbench/workbench.ts
index 2593bac..86a84d7 100644
--- a/src/api/workbench/workbench.ts
+++ b/src/api/workbench/workbench.ts
@@ -11,7 +11,7 @@
 }
 
 // 审批提醒状态变更
-export function changeWorkbenchApproveStatus(data: { id: string; status: number }) {
+export function changeWorkbenchApproveStatus(data: { id: string; status: number; businessId?: string; decisionItem?: number; formId?: string; processId?: string; taskId?: string }) {
   return request({
     url: '/workbench/approvalMessage/updateStatus',
     method: 'post',
@@ -28,6 +28,15 @@
   })
 }
 
+// 工作提醒状态变更
+export function changeWorkbenchWorkListStatus(data: { id: string; status: number }) {
+  return request({
+    url: '/workbench/remindMessage/updateStatus',
+    method: 'post',
+    data,
+  })
+}
+
 // 通知公告已读状态修改
 export function changeWorkbenchNoticeStatus(data: { ids: any; userId: string }) {
   return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 90f2dde..be8238f 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -62,6 +62,7 @@
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
+    TagBingding: typeof import('./components/tagBingding/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
   }
 }
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index 9abe8b4..086cc14 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -69,8 +69,19 @@
           submitApproval(formData.type, { taskId: formData.taskId, comments: formData.comments }).then((res) => {
             ElMessage.success('审批完成')
             // 改变总工作台审批提醒的已处理状态
-            if (sessionStorage.getItem('workbenchApproveId')) {
-              changeWorkbenchApproveStatus({ id: sessionStorage.getItem('workbenchApproveId')!, status: 1 })
+            if (sessionStorage.getItem('workbenchApproveParams')) {
+              const row = JSON.parse(sessionStorage.getItem('workbenchApproveParams')!)
+              console.log('-------', row)
+
+              changeWorkbenchApproveStatus({
+                id: row.id,
+                status: 1,
+                businessId: row.businessId,
+                decisionItem: Number(row.decisionItem),
+                formId: row.formId,
+                processId: row.processId,
+                taskId: row.taskId,
+              })
             }
             btnLoading.value = false
             dialogVisible.value = false
diff --git a/src/components/ScanSampleDialog/index.vue b/src/components/ScanSampleDialog/index.vue
index 23c89ad..48462e6 100644
--- a/src/components/ScanSampleDialog/index.vue
+++ b/src/components/ScanSampleDialog/index.vue
@@ -17,6 +17,8 @@
 const emits = defineEmits(['confirm'])
 const dialogVisible = ref(false) // 弹窗显示
 const scanStatus = ref('0')
+const isBinding = ref(false) // 是否是标签绑定
+const singleChecked = ref('') // 单选选中id
 
 // 扫描到的标签列表
 const list = ref<ISampleScan[]>([])
@@ -27,14 +29,24 @@
 
 // 点击确定，保存选择的成员配置
 const confirm = () => {
+  if (isBinding.value && !singleChecked.value) { // 标签绑定
+    ElMessage.warning('请选中')
+    return false
+  }
+  const message = isBinding.value ? '确认绑定吗？' : `确认${props.title}列表中的样品吗？`
   if (list.value.length) {
-    ElMessageBox.confirm(
-    `确认${props.title}列表中全部样品吗？`,
-    '提示',
-    { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
-    ).then(() => {
+    if (isBinding.value) {
+      ElMessageBox.confirm(
+        message,
+        '提示',
+        { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
+      ).then(() => {
+        emits('confirm', singleChecked.value)
+      })
+    }
+    else {
       emits('confirm', list.value)
-    })
+    }
   }
   else {
     ElMessage.warning('暂无样品数据, 请重新扫描或取消')
@@ -47,12 +59,18 @@
   getReadList('readerWriter').then((res) => {
     const response = res.data
     if (response.code === 200 && response.data.length) {
-      getReaderSampleList(response.data).then((res) => {
-        list.value = res.data
-      })
-    }
-    else {
-      ElMessage.warning(res.data.message)
+      if (isBinding.value) {
+        list.value = response.data.map((item: string) => {
+          return {
+            labelBind: item,
+          }
+        })
+      }
+      else {
+        getReaderSampleList(response.data).then((res) => {
+          list.value = res.data
+        })
+      }
     }
     scanStatus.value = '2' // 扫描完成
   }).catch(() => {
@@ -67,11 +85,13 @@
 const deleteRow = (index: number) => {
   list.value.splice(index, 1)
 }
+
 /**
  * 打开弹窗
  * @param sampleid 样品id， 需要在弹窗内完成绑定操作的传, 不需要传空字符串
  */
-const initDialog = () => {
+const initDialog = (isBindingValue = false) => {
+  isBinding.value = isBindingValue // 是否是标签绑定
   scanStatus.value = '1'
   setTimeout(() => {
     scan()
@@ -83,7 +103,7 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="1000px" append-to-body>
+  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body>
     <div style="margin-top: -20px;width: 100%;">
       <div v-if="scanStatus === '1'" class="wait-scan">
         <div>请使用扫码枪或读写器扫描样品标签</div>
@@ -91,20 +111,28 @@
       </div>
       <!-- 扫描结果 -->
       <div v-else-if="scanStatus === '2'">
-        <div>
+        <div v-if="!isBinding">
           扫描到 {{ list.length }} 个样品{{ list.length > 1 ? '，请移除不需要绑定的样品。' : '' }}
         </div>
+        <div v-if="isBinding">
+          扫描到 {{ list.length }} 个标签{{ list.length > 1 ? '，请选择需要绑定的标签' : '' }}
+        </div>
         <el-table ref="multipleTableRef" :data="list" style="width: 100%;margin-top: 10px;" border stripe>
           <el-table-column type="index" label="序号" width="55" align="center" />
-          <el-table-column prop="sampleNo" label="样品编号" align="center" />
-          <el-table-column prop="sampleName" label="样品名称" align="center" />
-          <el-table-column prop="sampleModel" label="型号" align="center" />
-          <!-- <el-table-column prop="manufacture" label="出厂编号" align="center" /> -->
-          <!-- <el-table-column prop="orderNo" label="委托书编号" align="center" /> -->
-          <!-- <el-table-column prop="customerNo" label="委托方代码" align="center" /> -->
-          <!-- <el-table-column prop="customerName" label="委托方名称" align="center" /> -->
-          <el-table-column prop="labelBind" label="标签信息" align="center" />
-          <el-table-column label="操作" align="center" width="60px">
+          <el-table-column v-if="isBinding" label="" width="60" align="center">
+            <template #default="scope">
+              <el-radio v-model="singleChecked" :label="scope.row" class="radio" />
+            </template>
+          </el-table-column>
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleNo" label="样品编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleName" label="样品名称" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="sampleModel" label="型号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="manufacturingNo" label="出厂编号" align="center" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="orderCode" label="委托书编号" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerNo" label="委托方代码" align="center" width="160px" />
+          <el-table-column v-if="!isBinding" show-overflow-tooltip prop="customerName" label="委托方名称" align="center" />
+          <el-table-column show-overflow-tooltip prop="labelBind" label="标签信息" align="center" />
+          <el-table-column v-if="!isBinding" label="操作" align="center" width="60px" fixed="right">
             <template #default="scope">
               <el-button size="small" link type="primary" @click="deleteRow (scope.$index)">
                 删除
@@ -142,5 +170,9 @@
     height: 128px;
   }
 }
+
+.el-radio__label {
+  display: none !important;
+}
 </style>
 
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 41b952a..6fc1a3a 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -250,7 +250,6 @@
         },
         beforeEnter: (to, from, next) => {
           const type = from.path.split('/')[from.path.split('/').length - 1]
-          console.log(type)
           switch (type) {
             case 'changeApply':
               to.meta.activeMenu = '/standard/changeApply'
@@ -374,14 +373,6 @@
               to.meta.activeMenu = '/stateManage/handleApply'
               to.meta.title = '设备处置申请'
               break
-            // case 'borrowapply':
-            //   to.meta.activeMenu = '/borrow/borrowapply'
-            //   to.meta.title = '设备借用申请'
-            //   break
-            // case 'borrowhandle':
-            //   to.meta.activeMenu = '/borrow/borrowhandle'
-            //   to.meta.title = '设备借用处理'
-            //   break
           }
           next()
         },
diff --git a/src/store/modules/websocket.ts b/src/store/modules/websocket.ts
index 2609e4a..75232c3 100644
--- a/src/store/modules/websocket.ts
+++ b/src/store/modules/websocket.ts
@@ -5,8 +5,8 @@
   'websocket',
   {
     state: () => ({
-      // wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
-      wsUrl: 'ws://192.168.2.96:8085/websocket/',
+      wsUrl: `ws://${import.meta.env.VITE_APP_API_BASEURL.split('://')[1]}/websocket/`,
+      // wsUrl: 'ws://192.168.2.96:8085/websocket/',
       websocket: null, // ws连接
       wsStatus: false, // websocket连接状态 true为连接
       wsPingTimer: null, // 心跳定时器
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index d73e956..e58e85f 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -159,32 +159,6 @@
   fetchData(true)
 }
 
-// 导出
-const exportAll = () => {
-  if (list.value.length > 0) {
-    const loading = ElLoading.service({
-      lock: true,
-      text: '下载中请稍后',
-      background: 'rgba(255, 255, 255, 0.8)',
-    })
-    // const params = {
-    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
-    //   customerName: listQuery.value.customerName, // 公司名称
-    //   customerNo: listQuery.value.customerNo, // 任务分发编号
-    //   grade: listQuery.value.grade, // 履约评级
-    //   ids: checkoutList.value,
-    // }
-    // exportCustomerList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '任务分发列表.xlsx')
-    // })
-    loading.close()
-  }
-  else {
-    ElMessage.warning('无数据可导出')
-  }
-}
-
 // 打印列表
 function printList() {
   // 打印列
@@ -214,6 +188,9 @@
 // 对列表中样品批量收入
 const scanOver = function (list: { sampleId: string; orderId: string }) {
   // TODO:批量收入
+  console.log('------')
+  console.log(list)
+
   scanSampleRef.value.closeDialog()
   fetchData()
 }
@@ -382,7 +359,6 @@
       <template #btns-right>
         <icon-button v-if="listQuery.measureStatus === '2'" icon="icon-scan" title="扫描收入" type="primary" @click="batchScan" />
         <icon-button v-if="listQuery.measureStatus === '3'" icon="icon-scan" title="扫描检完" type="primary" @click="batchOverScan" />
-        <!-- <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index 1d35e7d..62a3193 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -4,6 +4,7 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import type { ICertification } from './cert-interface'
+import filePreviewDialog from './components/filePreviewDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { UploadFile } from '@/api/measure/file'
@@ -12,11 +13,13 @@
 import { certificatePrintDetail } from '@/api/business/lab/cert'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // 证书id
+const printFileName = ref('') // 打印文件名称
+const { proxy } = getCurrentInstance() as any
 const printStatus = ref('') // 可打印状态
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
-
+const filePreviewDialogRef = ref() // 预览弹窗ref
 // 从路由中获取页面类型参数
 const $route = useRoute()
 
@@ -136,45 +139,6 @@
 
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  // 详情页面待确认 TODO
-  // dataForm.value = {
-  //   approvalStatus: '2',
-  //   certificateReportCategory: '1,2',
-  //   certificateReportCode: 'RIM202303002',
-  //   certificateReportFile: '',
-  //   certificateReportName: '证书报告名称03',
-  //   certificateReportType: '1',
-  //   createTime: '2023-03-14T18:28:41',
-  //   createUser: '1',
-  //   customerAddress: 'ewfewfe ',
-  //   customerEmail: '',
-  //   customerName: '京东集团',
-  //   customerNo: 'wtsc202302080001',
-  //   customerPhone: '950618',
-  //   deliverer: '张三',
-  //   delivererId: '1',
-  //   delivererTel: '113652204',
-  //   id: '154524246245210210',
-  //   isDel: false,
-  //   measureContent: '项目4',
-  //   measureDeptId: '',
-  //   measurePersonId: '1',
-  //   measureType: '2',
-  //   orderId: '1623234926190817282',
-  //   originalRecordId: '1625802150301368321',
-  //   originalRecordName: '',
-  //   planDeliverTime: '2022-11-29T21:14:50',
-  //   printNum: 0,
-  //   printStatus: '1',
-  //   processId: '',
-  //   remark: '',
-  //   requireOverTime: '2023-01-29T21:14:50',
-  //   sampleId: '1625742343335677953',
-  //   sampleName: '测试4',
-  //   sampleNo: '',
-  //   signId: '',
-  //   templateId: '',
-  // }
   certificatePrintDetail({ id }).then((res) => {
     dataForm.value = res.data
     dataForm.value.createTime = res.data.createTime.split('T')[0]
@@ -186,6 +150,11 @@
 
 }
 
+// 点击文档预览功能
+const filePreView = () => {
+  filePreviewDialogRef.value.initDialog(printFileName.value)
+}
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -221,6 +190,11 @@
   if ($route.query && $route.query.pageType) {
     pageType.value = $route.query.pageType as string
   }
+
+  if ($route.query && $route.query.printFileName) {
+    printFileName.value = $route.query.printFileName as string
+  }
+
   getInfo(infoId.value)
 })
 </script>
@@ -232,7 +206,7 @@
         <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
           打印
         </el-button>
-        <el-button type="primary" @click="printCert">
+        <el-button type="primary" @click="filePreView">
           预览
         </el-button>
         <el-button type="info" @click="close">
@@ -430,6 +404,7 @@
         </el-row>
       </el-form>
     </detail-page>
+    <file-preview-dialog ref="filePreviewDialogRef" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index f9c1af8..94b64d9 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -185,7 +185,7 @@
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
-  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}`)
+  $router.push(`/schedule/cert/detail/${row.certificationId}?pageType=detail&printStatus=${row.printStatus}&id=${row.id}&printFileName=${row.printFileName}`)
 }
 
 // 审批
@@ -241,7 +241,8 @@
 
 const doPrint = (val: any) => {
   // var ordonnance = document.getElementById(val)!.contentWindow
-  var ordonnance = document.getElementById(val)!.contentWindow
+  const e = document.getElementById(val) as any
+  var ordonnance = e.contentWindow
   setTimeout(() => {
     console.log('调出打印机')
     ordonnance.print()
diff --git a/src/views/business/schedule/certPrint/components/filePreviewDialog.vue b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
new file mode 100644
index 0000000..630c5fc
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/filePreviewDialog.vue
@@ -0,0 +1,62 @@
+<!-- 文件预览弹窗 -->
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { getPhotoUrl } from '@/api/system/tool'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/lab/cert'
+// 弹窗显示状态
+const dialogVisible = ref(false)
+const pdfUrl = ref('') // 打印文件url
+
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(printFileName: string) {
+  getPhotoUrl(printFileName).then((res) => {
+    dialogVisible.value = true
+
+    const url = res.data
+    console.log(url)
+    pdfUrl.value = res.data
+    console.log(pdfUrl.value)
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    // proxy.$refs.pdf.print()
+    // download(url, row.printFileName as string)
+  })
+}
+
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="文件预览"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <!-- pdf预览 -->
+    <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+    <template #footer>
+      <el-button type="info" @click="handleClose">
+        关闭
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeDetail.vue b/src/views/business/schedule/interchange/interchangeDetail.vue
index a90254b..fbc4599 100644
--- a/src/views/business/schedule/interchange/interchangeDetail.vue
+++ b/src/views/business/schedule/interchange/interchangeDetail.vue
@@ -598,7 +598,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="标签绑定:">
                 <el-input
                   v-model="dataForm.labelBind"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 7d698e0..13f6364 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -7,6 +7,7 @@
 import teminateDialog from '../components/terminateDialog.vue'
 import type { IListQuery, IinterchangeList, dictType } from './interchange_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import scanSampleDialog from '@/components/ScanSampleDialog/index.vue'
 import {
   exportInterchangeList,
   getInterChangeList,
@@ -19,14 +20,18 @@
 import { getDictByCode } from '@/api/system/dict'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import buttonBox from '@/components/buttonBox/buttonBox.vue'
-
+import { tagBinding } from '@/api/reader'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 const menu = ref<IMenu[]>([]) // 右上角菜单
 const currentMenu = ref('') // 选中的按钮
 const active = ref('') // 选中的按钮的code
 const terminateRef = ref() // 确认终止dialog
-
+const isBinding = ref(false) // 是否是标签绑定
+const scanSampleRef = ref() // 标签绑定弹窗ref
+const selectRow = ref() // 标签绑定选择的行数据
+const scanType = ref('take') // take扫描收入 complete 扫描结束检定 return扫描归还
+const dialogTitle = ref('标签绑定') // 扫描对话框标题
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
   sampleNo: '', // 样品编号
@@ -94,12 +99,6 @@
         value: item.value,
       }
     })
-    // 在已有的字典的基础上增加一个全部0进去
-    // isUrgentMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2', // 是否加急全部后端定为2
-    // })
   })
   // 样品属性
   getDictByCode('sampleBelong').then((response) => {
@@ -109,12 +108,6 @@
         value: item.value, // 后端需要int型，在此转换
       }
     })
-    // 在已有的字典的基础上增加一个全部进去
-    // sampleAttrMap.value.unshift({
-    //   id: '',
-    //   name: '全部',
-    //   value: '2',
-    // })
   })
   // 样品状态
   const res = await getDictByCode('sampleStatus')
@@ -227,15 +220,6 @@
   clearList()
 }
 
-// 点击扫描收入
-const scanTake = () => {}
-// 点击扫描结束检定
-const scanOver = () => {}
-// 点击扫描归还
-const scanReturn = () => {}
-// 点击标签绑定
-const scan = () => {}
-
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -343,6 +327,71 @@
     })
 }
 
+// --------------------------------------扫描-------------------------------------------
+// 点击扫描收入
+const scanTake = () => {
+  isBinding.value = false
+  scanType.value = 'take'
+  dialogTitle.value = '扫描收入'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击扫描结束检定
+const scanFinish = () => {
+  isBinding.value = false
+  scanType.value = 'complete'
+  dialogTitle.value = '扫描结束检定'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 点击扫描归还
+const scanReturn = () => {
+  isBinding.value = false
+  scanType.value = 'return'
+  dialogTitle.value = '扫描归还'
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+// 点击标签绑定
+const scan = (row: IinterchangeList) => {
+  isBinding.value = true
+  dialogTitle.value = '标签绑定'
+  selectRow.value = row // 点击标签绑定的行数据
+  scanSampleRef.value.initDialog(isBinding.value)
+}
+
+// 扫描结束
+const scanOver = (value: any) => {
+  if (isBinding.value) { // 标签绑定
+    const label = value.labelBind
+    tagBinding({ label, sampleId: selectRow.value.sampleId }).then((res) => {
+      ElMessage.success(' 绑定成功')
+    })
+  }
+  else { // 扫描收入或扫描捡完
+    console.log(value)
+    if (!value.length) { return }
+    const getData = value.map((item: { id: string; orderId: string }) => {
+      return {
+        ...item,
+        sampleId: item.id,
+        orderId: item.orderId,
+        reason: '',
+      }
+    })
+
+    if (scanType.value === 'take') { // 扫描收入
+      handleEdit(getData, 'take', '收入')
+    }
+    else if (scanType.value === 'complete') { // 扫描结束检定
+      handleEdit(getData, 'complete', '完成')
+    }
+    else if (scanType.value === 'return') { // 扫描归还
+      handleEdit(getData, 'return', '归还')
+    }
+  }
+  scanSampleRef.value.closeDialog()
+}
+// -----------------------------------------------------------------------------------
+
 // 打印列表
 function printList() {
   // 打印列
@@ -466,7 +515,7 @@
       <template #btns-right>
         <icon-button v-if="currentMenu === '已收入'" icon="icon-create" title="生成设备交接单" type="primary" @click="createInterchangeReceipt" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanTake') && currentMenu === '待收入'" icon="icon-device" title="扫描收入" type="primary" @click="scanTake" />
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanOver" />
+        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入' || currentMenu === '已超期') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanReturn') && currentMenu === '待归还'" icon="icon-device" title="扫描归还" type="primary" @click="scanReturn" />
         <icon-button v-if="proxy.hasPerm('/sample/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
         <icon-button v-if="proxy.hasPerm('/sample/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
@@ -510,7 +559,7 @@
                 size="small"
                 link
                 type="primary"
-                @click="scan()"
+                @click="scan(row)"
               >
                 标签绑定
               </el-button>
@@ -586,6 +635,7 @@
     <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
     <!-- 终止弹窗 -->
     <teminate-dialog ref="terminateRef" @on-success="fetchData(true)" />
+    <scan-sample-dialog ref="scanSampleRef" :title="dialogTitle" @confirm="scanOver" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index cbc8dab..8785efa 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -362,7 +362,7 @@
                 分发
               </el-button>
               <el-button
-                v-if="proxy.hasPerm('/schedule/taskList/urge')"
+                v-if="proxy.hasPerm('/schedule/taskList/urge') && listQuery.sampleStatus === '8'"
                 size="small"
                 link
                 type="primary"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index c66b8d9..46249b0 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -286,6 +286,7 @@
         taskId: row.taskId,
         processId: row.processId, // 查询审批记录使用
         approvalStatusName: row.approvalStatusName,
+        decisionItem: `${row.decisionItem}`,
       },
     })
   }
@@ -341,21 +342,12 @@
   // 获取字典-审批状态
   getDict().then(() => {
     if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) {
-      console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive'))
-
       active.value = window.sessionStorage.getItem('receiveButtonBoxActive')!
-      console.log(window.sessionStorage.getItem('receiveButtonBoxActive'))
     }
     else {
-      console.log('找不到')
-
       active.value = menu.value.find(item => item.name === '全部')!.id! // 全部
       activeTitle.value === '全部'
     }
-    if ($route.query.fromModule === 'workbench') {
-      active.value = menu.value.find(item => item.name === '待审批')!.id! // 全部
-      activeTitle.value === '待审批'
-    }
     nextTick(() => {
       fetchData(true) // 获取表格数据
       fetchDeptTreeList() // 获取使用部门
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index 2596161..b291653 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -49,13 +49,8 @@
   sessionStorage.setItem(`${props.applyType}Menu`, current.value)
 })
 onMounted(() => {
-  if ($route.query.fromModule === 'workbench') {
-    current.value = '待审批'
-  }
-  else {
-    current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
-    sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
-  }
+  current.value = sessionStorage.getItem(`${props.applyType}Menu`) || '全部'
+  sessionStorage.getItem(`${props.applyType}Menu`) ? sessionStorage.removeItem(`${props.applyType}Menu`) : ''
 })
 </script>
 
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index ea729a7..153d4cc 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,4 +1,4 @@
-<!-- 更换\暂停\撤销\恢复\复查详情 -->
+<!-- 更换\暂停\撤销\恢复\复查列表 -->
 <script lang="ts" setup name="ListPage">
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 4ef91e4..9204ff7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -804,6 +804,7 @@
   formInline.value.applyPerson = user.id // 申请人
   formInline.value.applyPersonName = user.name // 申请人名称
   formInline.value.applyTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+  infoId.value = $route.query.id as string
   // 编辑、详情获取详情信息
   if (pageType.value !== 'add') {
     getInfo(infoId.value)
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 114d99c..3ea677c 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -1,4 +1,3 @@
-<!-- 新增或详情弹窗 设备借用处理新增编辑 -->
 <script lang="ts" setup name="TemplateAdd">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -103,6 +102,8 @@
 const initDialog = (row: any) => {
   title.value = row.title
   name.value = row.name
+  console.log(title.value, name.value)
+
   fetchData()
   // 状态管理
   if ($route.query.title !== '新建') {
diff --git a/src/views/workbench.vue b/src/views/workbench.vue
index d15e456..7514689 100644
--- a/src/views/workbench.vue
+++ b/src/views/workbench.vue
@@ -375,6 +375,7 @@
       </el-col>
       <el-col :span="8">
         <bench-col
+          style="overflow: auto;"
           icon="icon-calendar"
           title="工作日历"
           :height="bigBlockHeight"
diff --git a/src/views/workbench/approve/list.vue b/src/views/workbench/approve/list.vue
index 8295b9e..bafe9a5 100644
--- a/src/views/workbench/approve/list.vue
+++ b/src/views/workbench/approve/list.vue
@@ -5,10 +5,12 @@
 import type { DateModelType } from 'element-plus'
 import { number } from 'echarts'
 import type { IApprovalMessageListQuery } from '../workbench-interface'
+import { useChangePage } from './useChangePage'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getApprovalMessageList } from '@/api/workbench/workbench'
+import { changeWorkbenchApproveStatus, getApprovalMessageList } from '@/api/workbench/workbench'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
+
 import { formUrl } from '@/utils/scheduleDict'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
@@ -28,7 +30,7 @@
   endTime: '', // 通知结束时间
   messageSourceModule: '', // 来源模块（字典code）
   startTime: '', // 通知开始时间
-  status: '', // 已读1未读0
+  status: '0', // 已读1未读0
   offset: 1,
   limit: 20,
 })
@@ -41,9 +43,9 @@
 const columns = ref<TableColumn[]>([
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '主题', value: 'messageTitle', align: 'center' },
-  // { text: '来源模块', value: 'messageSourceModuleName', align: 'center' }
-  { text: '来源模块', value: 'messageContent', align: 'center' },
-  { text: '处理情况', value: 'statusName', align: 'center', width: '100' },
+  { text: '来源模块', value: 'messageSourceModuleName', align: 'center' },
+  { text: '具体内容', value: 'messageContent', align: 'center' },
+  { text: '处理情况', value: 'statusName', align: 'center', width: '100', styleFilter: (row: any) => { return row.statusName == '未处理' ? 'color: #f56c6c' : row.statusName == '已处理' ? 'color: #6ebf8a' : '' } },
 ])
 
 // 获取审批提醒列表页
@@ -55,12 +57,13 @@
   }
   const param = {
     ...listQuery.value,
-    // status: Number(listQuery.value.status),
+    status: listQuery.value.status === '' ? '' : Number(listQuery.value.status),
   }
   getApprovalMessageList(param).then((response) => {
-    list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
+    list.value = response.data.rows.map((item: { messageContent: string; statusName: string ; status: string; messageTitle: string }) => {
       return {
         ...item,
+        messageContent: item.messageTitle === '结果通知' ? `${item.messageContent}审批已通过` : item.messageContent,
         statusName: item.status == '1' ? '已处理' : '未处理',
       }
     })
@@ -92,7 +95,7 @@
     endTime: '', // 通知结束时间
     messageSourceModule: '', // 来源模块（字典code）
     startTime: '', // 通知开始时间
-    status: '', // 已读1未读0
+    status: '0', // 已读1未读0
     offset: 1,
     limit: 20,
   }
@@ -117,17 +120,57 @@
     messageSourceModuleList.value = response.data
   })
 }
+/**
+ * 离开守卫：通过路由规则，离开该组件时被调用
+ * to 包含的内容是切换后的路由对象，也就是跳转后的路由对象
+ * from，包含的内容的是切换前的路由对象，也就是跳转前的路由对象
+ *next()，是否往下执行，执行的话，如果不写的话路由就不会跳转，操作将会终止
+ */
+onBeforeRouteLeave((to, from, next) => {
+  console.log(to)
+  if (to.path === '/standard/Applydetail') { // 更换、暂停、撤销、恢复、复查
+    switch (to.query.applyType) {
+      case '1':
+        to.meta.activeMenu = '/standard/changeApply'
+        to.meta.title = '更换申请'
+        break
+      case '2':
+        to.meta.activeMenu = '/standard/pauseApply'
+        to.meta.title = '暂停申请'
+        break
+      case '3':
+        to.meta.activeMenu = '/standard/cancelApply'
+        to.meta.title = '撤销申请'
+        break
+      case '4':
+        to.meta.activeMenu = '/standard/resumeApply'
+        to.meta.title = '恢复申请'
+        break
+      case '5':
+        to.meta.activeMenu = '/standard/checkApply'
+        to.meta.title = '复查申请'
+        break
+    }
+  }
+
+  // if (to.meta.title === '设备闲置申请' || to.meta.title === '设备封存申请' || to.meta.title === '设备启封申请' || to.meta.title === '设备报废申请' || to.meta.title === '设备处置申请') {
+
+  //  }
+  next()
+})
 
 // 跳转详情页
 const detail = (row: any) => {
-  sessionStorage.setItem('workbenchApproveId', row.id)
-  $router.push({
-    // path: formUrl[row.formId],
-    path: '/contractManagement/list',
-    query: {
-      fromModule: 'workbench',
-    },
-  })
+  sessionStorage.setItem('workbenchApproveParams', JSON.stringify(row))
+  if (row.messageContent === '结果通知') {
+    changeWorkbenchApproveStatus({
+      id: row.id,
+      status: 1,
+    })
+  }
+  else {
+    useChangePage($router, formUrl[row.formId], row)
+  }
 }
 
 onMounted(async () => {
diff --git a/src/views/workbench/approve/useChangePage.ts b/src/views/workbench/approve/useChangePage.ts
new file mode 100644
index 0000000..471e0e6
--- /dev/null
+++ b/src/views/workbench/approve/useChangePage.ts
@@ -0,0 +1,129 @@
+const standardDict = { // 测量设备
+  '/standard/changeApply': '更换申请',
+  '/standard/pauseApply': '暂停申请',
+  '/standard/cancelApply': '撤销申请',
+  '/standard/resumeApply': '恢复申请',
+  '/standard/checkApply': '复查申请',
+  '/stateManage/unusedApply': '设备闲置申请',
+  '/stateManage/sealupApply': '设备封存申请',
+  '/stateManage/openApply': '设备启封申请',
+  '/stateManage/scrapApply': '设备报废申请',
+  '/stateManage/handleApply': '设备处置申请',
+}
+const standardApplyType = { // 标准装置申请类型
+  更换申请: '1',
+  暂停申请: '2',
+  撤销申请: '3',
+  恢复申请: '4',
+  复查申请: '5',
+} as any
+
+/**
+ * 审批提醒跳转业务系统详情
+ * @param $router 路由
+ * @param url // 跳转路径
+ * @param row // 参数
+ */
+
+export function useChangePage($router: any, url: string, row: any) {
+  if (url === '/file/approve') { // 文件审批
+    console.log('文件审批')
+    $router.push({
+      name: 'approveDetail',
+      query: {
+        title: '详情',
+        ...row.skipParamsObject,
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  else if (url === '/train/trainPlanApprove') { // 培训计划审批
+    console.log('培训计划审批')
+    $router.push({
+      path: `/train/trainPlanApprove/2/${row.businessId}`, // 2待审批
+      query: {
+        ...row.skipParamsObject,
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  else if (url === '/source/approve') { // 溯源供方审批
+    $router.push({
+      path: `/source/approve/2/${row.businessId}`,
+      query: {
+        taskId: row.taskId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  // 标准装置更换申请、暂停、撤销、复查、恢复
+  else if (url === '/standard/changeApply' || url === '/standard/pauseApply' || url === '/standard/cancelApply' || url === '/standard/resumeApply' || url === '/standard/checkApply') {
+    const routeMetaTitle = standardDict[url]
+    const applyType = standardApplyType[routeMetaTitle] // 申请类型
+    $router.push({
+      name: 'standardListAdd',
+      params: {
+        type: 'detail',
+      },
+      query: {
+        title: '详情',
+        id: row.businessId,
+        routeMetaTitle,
+        applyType,
+        formId: row.formId,
+        processId: row.processId,
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        taskId: row.taskId,
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+      },
+    })
+  }
+  // 设备闲置申请、封存、启封、报废、处置
+  else if (url === '/stateManage/unusedApply' || url === '/stateManage/sealupApply' || url === '/stateManage/openApply' || url === '/stateManage/scrapApply' || url === '/stateManage/handleApply') {
+    $router.push({
+      name: 'stateManageDetail',
+      params: {
+        type: 'detail',
+        id: row.businessId,
+      },
+      query: {
+        title: '详情',
+        name: standardDict[url],
+        // applyType: props.applyType,
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+        decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+        taskId: row.taskId,
+      },
+    })
+  }
+  else if (url === '/receive/applyList' || url === '/borrow/borrowapply') { // 设备领用、借用
+    const path = url === '/receive/applyList' ? '/receive/detail' : '/borrow/detail'
+    $router.push({
+      path,
+      query: {
+        typeValue: 'detail',
+        id: row.businessId,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+        approvalStatus: '2', // 待审批
+        approvalStatusName: '待审批',
+        decisionItem: `${row.decisionItem}`,
+      },
+    })
+  }
+}
diff --git a/src/views/workbench/workList.vue b/src/views/workbench/workList.vue
index 2338940..d03f400 100644
--- a/src/views/workbench/workList.vue
+++ b/src/views/workbench/workList.vue
@@ -6,7 +6,7 @@
 import { number } from 'echarts'
 import type { IWorkMessageListQuery } from './workbench-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getWorkMessageList } from '@/api/workbench/workbench'
+import { changeWorkbenchWorkListStatus, getWorkMessageList } from '@/api/workbench/workbench'
 import { getDictByCode } from '@/api/system/dict'
 import type { dictType } from '@/global'
 import { formUrl } from '@/utils/scheduleDict'
@@ -58,7 +58,7 @@
   }
   const param = {
     ...listQuery.value,
-    status: Number(listQuery.value.status),
+    status: listQuery.value.status === '' ? '' : Number(listQuery.value.status),
   }
   getWorkMessageList(param).then((response) => {
     list.value = response.data.rows.map((item: { statusName: string ; status: string }) => {
@@ -155,6 +155,7 @@
   else if (row.messageType === '4') { // 业务看板-样品超期提醒
     $router.push(`/board/overdueReminderDetail/${row.businessId}?order=${row.relationBusinessId}`)
   }
+  changeWorkbenchWorkListStatus({ id: row.id, status: 1 }) // 将未读状态变为已读
 }
 
 onMounted(async () => {