From 185f48c0ff3712937cf211dcaa72d6ddccc996fa Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 06 八月 2024 11:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 src/components/view/b1-inspection-order.vue |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 158a138..a5d4366 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -374,7 +374,7 @@
                           <el-col  style="font-weight: bold;"><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
                         </el-row>
                         <el-row style="margin-top: 1px;font-size: 14px;">
-                          <el-col  style="font-weight: bold;"><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
+                          <el-col  style="font-weight: bold;"><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sample }}</el-col>
                         </el-row>
                         <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
                           <el-col  style="font-weight: bold;"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
@@ -401,31 +401,31 @@
       </span>
     </el-dialog>
     <div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
-        <div id="printMOrder" class="printMOrder">
-          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.16cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
+        <div id="printMOrder" class="printMOrder" ref="printMOrder">
+          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
             <div style="display: flex;">
               <div>
                 <el-col :span="10" :offset="2">
                   <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
                 </el-col>
               </div>
-              <div style="margin-left: 0.32cm;line-height: 0.21cm;">
+              <div style="margin-left: 0.32cm;line-height: 0.22cm;">
                 <el-row>
-                  <el-col  style="font-size: 0.16cm;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
+                  <el-col  style="font-size: 0.20cm;width: 4cm;" class="single-line-ellipsis"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.16cm;">
+                <el-row style="font-size: 0.20cm;">
                   <el-col><span>濮旀墭鍗曞彿:&nbsp; </span>{{ item.code }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.16cm;">
+                <el-row style="font-size: 0.20cm;">
                   <el-col><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.16cm;">
-                  <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
+                <el-row style="font-size: 0.20cm;">
+                  <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sample }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.16cm;width: 5.6cm;">
+                <el-row style="font-size: 0.20cm;width: 4cm;">
                   <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
                 </el-row>
-                <el-row style="margin-top: 0.01cm;font-size: 0.16cm;">
+                <el-row style="margin-top: 0.01cm;font-size: 0.20cm;">
                   <el-col  style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:&nbsp;
                   </span>
                     <span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
@@ -818,7 +818,7 @@
               targetStyles:['*'],
               style: `@page {
                 margin:0;
-                size: 360px 175px collapse;
+                size: 400px 75px collapse;
                 margin-top:3px;
                 &:first-of-type{
                   margin-top:0 !important;
@@ -828,13 +828,13 @@
                 zoom:100%;
               }
               @media print{
-                width: 360px;
-                height: 175px;
+                width: 400px;
+                height: 75px;
                 margin:0;
               }`,
               onPrintDialogClose: this.erexcel=false,
               targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
-              font_size: '0.16cm',
+              font_size: '0.20cm',
         });
       },
       print(){

--
Gitblit v1.9.3