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/equipment/equipment/index.vue |   47 ++++++++++++++++++++++++++++-------------------
 1 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 9be5723..3d83470 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -18,12 +18,14 @@
         ref="addOrUpdate"
         @refreshDataList="getData"
       ></table-form>
-      <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
-        <div class="dia_body">
-          <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
+    </basic-container>
+    <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+      <div style="width:100%;height:400px;overflow-y: auto;">
+        <div class="dia_body" id="printRaw">
+          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
             <el-row>
               <el-col :span="8" :offset="1">搴忓彿锛�</el-col>
-              <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
+              <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
             </el-row>
             <el-row>
               <el-col :span="8" :offset="1">缂栧彿锛�</el-col>
@@ -41,12 +43,12 @@
             </el-row>
           </el-card>
         </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
-          <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
-        </span>
-      </el-dialog>
-    </basic-container>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+        <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -290,17 +292,24 @@
             // this.printDialogVisible = false;
             this.diaPrintTab = false;
             PrintJS({
-                printable: "printRaw",
-                type: "html",
-                // maxWidth: 900,
-                // // header: "鍘熸潗鏂欐娴嬫姤鍛�",    
-                // style:"@page {margin:2.4cm 2cm ;resolution: 300dpi;}",
-                // targetStyles: ["*"],
-                // ignoreElements: ["no-ignore"],q
-                // orientation: 'portrait'
+                printable: 'printRaw',//椤甸潰
+                type: "html",//鏂囨。绫诲瀷
                   maxWidth:450,
                   targetStyles:['*'],                 
-                  style:"@page {margin:0  ;resolution: 300dpi;portrait}",
+                  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: '',

--
Gitblit v1.9.3