From a98584f2fb09202a4999d3f9e5df09efee2aedea Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 22 一月 2024 10:01:13 +0800
Subject: [PATCH] 	modified:   src/views/quality/Packaging_ledger/index.vue 	modified:   vue.config.js

---
 vue.config.js                                |    4 ++--
 src/views/quality/Packaging_ledger/index.vue |   37 +++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 462b53e..26b7977 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -139,13 +139,13 @@
       </basic-container>
       <el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
         <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;">
-              <div style="padding: 5px;">
+          <div class="dia_body" id="qrCard">
+            <el-card v-for="(item, i) in qrData" :key="i" >
+              <div>
                   <table border="2px" class="x1111116">
                       <tr class="x1111113">
                             <td class="x1111114" colspan=6>
-                              <div style="height: 75px;display: flex;margin-top: 2px;">
+                              <div style="height: 60px;display: flex;margin-top: 2px;">
                                   <div style="margin-top: 5px;">
                                   <img width="150" height="48"  src="../../../../public/img/image001.jpg" alt="IMG_256">
                                   </div>
@@ -157,9 +157,9 @@
                       </tr>
                       <tr class="x1111117">
                             <td class="x1111114">
-                              <span style="font-family: 瀹嬩綋;text-align: center;">搴�&nbsp;&nbsp;鍙�:</span>
+                              <span style="font-family: 瀹嬩綋;text-align: center;">鍖�&nbsp;瑁�&nbsp;浜�:</span>
                             </td>
-                            <td class="x1111114"  colspan=4 >{{ i + 1 }} </td>
+                            <td class="x1111114"  colspan=4 >{{ item.createUser }} </td>
                             <td class="x1111114"  rowspan=3  >
                               <div style="padding: 1px;">
                               <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
@@ -177,7 +177,6 @@
                               <span style="font-family: 瀹嬩綋;text-align: center;">鍚�&nbsp;鍚�&nbsp;鍙凤細</span>
                             </td>
                             <td class="x1111114" colspan=4>{{ item.contractNo }}</td>
-                            
                       </tr>
                       <tr class="x1111113">
                         <td class="x1111114" colspan=6>
@@ -408,16 +407,16 @@
                 style: `@page {
                   margin:0;
                   padding: 0;
-                  size: 360px 170px;
+                  size: 323px 210px;
                 }
                 html{
                   zoom:100%;
                 }
                 @media print{
-                  width: 360px;
-                  height: 170px;
-                  margin:0;
-                  padding: 0;
+                  width: 323px;
+                  height: 210px;
+                  margin:7cm 0mm 0mm 0mm;
+                  padding: 0mm 10mm;
                 }`,
                 onPrintDialogClose: this.erexcel=false,
                 targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
@@ -425,6 +424,7 @@
           });
       },
       handleSelectionChange(val){
+        console.log(val,"=====");
         this.multipleSelection = val
         let lastRow = val[val.length - 1]
         this.handleCurrentChange(lastRow)
@@ -436,11 +436,13 @@
         }
         this.diaPrintTab = true
         this.multipleSelection.forEach(item=>{
-          let obj = {
+          const obj = {
             packageNo: item.packageNo,
             contractNo: item.contractNo,
-            packageBoxId:item.id
+            packageBoxId:item.id,
+            createUser:item.createUser
           }
+          console.log(obj);
           this.qrData.push(obj)
         })
       },
@@ -550,8 +552,8 @@
 }
 .x1111116{
     border: 1px solid black;
-    height: 220px;
-    width: 450px;
+    height: 200px;
+    width: 445px;
 }
 .x1111114{
     border: 1px solid black;
@@ -565,4 +567,7 @@
     font-size: 12pt;
     font-family: 瀹嬩綋;
 }
+.avue-main .el-card__body {
+    padding: 4px 0px 5px;
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 0e57583..2280c3d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,10 @@
  */
 
 
-const url = 'http://192.168.2.7:9999'
+// const url = 'http://192.168.2.7:9999'
 // const url = 'https://ztms-mes.chinaztt.cn/'
 
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
 
 
 const localUrl = 'http://localhost:8089'

--
Gitblit v1.9.3