From c6a17240a06c52001fe2a51040f97e20c0e6f7fb Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 十二月 2023 13:14:51 +0800
Subject: [PATCH] 	modified:   src/views/equipment/equipment/index.vue 	modified:   src/views/equipment/metering/index.vue 	modified:   src/views/plan/manufacturingorder/index.vue 	modified:   src/views/quality/Packaging_ledger/index.vue

---
 src/views/quality/Packaging_ledger/index.vue |   71 ++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index b4837ac..4852053 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -128,23 +128,25 @@
         </packfromadd>
       </basic-container>
       <el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
-        <div id="qrCard" class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
-          <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px;">
-            <el-row>
-              <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
-              <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
-            </el-row>
-            <el-row> 
-              <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col>
-              <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="10" :offset="3">浜岀淮鐮侊細</el-col>
-              <el-col :span="10">
-                <vueQr :text="JSON.stringify(item)" :size="120" :margin="1"></vueQr>
-              </el-col>
-            </el-row>
-          </el-card>
+        <div style="width:100%;height: 400px;overflow-y: auto;">
+          <div id="qrCard" class="dia_body">
+            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 10px;">
+              <el-row>
+                <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+                <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+              </el-row>
+              <el-row> 
+                <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col>
+                <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="10" :offset="3">浜岀淮鐮侊細</el-col>
+                <el-col :span="10">
+                  <vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
+                </el-col>
+              </el-row>
+            </el-card>
+          </div>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
@@ -313,20 +315,27 @@
       printFun() {
           this.diaPrintTab = false;
           PrintJS({
-              printable: "qrCard",
-              type: "html",
-              // header: "鍘熸潗鏂欐娴嬫姤鍛�",
-              targetStyles: ["*"],
-              style: `@page {margin: 0mm 5mm;}
-                      html {zoom:100%;}
-                      @media print {
-                        html,body{
-                          width:60mm;
-                          height:40mm;
-                        }
-                      }`,
-              ignoreElements: ["no-ignore"],
-              orientation: 'portrait'
+              printable: 'qrCard',//椤甸潰
+              type: "html",//鏂囨。绫诲瀷
+                maxWidth:450,
+                targetStyles:['*'],                 
+                style: `@page {
+                  margin:0;
+                  padding: 0;
+                  size: 360px 170px;
+                }
+                html{
+                  zoom:100%;
+                }
+                @media print{
+                  width: 360px;
+                  height: 170px;
+                  margin:0;
+                  padding: 0;
+                }`,
+                onPrintDialogClose: this.erexcel=false,
+                targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+                font_size: '',
           });
       },
       handleSelectionChange(val){

--
Gitblit v1.9.3