From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/quality/Packaging_ledger/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index d254576..f1a80aa 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -147,7 +147,7 @@
</packfromadd>
</basic-container>
<el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
- <div style="width:100%;height: 400px;overflow-y: auto;">
+ <div style="width:100%;height: 400px;overflow-y: auto;page-break-before:always;page-break-after: always;">
<div class="dia_body" id="qrCard">
<el-card v-for="(item, i) in qrData" :key="i" >
<div>
@@ -190,8 +190,8 @@
<tr class="x1111113">
<td class="x1111114" colspan=6>
<div style="height: 75px;" >
- <p><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p>
- <p><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p>
+ <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鍦板潃锛氭睙鑻忕渷鍗楅�氱粡娴庢妧鏈紑鍙戝尯甯稿叴璺�96鍙�</span></p>
+ <p style="margin-top: 0;margin-bottom: 0;"><span lang="EN-US" class="x1111112">鐢佃瘽/浼犵湡锛�0513鈥�89191125</span></p>
</div>
</td>
</tr>
--
Gitblit v1.9.3