From 063a017a452f3d18be61aa4f07df34641bd4a37e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 13:42:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 4 ++++
src/main/webapp/views/matCode/matCode.html | 4 ++--
src/main/webapp/static/js/matCode/matCode.js | 11 +++++++----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 62355ae..e9f4ef0 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -170,6 +170,10 @@
@RequestMapping(value = "/macCode/barcode/auth")
// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
+ if (Cools.isEmpty(param)){
+ System.out.println(1);
+ return R.parse(BaseRes.EMPTY);
+ }
BufferedImage img = BarcodeUtils.encode(param);
if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
throw new IOException("Could not write an image of format jpg");
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index d443f0d..2340b15 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -337,12 +337,16 @@
async: false,
success: function (res) {
if (res.code === 200){
+ layer.closeAll();
+ for (let i=0;i<res.data.length;i++){
+ res.data[i].barcodeUrl=baseUrl+"/macCode/barcode/auth?param="+res.data[i].barcodeUrl;
+ }
+ console.log(res.data);
var tpl = $("#templatePreview"+templateNo).html();
var template = Handlebars.compile(tpl);
var html = template(res);
- $("#box").html(html);
- $("#box").print();
- // $('#template-preview-'+templateNo).print();
+ let box = $("#box");
+ box.html(html);box.show();box.print();box.hide();
} else if (res.code === 403){
top.location.href = baseUrl;
}else {
@@ -350,7 +354,6 @@
}
}
})
-
})
// 鏁版嵁淇濆瓨鍔ㄤ綔
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index cb32b79..2498ce6 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -204,7 +204,7 @@
</div>
</div>
-<div id="box" style="display: block">
+<div id="box" style="display: block"></div>
<!-- 妯℃澘寮曟搸 -->
<!-- 妯℃澘1 -->
@@ -214,7 +214,7 @@
<tr>
<td colspan="1" align="right" scope="col">鏉＄爜</td>
<td class="barcode"colspan="3" align="left" scope="col">
- <img class="qrcode" src="/macCode/barcode/auth?param={{this.barcode}}" width="80%">
+ <img class="qrcode" src="/macCode/barcode/auth?param={{this.barcodeUrl}}" width="80%">
</td>
</tr>
<tr>
--
Gitblit v1.9.1