From 82bd97c5a0e05c936f62acf28ac4969b351b6d59 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 九月 2025 10:15:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/hook/createTemplateTag.js | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js b/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
index 848c54a..9bb700c 100644
--- a/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
+++ b/north-glass-erp/northglass-erp/src/hook/createTemplateTag.js
@@ -25,6 +25,7 @@
// 璁板綍鏁翠綋涓暟
let limitCount = 0;
+ let size = 0;
// top: 璁板綍 鎵撳嵃鍏冪礌 top鍊硷紙娉ㄦ剰鍗曚綅锛夛紱 鎻愮ず锛氱浉褰撲簬璁板綍涓婃濉厖鍒板摢鍎夸簡
for (let v = 1, top = 0; v <= ver; v++) {
@@ -36,21 +37,24 @@
// 鑾峰彇 妯℃澘 鐨� 鎵撳嵃鍏冪礌
let printElements1 = hiprintTemplateMap.panels[0].printElements;
const printElements2 = printElements1.map((items) => {
+
const item = JSON.parse(JSON.stringify(items))
// 鍋忕Щ閲忚绠�
item.options.top += top
item.options.left += left
// !! 鍏冪礌鐨勫瓧娈靛悕 鑲畾涓嶈兘閲嶅鍛�! 鎵�浠ラ渶瑕佺壒娈婂鐞�!!!
- if (item.options.field) {
+ if (item.options.field ) {
// 鍙婂彉鎴� 瀛楁鍚� + 绗� v 琛� 绗� h 鍒�
// 濡�: qrcode 鍙樻垚 qrcode_1_1 (绗� 1 琛� 鐨� 绗� 1 鍒�)
item.options.field += `_${v}_${h}`
}
return item;
})
+ //鍒ゆ柇鎬讳釜鏁版槸鍚﹁秴杩囨爣绛炬暟閲�
+ if(limitCount<dataList.length){
+ template.panels[0].printElements = template.panels[0].printElements.concat(printElements2)
+ }
-
- template.panels[0].printElements = template.panels[0].printElements.concat(printElements2)
// 3.3. 璁＄畻 涓嬩竴鍒� 妯℃澘鐨� left 鍊� 锛堝崟浣嶈浆鎹級
left += hinnn.mm.toPt(hiprintTemplateMap.panels[0].width)
// 璁板綍鏁翠綋涓暟
@@ -59,7 +63,6 @@
// 3.4 璁＄畻涓嬩竴琛� 妯℃澘鐨� top 鍊� 锛堝崟浣嶈浆鎹級
top += hinnn.mm.toPt(hiprintTemplateMap.panels[0].height)
}
-
--
Gitblit v1.8.0