From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/inout-print.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/inout-print.js b/igds-web/src/main/resources/static/admin/inout/inout-print.js
index 8855dc5..cf9a101 100644
--- a/igds-web/src/main/resources/static/admin/inout/inout-print.js
+++ b/igds-web/src/main/resources/static/admin/inout/inout-print.js
@@ -2,20 +2,28 @@
* 鎵撳嵃杩囩鍗�
*/
printWeight = function (htmlStr) {
- var LODOP = CLODOP;
+ // var LODOP = CLODOP
+ var LODOP = getLodop();
if ("5016" == companyId) {
LODOP.PRINT_INIT("绉伴噸鍗�");
+ //鍊间负1--绾靛悜鎵撳嵃锛屽浐瀹氱焊寮�;
+ // 鍊间负2--妯悜鎵撳嵃锛屽浐瀹氱焊寮�;
+ // 鍊间负3--绾靛悜鎵撳嵃锛屽浐瀹氬搴︼紝楂樺害鎸夋墦鍗板唴瀹圭殑楂樺害鑷�傚簲;
LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.ADD_PRINT_HTM("10%", "10%", "100%", "100%", htmlStr);
LODOP.PREVIEW();
} else {
LODOP.PRINT_INIT("杩囩鍗�");
//LODOP.SET_PRINT_PAGESIZE(1, 0, '90mm', "A4");
- LODOP.SET_PRINT_PAGESIZE(1, 2100, 1400, "A4");
+ LODOP.SET_PRINT_PAGESIZE(1, '210mm', '140mm', "A4");
//LODOP.SET_PRINT_PAGESIZE(3, 2100, '45', "A4");
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ //鎵撳嵃澶氫唤
+ // LODOP.SET_PRINT_COPIES(3);
LODOP.PREVIEW();
//LODOP.PRINT_DESIGN();
}
};
+
+
--
Gitblit v1.9.3