From 172403d098efa765a013eaf8246fbfc50281fd9f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 02 八月 2024 23:15:18 +0800
Subject: [PATCH] Merge branch 'test'

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

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index cfbd78f..40baf61 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -389,31 +389,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">
-          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.21cm !important;page-break-after: always;color: #000;box-shadow: 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 style="display: flex;">
               <div>
                 <el-col :span="10" :offset="2">
-                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
+                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
                 </el-col>
               </div>
-              <div style="margin-left: 0.32cm;line-height: 0.25cm;">
+              <div style="margin-left: 0.32cm;line-height: 0.21cm;">
                 <el-row>
-                  <el-col  style="font-size: 0.21cm;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
+                  <el-col  style="font-size: 0.16cm;"><span>鏍峰搧缂栧彿:&nbsp; </span>{{ item.sampleCode }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.21cm;">
+                <el-row style="font-size: 0.16cm;">
                   <el-col><span>濮旀墭鍗曞彿:&nbsp; </span>{{ item.code }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.21cm;">
+                <el-row style="font-size: 0.16cm;">
                   <el-col><span>瑙勬牸鍨嬪彿:&nbsp; </span>{{ item.model }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.21cm;">
+                <el-row style="font-size: 0.16cm;">
                   <el-col ><span>鏍峰搧鍚嶇О:&nbsp; </span>{{ item.sampleName }}</el-col>
                 </el-row>
-                <el-row style="font-size: 0.21cm;width: 4.77cm;">
+                <el-row style="font-size: 0.16cm;width: 5.6cm;">
                   <el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�:&nbsp; </span>{{ item.item }}</el-col>
                 </el-row>
-                <el-row style="margin-top: 0.01cm;font-size: 0.21cm;">
+                <el-row style="margin-top: 0.01cm;font-size: 0.16cm;">
                   <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>寰呮
@@ -531,7 +531,7 @@
 						type: 'text',
 						method: 'handleIssued',
 						disabFun: (row, index) => {
-							return row.state != 1 || !row.assign
+							return row.state != 1 || row.assign
 						}
 					}],
 					linkEvent: {
@@ -635,7 +635,7 @@
               },
               {
                 name:'model',
-                index:2
+                index:5
               }
             ]
           },
@@ -758,6 +758,10 @@
               style: `@page {
                 margin:0;
                 size: 360px 175px collapse;
+                margin-top:3px;
+                &:first-of-type{
+                  margin-top:0 !important;
+                }
               }
               html{
                 zoom:100%;
@@ -769,7 +773,7 @@
               }`,
               onPrintDialogClose: this.erexcel=false,
               targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
-              font_size: '0.21cm',
+              font_size: '0.16cm',
         });
       },
       print(){

--
Gitblit v1.9.3