diff --git a/.env.development b/.env.development
index a7217da..d11d038 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
-VITE_APP_API_BASEURL = http://222.187.140.114:8896
+# VITE_APP_API_BASEURL = http://222.187.140.114:8896
 
 #房可鑫测试
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710

diff --git a/.env.development b/.env.development
index a7217da..d11d038 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
-VITE_APP_API_BASEURL = http://222.187.140.114:8896
+# VITE_APP_API_BASEURL = http://222.187.140.114:8896
 
 #房可鑫测试
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index aade131..ec29c52 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -2,17 +2,18 @@
 <script setup lang="ts" name="LabelPrint">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, dayjs } from 'element-plus'
 import JsBarcode from 'jsbarcode'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printHtml } from '@/utils/printUtils'
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户单位', value: 'customerName', align: 'center', fixed: true },
-  { text: '仪器名称', value: 'sampleName', width: '90', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '130', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '90', align: 'center' },
-  { text: '备注', value: 'remark', width: '110', align: 'center' },
+  { text: '仪器名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   { text: '送检时间', value: 'realDeliverTime', align: 'center', width: '180' },
 ])
 const visible = ref(false) // 对话框显隐
@@ -24,19 +25,34 @@
 }
 
 // 点击确定
-const clickConfirm = () => {
-  // if (!checkoutList.value.length) {
-  //   ElMessage({
-  //     message: '请选中',
-  //     type: 'warning',
-  //   })
-  // }
-  // emits('confirmCheckout', checkoutList.value)
-  // cancle()
+const printObj = ref({
+  id: 'labelHtml', // 需要打印元素的id
+  popTitle: '', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+
+// 点击删除
+const deleteRow = (index: number) => {
+  list.value.splice(index, 1)
 }
 
 function initDialog(value: any) {
-  list.value = value
+  list.value = value.map((item: { sampleStatus: string; remark: string; realDeliverTime: string }) => {
+    return {
+      ...item,
+      realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
+      remark: item.remark || '无',
+    }
+  })
   visible.value = true
   nextTick(() => {
     JsBarcode('#barcode').init()
@@ -47,14 +63,15 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="标签打印" width="85%" @close="cancle">
-    <div style="display: flex;">
+  <el-dialog v-model="visible" title="标签打印" width="1300px" @close="cancle">
+    <div style="display: flex;overflow: hidden;position: relative;">
       <normal-table
         :data="list"
         :pagination="false"
         :columns="columns"
         :is-showmulti-select="false"
-        style="width: 50%;"
+        :max-height="460"
+        style="width: 860px;margin-right: 40px;"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -64,45 +81,104 @@
             </template>
           </el-table-column>
         </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            width="90"
+          >
+            <template #default="scope">
+              <el-button
+                size="small"
+                type="danger"
+                link
+                @click="deleteRow(scope.$index)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
       </normal-table>
-      <!-- 标签 -->
-      <div v-for="(item, index) in list" :key="index">
-        <div style="width: 300px; height: 240px; margin-left: 20px;box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
-          <div style="white-space: nowrap;">
-            <span style="margin-right: 16px;">送检时间</span>
-            <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+
+      <div style="height: 460px;overflow-y: auto;">
+        <!-- 标签 -->
+        <div style="background-color: #fff;">
+          <div style="display: flex;flex-direction: column;width: 330px;">
+            <div v-for="(item, index) in list" :key="index" style="margin-bottom: 10px;width: 300px; height: 240px; box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+              <div style="white-space: nowrap;">
+                <span style="margin-right: 16px;">送检时间</span>
+                <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">仪器名称</span>
+                <span style="font-weight: 600;">{{ item.sampleName }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">型ㅤㅤ号</span>
+                <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">出厂编号</span>
+                <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">备ㅤㅤ注</span>
+                <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+              </div>
+              <img
+                id="barcode"
+                style="width: 200px;margin-left: 30px;margin-top: 10px;"
+                :jsbarcode-value="item.sampleNo"
+                jsbarcode-textmargin="0"
+                jsbarcode-fontoptions="bold"
+              >
+            </div>
           </div>
-          <div>
-            <span style="margin-right: 16px;">仪器名称</span>
-            <span style="font-weight: 600;">{{ item.sampleName }}</span>
+        </div>
+
+        <div id="labelHtml" style="display: flex;flex-direction: column;position: absolute;top: 0;right: 0;z-index: -999999;">
+          <div v-for="(item, index) in list" :key="index" style="width: 300px; height: 240px; box-sizing: border-box; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+            <div style="white-space: nowrap;">
+              <span style="margin-right: 16px;">送检时间</span>
+              <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">仪器名称</span>
+              <span style="font-weight: 600;">{{ item.sampleName }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">型ㅤㅤ号</span>
+              <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">出厂编号</span>
+              <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">备ㅤㅤ注</span>
+              <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+            </div>
+            <img
+              id="barcode"
+              style="width: 200px;margin-left: 30px;margin-top: 10px;"
+              :jsbarcode-value="item.sampleNo"
+              jsbarcode-textmargin="0"
+              jsbarcode-fontoptions="bold"
+            >
           </div>
-          <div>
-            <span style="margin-right: 16px;">型ㅤㅤ号</span>
-            <span style="font-weight: 600;">{{ item.sampleModel }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">出厂编号</span>
-            <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">备ㅤㅤ注</span>
-            <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
-          </div>
-          <svg
-            id="barcode"
-            style="width: 300px;height: 240px;"
-            :jsbarcode-value="item.sampleNo"
-            jsbarcode-textmargin="0"
-            jsbarcode-fontoptions="bold"
-          />
         </div>
       </div>
     </div>
-
     <template #footer>
-      <el-button type="primary" @click="clickConfirm">
-        确定
+      <el-button v-print="printObj" type="primary">
+        打印
       </el-button>
+      <!-- <el-button type="primary" @click="printHtml('labelHtml')">
+        打印
+      </el-button> -->
+
       <el-button @click="cancle">
         取消
       </el-button>

diff --git a/.env.development b/.env.development
index a7217da..d11d038 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
-VITE_APP_API_BASEURL = http://222.187.140.114:8896
+# VITE_APP_API_BASEURL = http://222.187.140.114:8896
 
 #房可鑫测试
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index aade131..ec29c52 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -2,17 +2,18 @@
 <script setup lang="ts" name="LabelPrint">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, dayjs } from 'element-plus'
 import JsBarcode from 'jsbarcode'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printHtml } from '@/utils/printUtils'
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户单位', value: 'customerName', align: 'center', fixed: true },
-  { text: '仪器名称', value: 'sampleName', width: '90', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '130', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '90', align: 'center' },
-  { text: '备注', value: 'remark', width: '110', align: 'center' },
+  { text: '仪器名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   { text: '送检时间', value: 'realDeliverTime', align: 'center', width: '180' },
 ])
 const visible = ref(false) // 对话框显隐
@@ -24,19 +25,34 @@
 }
 
 // 点击确定
-const clickConfirm = () => {
-  // if (!checkoutList.value.length) {
-  //   ElMessage({
-  //     message: '请选中',
-  //     type: 'warning',
-  //   })
-  // }
-  // emits('confirmCheckout', checkoutList.value)
-  // cancle()
+const printObj = ref({
+  id: 'labelHtml', // 需要打印元素的id
+  popTitle: '', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+
+// 点击删除
+const deleteRow = (index: number) => {
+  list.value.splice(index, 1)
 }
 
 function initDialog(value: any) {
-  list.value = value
+  list.value = value.map((item: { sampleStatus: string; remark: string; realDeliverTime: string }) => {
+    return {
+      ...item,
+      realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
+      remark: item.remark || '无',
+    }
+  })
   visible.value = true
   nextTick(() => {
     JsBarcode('#barcode').init()
@@ -47,14 +63,15 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="标签打印" width="85%" @close="cancle">
-    <div style="display: flex;">
+  <el-dialog v-model="visible" title="标签打印" width="1300px" @close="cancle">
+    <div style="display: flex;overflow: hidden;position: relative;">
       <normal-table
         :data="list"
         :pagination="false"
         :columns="columns"
         :is-showmulti-select="false"
-        style="width: 50%;"
+        :max-height="460"
+        style="width: 860px;margin-right: 40px;"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -64,45 +81,104 @@
             </template>
           </el-table-column>
         </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            width="90"
+          >
+            <template #default="scope">
+              <el-button
+                size="small"
+                type="danger"
+                link
+                @click="deleteRow(scope.$index)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
       </normal-table>
-      <!-- 标签 -->
-      <div v-for="(item, index) in list" :key="index">
-        <div style="width: 300px; height: 240px; margin-left: 20px;box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
-          <div style="white-space: nowrap;">
-            <span style="margin-right: 16px;">送检时间</span>
-            <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+
+      <div style="height: 460px;overflow-y: auto;">
+        <!-- 标签 -->
+        <div style="background-color: #fff;">
+          <div style="display: flex;flex-direction: column;width: 330px;">
+            <div v-for="(item, index) in list" :key="index" style="margin-bottom: 10px;width: 300px; height: 240px; box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+              <div style="white-space: nowrap;">
+                <span style="margin-right: 16px;">送检时间</span>
+                <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">仪器名称</span>
+                <span style="font-weight: 600;">{{ item.sampleName }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">型ㅤㅤ号</span>
+                <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">出厂编号</span>
+                <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">备ㅤㅤ注</span>
+                <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+              </div>
+              <img
+                id="barcode"
+                style="width: 200px;margin-left: 30px;margin-top: 10px;"
+                :jsbarcode-value="item.sampleNo"
+                jsbarcode-textmargin="0"
+                jsbarcode-fontoptions="bold"
+              >
+            </div>
           </div>
-          <div>
-            <span style="margin-right: 16px;">仪器名称</span>
-            <span style="font-weight: 600;">{{ item.sampleName }}</span>
+        </div>
+
+        <div id="labelHtml" style="display: flex;flex-direction: column;position: absolute;top: 0;right: 0;z-index: -999999;">
+          <div v-for="(item, index) in list" :key="index" style="width: 300px; height: 240px; box-sizing: border-box; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+            <div style="white-space: nowrap;">
+              <span style="margin-right: 16px;">送检时间</span>
+              <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">仪器名称</span>
+              <span style="font-weight: 600;">{{ item.sampleName }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">型ㅤㅤ号</span>
+              <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">出厂编号</span>
+              <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">备ㅤㅤ注</span>
+              <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+            </div>
+            <img
+              id="barcode"
+              style="width: 200px;margin-left: 30px;margin-top: 10px;"
+              :jsbarcode-value="item.sampleNo"
+              jsbarcode-textmargin="0"
+              jsbarcode-fontoptions="bold"
+            >
           </div>
-          <div>
-            <span style="margin-right: 16px;">型ㅤㅤ号</span>
-            <span style="font-weight: 600;">{{ item.sampleModel }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">出厂编号</span>
-            <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">备ㅤㅤ注</span>
-            <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
-          </div>
-          <svg
-            id="barcode"
-            style="width: 300px;height: 240px;"
-            :jsbarcode-value="item.sampleNo"
-            jsbarcode-textmargin="0"
-            jsbarcode-fontoptions="bold"
-          />
         </div>
       </div>
     </div>
-
     <template #footer>
-      <el-button type="primary" @click="clickConfirm">
-        确定
+      <el-button v-print="printObj" type="primary">
+        打印
       </el-button>
+      <!-- <el-button type="primary" @click="printHtml('labelHtml')">
+        打印
+      </el-button> -->
+
       <el-button @click="cancle">
         取消
       </el-button>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 8ff7808..a3e3ffe 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -562,7 +562,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
+        <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <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-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />

diff --git a/.env.development b/.env.development
index a7217da..d11d038 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 # 页面标题
 VITE_APP_TITLE = 华东计量综合系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://111.198.10.15:21609
+VITE_APP_API_BASEURL = http://111.198.10.15:21609
 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州
-VITE_APP_API_BASEURL = http://222.187.140.114:8896
+# VITE_APP_API_BASEURL = http://222.187.140.114:8896
 
 #房可鑫测试
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/src/views/business/schedule/interchange/dialog/labelPrint.vue b/src/views/business/schedule/interchange/dialog/labelPrint.vue
index aade131..ec29c52 100644
--- a/src/views/business/schedule/interchange/dialog/labelPrint.vue
+++ b/src/views/business/schedule/interchange/dialog/labelPrint.vue
@@ -2,17 +2,18 @@
 <script setup lang="ts" name="LabelPrint">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, dayjs } from 'element-plus'
 import JsBarcode from 'jsbarcode'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printHtml } from '@/utils/printUtils'
 const emits = defineEmits(['changeVisible', 'confirmCheckout'])
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '客户单位', value: 'customerName', align: 'center', fixed: true },
-  { text: '仪器名称', value: 'sampleName', width: '90', align: 'center' },
-  { text: '型号', value: 'sampleModel', width: '130', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', width: '90', align: 'center' },
-  { text: '备注', value: 'remark', width: '110', align: 'center' },
+  { text: '仪器名称', value: 'sampleName', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
   { text: '送检时间', value: 'realDeliverTime', align: 'center', width: '180' },
 ])
 const visible = ref(false) // 对话框显隐
@@ -24,19 +25,34 @@
 }
 
 // 点击确定
-const clickConfirm = () => {
-  // if (!checkoutList.value.length) {
-  //   ElMessage({
-  //     message: '请选中',
-  //     type: 'warning',
-  //   })
-  // }
-  // emits('confirmCheckout', checkoutList.value)
-  // cancle()
+const printObj = ref({
+  id: 'labelHtml', // 需要打印元素的id
+  popTitle: '', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  standard: '',
+  extarCss: '',
+})
+
+// 点击删除
+const deleteRow = (index: number) => {
+  list.value.splice(index, 1)
 }
 
 function initDialog(value: any) {
-  list.value = value
+  list.value = value.map((item: { sampleStatus: string; remark: string; realDeliverTime: string }) => {
+    return {
+      ...item,
+      realDeliverTime: `${item.sampleStatus}` === '1' ? dayjs().format('YYYY-MM-DD HH:mm:ss') : item.realDeliverTime, // 待收入送检时间默认今天
+      remark: item.remark || '无',
+    }
+  })
   visible.value = true
   nextTick(() => {
     JsBarcode('#barcode').init()
@@ -47,14 +63,15 @@
 </script>
 
 <template>
-  <el-dialog v-model="visible" title="标签打印" width="85%" @close="cancle">
-    <div style="display: flex;">
+  <el-dialog v-model="visible" title="标签打印" width="1300px" @close="cancle">
+    <div style="display: flex;overflow: hidden;position: relative;">
       <normal-table
         :data="list"
         :pagination="false"
         :columns="columns"
         :is-showmulti-select="false"
-        style="width: 50%;"
+        :max-height="460"
+        style="width: 860px;margin-right: 40px;"
       >
         <!-- 序号 -->
         <template #preColumns>
@@ -64,45 +81,104 @@
             </template>
           </el-table-column>
         </template>
+        <template #columns>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            width="90"
+          >
+            <template #default="scope">
+              <el-button
+                size="small"
+                type="danger"
+                link
+                @click="deleteRow(scope.$index)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
       </normal-table>
-      <!-- 标签 -->
-      <div v-for="(item, index) in list" :key="index">
-        <div style="width: 300px; height: 240px; margin-left: 20px;box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
-          <div style="white-space: nowrap;">
-            <span style="margin-right: 16px;">送检时间</span>
-            <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+
+      <div style="height: 460px;overflow-y: auto;">
+        <!-- 标签 -->
+        <div style="background-color: #fff;">
+          <div style="display: flex;flex-direction: column;width: 330px;">
+            <div v-for="(item, index) in list" :key="index" style="margin-bottom: 10px;width: 300px; height: 240px; box-sizing: border-box; border: 1px solid #606266; border-radius: 3px; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+              <div style="white-space: nowrap;">
+                <span style="margin-right: 16px;">送检时间</span>
+                <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">仪器名称</span>
+                <span style="font-weight: 600;">{{ item.sampleName }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">型ㅤㅤ号</span>
+                <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">出厂编号</span>
+                <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+              </div>
+              <div>
+                <span style="margin-right: 16px;">备ㅤㅤ注</span>
+                <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+              </div>
+              <img
+                id="barcode"
+                style="width: 200px;margin-left: 30px;margin-top: 10px;"
+                :jsbarcode-value="item.sampleNo"
+                jsbarcode-textmargin="0"
+                jsbarcode-fontoptions="bold"
+              >
+            </div>
           </div>
-          <div>
-            <span style="margin-right: 16px;">仪器名称</span>
-            <span style="font-weight: 600;">{{ item.sampleName }}</span>
+        </div>
+
+        <div id="labelHtml" style="display: flex;flex-direction: column;position: absolute;top: 0;right: 0;z-index: -999999;">
+          <div v-for="(item, index) in list" :key="index" style="width: 300px; height: 240px; box-sizing: border-box; padding: 10px 20px;display: flex;flex-direction: column;line-height: 24px;">
+            <div style="white-space: nowrap;">
+              <span style="margin-right: 16px;">送检时间</span>
+              <span style="font-weight: 600;">{{ item.realDeliverTime }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">仪器名称</span>
+              <span style="font-weight: 600;">{{ item.sampleName }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">型ㅤㅤ号</span>
+              <span style="font-weight: 600;">{{ item.sampleModel }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">出厂编号</span>
+              <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
+            </div>
+            <div>
+              <span style="margin-right: 16px;">备ㅤㅤ注</span>
+              <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
+            </div>
+            <img
+              id="barcode"
+              style="width: 200px;margin-left: 30px;margin-top: 10px;"
+              :jsbarcode-value="item.sampleNo"
+              jsbarcode-textmargin="0"
+              jsbarcode-fontoptions="bold"
+            >
           </div>
-          <div>
-            <span style="margin-right: 16px;">型ㅤㅤ号</span>
-            <span style="font-weight: 600;">{{ item.sampleModel }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">出厂编号</span>
-            <span style="font-weight: 600;">{{ item.manufacturingNo }}</span>
-          </div>
-          <div>
-            <span style="margin-right: 16px;">备ㅤㅤ注</span>
-            <span style="font-weight: 600;">{{ item.remark || '无' }}</span>
-          </div>
-          <svg
-            id="barcode"
-            style="width: 300px;height: 240px;"
-            :jsbarcode-value="item.sampleNo"
-            jsbarcode-textmargin="0"
-            jsbarcode-fontoptions="bold"
-          />
         </div>
       </div>
     </div>
-
     <template #footer>
-      <el-button type="primary" @click="clickConfirm">
-        确定
+      <el-button v-print="printObj" type="primary">
+        打印
       </el-button>
+      <!-- <el-button type="primary" @click="printHtml('labelHtml')">
+        打印
+      </el-button> -->
+
       <el-button @click="cancle">
         取消
       </el-button>
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 8ff7808..a3e3ffe 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -562,7 +562,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
+        <!-- <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/labelPrint') && currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" /> -->
+        <icon-button v-if="currentMenu !== '已归还'" icon="icon-label-print" title="标签打印" type="primary" @click="handleClickLabelPrint" />
         <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-deviceBlue" title="扫描收入" type="primary" @click="scanTake" />
         <icon-button v-if="proxy.hasPerm('/schedule/interchangeList/scanOver') && (currentMenu === '已收入') " icon="icon-device" title="扫描结束检定" type="primary" @click="scanFinish" />
diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue
index 4e90794..9f75ddc 100644
--- a/src/views/business/schedule/order/orderEdit.vue
+++ b/src/views/business/schedule/order/orderEdit.vue
@@ -72,6 +72,7 @@
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   // { text: '电源电压', value: 'powerVoltage', align: 'center', required: true },
   { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },
@@ -86,6 +87,7 @@
   { text: '被测样品名称', value: 'sampleName', align: 'center', required: true },
   { text: '型号规格', value: 'sampleModel', align: 'center', required: true },
   { text: '仪器编号', value: 'manufacturingNo', align: 'center', required: true },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: true },
   { text: '样品编号', value: 'sampleNo', align: 'center', width: '170', disabled: true, required: true },
   { text: '证书要求', value: 'certificateRequire', align: 'center', required: false },
   { text: '外观状态', value: 'appearanceStatus', align: 'center', required: true },