From 3b8d5759a3e2aaa170b848cc6a85d34274bd4f72 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 10:57:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 2
src/main/webapp/views/matCode/matCode.html | 101 ++++++++++++++++++++++++++++----------------------
src/main/webapp/static/js/matCode/matCode.js | 3 +
3 files changed, 59 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eea80d8..62355ae 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -168,7 +168,7 @@
// todo resource
@RequestMapping(value = "/macCode/barcode/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
+// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
BufferedImage img = BarcodeUtils.encode(param);
if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index e28072a..711f5a2 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -374,10 +374,11 @@
layer.open({
type: 1,
title: '鎵撳嵃',
+ // area: ['500px', top.detailHeight],
shadeClose: true,
content: $('#printDataDiv'),
success: function(layero, index){
-
+ layer.iframeAuto(index);
},
end: function () {
}
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 22558f0..5fe2f6e 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -22,6 +22,11 @@
}
/* ------------------------------------------------ */
+ .template-preview {
+ display: inline-block;
+ }
+
+
.contain {
border: 1px solid #000;
/*width: 100%;*/
@@ -123,52 +128,58 @@
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
<div id="printDataDiv" style="display: none;padding: 20px">
- <div class="layui-form">
- <div id="template-container">
- <!-- 棰勮鍥� 1 -->
- <div id="template-preview-1" class="template-preview">
- <table class="contain" height="317" width="317" style="overflow: hidden">
- <tr>
- <td width="20%" align="right" scope="col">瀹㈡埛</td>
- <td class="customer" width="30%" align="left" scope="col">{{this.customer}}</td>
- <td width="20%" align="right" scope="col">棰滆壊</td>
- <td class="color" width="30%" align="left" scope="col">1</td>
- </tr>
- <tr>
- <td align="right">鐢熶骇鏃ユ湡</td>
- <td class="createTime" align="left">{{this.createTime$}}</td>
- <td align="right">鏁伴噺</td>
- <td class="amount" align="left">{{this.amount}}</td>
- </tr>
- <tr>
- <td align="right">鍨嬪彿鎵撳瓧</td>
- <td class="modelType" align="left" colspan="3">{{this.modelType}}</td>
- </tr>
- <tr>
- <td align="right">浜у搧鎵瑰彿</td>
- <td class="seq" align="left">{{this.seq}}</td>
- <td colspan="2" rowspan="3" align="right"><img class="qrcode" src="" style="width: 80%"></td>
- </tr>
- <tr>
- <td align="right">瑁呮楠屽彿</td>
- <td class="boxCheck" align="left">{{this.boxCheck}}</td>
- </tr>
- <tr>
- <td align="right">绠卞彿</td>
- <td class="boxNumber" align="left">{{this.boxNumber}}</td>
- </tr>
- </table>
+ <div class="layui-form" style="text-align: center">
+ <!--鍗曢�夋-->
+ <div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
+ <input type="radio" name="sex" value="鐢�" title="妯℃澘涓�" checked="">
+ <input type="radio" name="sex" value="濂�" title="妯℃澘浜�">
+ <input type="radio" name="sex" value="绂�" title="妯℃澘涓�">
+ </div>
+ <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left">
+ <legend>鎵撳嵃棰勮</legend>
+ <div id="template-container" style="margin: 20px;text-align: center">
+ <!-- 棰勮鍥� 1 -->
+ <div id="template-preview-1" class="template-preview">
+ <table class="contain" height="317" width="317" style="overflow: hidden">
+ <tr>
+ <td width="20%" align="right" scope="col">瀹㈡埛</td>
+ <td class="customer" width="30%" align="left" scope="col">{{this.customer}}</td>
+ <td width="20%" align="right" scope="col">棰滆壊</td>
+ <td class="color" width="30%" align="left" scope="col">1</td>
+ </tr>
+ <tr>
+ <td align="right">鐢熶骇鏃ユ湡</td>
+ <td class="createTime" align="left">{{this.createTime$}}</td>
+ <td align="right">鏁伴噺</td>
+ <td class="amount" align="left">{{this.amount}}</td>
+ </tr>
+ <tr>
+ <td align="right">鍨嬪彿鎵撳瓧</td>
+ <td class="modelType" align="left" colspan="3">{{this.modelType}}</td>
+ </tr>
+ <tr>
+ <td align="right">浜у搧鎵瑰彿</td>
+ <td class="seq" align="left">{{this.seq}}</td>
+ <td colspan="2" rowspan="3" align="right"><img class="qrcode" src="" style="width: 80%"></td>
+ </tr>
+ <tr>
+ <td align="right">瑁呮楠屽彿</td>
+ <td class="boxCheck" align="left">{{this.boxCheck}}</td>
+ </tr>
+ <tr>
+ <td align="right">绠卞彿</td>
+ <td class="boxNumber" align="left">{{this.boxNumber}}</td>
+ </tr>
+ </table>
+ </div>
+ <!-- 棰勮鍥� 2 -->
+ <div class="template-preview"></div>
+ <!-- 棰勮鍥� 3 -->
+ <div class="template-preview"></div>
</div>
- <!-- 棰勮鍥� 2 -->
- <div class="template-preview"></div>
- <!-- 棰勮鍥� 3 -->
- <div class="template-preview"></div>
- </div>
- <div class="select-template">
- <label><input type="radio" name="templateSelect" value="1" checked>妯℃澘涓�</label>
- <label><input type="radio" name="templateSelect" value="2"> 妯℃澘浜�</label>
- </div>
- <button class="layui-btn layui-btn-danger" id="doPrint" lay-submit lay-filter="doPrint">纭畾</button>
+ </fieldset>
+
+ <button class="layui-btn layui-btn-danger" id="doPrint" lay-submit lay-filter="doPrint" style="margin-top: 20px">纭畾</button>
</div>
</div>
--
Gitblit v1.9.1