From 0bc76829418b6a594baae8a4ef30caa4caa65945 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 10:56:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 2 +-
src/main/webapp/views/matCode/matCode.html | 16 +++++-----------
src/main/webapp/static/js/matCode/matCode.js | 8 ++++----
src/main/java/com/zy/common/utils/BarcodeUtils.java | 4 ++--
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eb4abbe..8ca68d0 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -157,7 +157,7 @@
}
// 鎵撳嵃
- @RequestMapping(value = "/macCode/print/auth")
+ @RequestMapping(value = "/matCode/print/auth")
@ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
diff --git a/src/main/java/com/zy/common/utils/BarcodeUtils.java b/src/main/java/com/zy/common/utils/BarcodeUtils.java
index 707703b..b52a796 100644
--- a/src/main/java/com/zy/common/utils/BarcodeUtils.java
+++ b/src/main/java/com/zy/common/utils/BarcodeUtils.java
@@ -18,8 +18,8 @@
*/
public class BarcodeUtils {
- private static final int DEFAULT_WIDTH = 264;
- private static final int DEFAULT_HEIGHT = 48;
+ private static final int DEFAULT_WIDTH = 100;
+ private static final int DEFAULT_HEIGHT = 30;
/**
* 鏉″舰鐮佺紪鐮�
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index afa6628..fc21fd5 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -14,7 +14,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/matCode/list/auth',
page: true,
- limit: 16,
+ limit: 3,
limits: [16, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
@@ -338,7 +338,7 @@
form.on('submit(doPrint)', function (data) {
var templateNo = data.field.selectTemplate;
$.ajax({
- url: baseUrl+"/macCode/print/auth",
+ url: baseUrl+"/matCode/print/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: printMatCodeNos},
method: 'POST',
@@ -350,9 +350,9 @@
var templateDom = $("#templatePreview"+templateNo);
var className = templateDom.attr("class");
if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].barcode;
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].matNo;
} else {
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].barcode;
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].matNo;
}
}
var tpl = templateDom.html();
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 79c401c..415aac6 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -259,27 +259,21 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
- <tr>
- <td align="center" colspan="1" scope="col">鏉＄爜</td>
+ <table class="contain" width="296" style="overflow: hidden;font-size: xx-small">
+ <tr style="height: 80px">
+ <td align="center" colspan="1" scope="col">鐗╂枡缂栫爜</td>
<td align="center" class="barcode" colspan="3" scope="col">
<img class="template-code" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
- <span>{{this.barcode}}</span>
+ <span>{{this.matNo}}</span>
</div>
</td>
</tr>
- <tr>
- <td align="center" width="25%">鐗╂枡缂栫爜</td>
- <td align="center" width="25%">{{this.matNo}}</td>
+ <tr style="height: 80px">
<td align="center" width="25%">鐗╂枡鍚嶇О</td>
<td align="center" width="25%">{{this.matName}}</td>
- </tr>
- <tr>
<td align="center" width="25%">鐗╂枡鍗曚綅</td>
<td align="center" width="25%">{{this.str1}}</td>
- <td align="center" width="25%">鐗╂枡瑙勬牸</td>
- <td align="center" width="25%">{{this.str2}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1