From cae008d8286b7ee846eb91e79350a9c57166882d Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 12 六月 2024 15:41:28 +0800
Subject: [PATCH] 打印
---
HTML_09/views/SystemSettings/PrintTemplateFrom.html | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HTML_09/views/SystemSettings/PrintTemplateFrom.html b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
index f52cedf..b4f94dd 100644
--- a/HTML_09/views/SystemSettings/PrintTemplateFrom.html
+++ b/HTML_09/views/SystemSettings/PrintTemplateFrom.html
@@ -73,7 +73,7 @@
<!--鎵撳嵃閮ㄥ垎-->
<div class="layui-col-xs8" style="overflow: hidden;outline: none;">
<!--鎵撳嵃澶撮儴鍒�-->
- <div class="hiprint-toolbar" style="margin-top:15px;">
+ <div class="hiprint-toolbar" style="margin-top:15px;margin-left:10px;">
<ul>
<!-- <li><a class="hiprint-tizee-btn" onclick="setPaper('A3')">A3</a></li> -->
<li><a class="hiprint-tizee-btn" onclick="setPaper('A4')">A4</a></li>
@@ -109,8 +109,10 @@
<div style="clear:both;"></div>
</div>
<!--鎵撳嵃涓讳綋閮ㄥ垎-->
- <div id="hiprint-printTemplate" class="hiprint-printTemplate"
- style="margin-top:20px; overflow-x: scroll; overflow-y: hidden;">
+ <div style="overflow-x: scroll; overflow-y: hidden;">
+ <div id="hiprint-printTemplate" class="hiprint-printTemplate"
+ style="margin-top:20px;margin-left:20px;">
+ </div>
</div>
<textarea class="form-control" rows="10" id="A4_textarea_json" style="display: none;"></textarea>
</div>
@@ -242,7 +244,9 @@
//鍒濆鍖栨墦鍗版彃浠舵覆鏌�
// $(".hiprintEpContainer").html(""); //娓呴櫎div鍐呭
-
+ if (parent.objRowsData.Type) {
+ datalist = getPrintDataList()(parent.objRowsData.Type);
+ }
hiprint.init({
providers: [new configElementTypeProvider()]
});
@@ -251,8 +255,8 @@
'testModule');
let hiprintTemplate;
- if (window.parent.objRowsData.PositionJson)
- var JsonData = JSON.parse(window.parent.objRowsData.PositionJson)
+ if (parent.objRowsData.PositionJson)
+ var JsonData = JSON.parse(parent.objRowsData.PositionJson)
if (JsonData) {
$("#customWidth").val(JsonData.panels[0].width);
$("#customHeight").val(JsonData.panels[0].height);
--
Gitblit v1.8.0