From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

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

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 14d13cc..3d7dfd3 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -156,7 +156,7 @@
 		<div style="width: 100%;height: 100%;" v-if="active == 0">
 			<div>
 				<el-row class="title">
-					<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
+					<el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屼笅鍗�</el-col>
 					<el-col :span="12" style="text-align: right;">
             <el-button size="medium" type="primary" @click="print">鏍囩鎵撳嵃</el-button>
 						<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
@@ -343,7 +343,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.sample }}</el-col>
+                          <el-col  style="font-weight: bold;"><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</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>
@@ -369,16 +369,16 @@
         </el-row>
       </span>
     </el-dialog>
-    <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
+    <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 0;z-index: 99999;">
         <div id="printMOrder">
-          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;">
+          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;box-shadow: none;margin-bottom: 6px;padding-left: 160px;" >
             <div style="display: flex;">
               <div>
                 <el-col :span="8" :offset="4">
                   <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
                 </el-col>
               </div>
-              <div style="margin-left: 57px;line-height: 9px;">
+              <div style="margin-left: 40px;line-height: 9px;">
                 <el-row>
                   <el-col  style="font-size: 8px;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
                 </el-row>
@@ -389,9 +389,9 @@
                   <el-col><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
                 </el-row>
                 <el-row style="font-size: 8px;">
-                  <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sample }}</el-col>
+                  <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
                 </el-row>
-                <el-row style="font-size: 8px;">
+                <el-row style="font-size: 8px;width: 140px;">
                   <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
                 </el-row>
                 <el-row style="margin-top: 3px;font-size: 8px;">
@@ -412,7 +412,7 @@
             </div>
           </el-card>
         </div>
-      </div>
+    </div>
 	</div>
 </template>
 
@@ -651,9 +651,9 @@
         insOrderRow:{},
         checkIndexList:[],
         checkDataList:[
-          // {
-          //   sampleCode:'11111'
-          // }
+          {
+            sampleCode:'11111'
+          }
         ],
         qrData:[],
         multipleSelection:[]
@@ -730,11 +730,11 @@
         PrintJS({
             printable: 'printMOrder',//椤甸潰
             type: "html",//鏂囨。绫诲瀷
-              maxWidth:450,
+              maxWidth:360,
               targetStyles:['*'],
               style: `@page {
                 margin:0;
-                size: 360px 175px landscape;
+                size: 360px 175px collapse;
               }
               html{
                 zoom:100%;

--
Gitblit v1.9.3