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      |   26 +++--
 src/views/plan/manufacturingorder/index.vue  |   65 +++++++++++----
 src/views/equipment/metering/index.vue       |   75 +++++++++++++-----
 src/views/quality/Packaging_ledger/index.vue |   71 ++++++++++-------
 4 files changed, 153 insertions(+), 84 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index c5911e0..3d83470 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -18,9 +18,11 @@
         ref="addOrUpdate"
         @refreshDataList="getData"
       ></table-form>
-      <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
+    </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: 30px; font-size: 16px !important;">
+          <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;">{{ tem.id }}</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>
 
@@ -296,15 +298,17 @@
                   targetStyles:['*'],                 
                   style: `@page {
                     margin:0;
-                    size: 360px 175px;
+                    padding: 0;
+                    size: 360px 170px;
                   }
-                  hrml{
+                  html{
                     zoom:100%;
                   }
                   @media print{
                     width: 360px;
-                    height: 175px;
+                    height: 170px;
                     margin:0;
+                    padding: 0;
                   }`,
                   onPrintDialogClose: this.erexcel=false,
                   targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index ea43bd6..022b8cd 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -19,32 +19,34 @@
           @refreshDataList="getData"
         ></table-form>
       </basic-container>
-      <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
-        <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
-          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :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;">{{ tem.code }}</el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="10" :offset="3">璁惧鍚嶇О锛�</el-col>
-              <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="10" :offset="3">璁惧浜岀淮鐮侊細</el-col>
-              <el-col :span="10">
-                <vueQr :text="tem.code" :size="80" :margin="2"></vueQr>
-              </el-col>
-            </el-row>
-          </el-card>
+      <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+        <div style="width:100%;height:400px;overflow-y: auto;">
+          <div class="dia_body" id="printMetering">
+            <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="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;">{{ tem.code }}</el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="10" :offset="3">璁惧鍚嶇О锛�</el-col>
+                <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="10" :offset="3">璁惧浜岀淮鐮侊細</el-col>
+                <el-col :span="10">
+                  <vueQr :text="tem.code" :size="80" :margin="2"></vueQr>
+                </el-col>
+              </el-row>
+            </el-card>
+          </div>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
-          <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+          <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
         </span>
       </el-dialog>
     </div>
@@ -58,6 +60,7 @@
   import * as fecha from 'element-ui/lib/utils/date'
   import { remote } from '../../../api/admin/dict'
   import vueQr from 'vue-qr'
+  import PrintJS from 'print-js'
   export default {
     data() {
       return {
@@ -321,6 +324,32 @@
       })
     },
     methods: {
+      printFun() {
+          this.diaPrintTab = false;
+          PrintJS({
+              printable: 'printMetering',//椤甸潰
+              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: '',
+          });
+      },
       pullEquipFun(){
         this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
         pullEquip().then(res=>{
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index b1bc910..70eff09 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -197,28 +197,30 @@
       </el-dialog>
     </basic-container>
     <!-- 鏍囩鎵撳嵃 -->
-    <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px">
-      <div 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;width:100%">
-              <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.moNo2 }}</el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
-                <el-col :span="10">
-                  <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
-                </el-col>
-              </el-row>
-          </el-card>
+    <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
+      <div style="width:100%;height: 400px;overflow-y: auto;">
+        <div class="dia_body" id="printMOrder">
+          <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+                <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.moNo2 }}</el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+                  <el-col :span="10">
+                    <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
+                  </el-col>
+                </el-row>
+            </el-card>
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
-        <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+        <el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
       </span>
     </el-dialog>
   </div>
@@ -250,6 +252,7 @@
 import { getStore } from '@/util/store.js'
 import { getObj as getSysParam } from '@/api/admin/sys-public-param'
 import vueQr from 'vue-qr'
+import PrintJS from 'print-js'
 export default {
   data() {
     return {
@@ -1052,6 +1055,30 @@
     // this.initQueryParams()
   },
   methods: {
+    printFun() {
+        this.diaPrintTab = false;
+        PrintJS({
+            printable: 'printMOrder',//椤甸潰
+            type: "html",//鏂囨。绫诲瀷
+              maxWidth:450,
+              targetStyles:['*'],                 
+              style: `@page {
+                margin:0;
+                size: 360px 175px;
+              }
+              html{
+                zoom:100%;
+              }
+              @media print{
+                width: 360px;
+                height: 175px;
+                margin:0;
+              }`,
+              onPrintDialogClose: this.erexcel=false,
+              targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
+              font_size: '',
+        });
+    },
     getManufactureAttr(row, column, cellValue) {
       this.manufactureAttrs.forEach((obj) => {
         if (obj.value === cellValue) {
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