From 49696adc5a352be53bf5d5bbf1fafa23968b5e7c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 14:02:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 2 +-
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 10 +++++-----
src/main/webapp/views/matCode/matCode.html | 10 ++++++----
src/main/webapp/static/js/matCode/matCode.js | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 20db897..59b91c1 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 @@
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatCodePrint print = new MatCodePrint();
print.setMatNo(matCode.getMatNo());
- print.setBarcodeUrl(matCode.getBarcode());
+ print.setBarcode(matCode.getBarcode());
print.setMatName(matCode.getMatName());
print.setStr1(matCode.getStr1());
print.setStr2(matCode.getStr2());
diff --git a/src/main/java/com/zy/asrs/entity/MatCodePrint.java b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
index e1137c4..f2376d9 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodePrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
@@ -13,7 +13,7 @@
/**
* 鏉＄爜鍦板潃
*/
- private String barcodeUrl;
+ private String barcode;
/**
* 鐗╂枡鍚嶇О
@@ -38,12 +38,12 @@
this.matNo = matNo;
}
- public String getBarcodeUrl() {
- return barcodeUrl;
+ public String getBarcode() {
+ return barcode;
}
- public void setBarcodeUrl(String barcodeUrl) {
- this.barcodeUrl = barcodeUrl;
+ public void setBarcode(String barcode) {
+ this.barcode = barcode;
}
public String getMatName() {
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 30ded55..85f7dfc 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -339,7 +339,7 @@
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;
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/barcode/auth?param="+res.data[i].barcode;
}
var tpl = $("#templatePreview"+templateNo).html();
var template = Handlebars.compile(tpl);
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 05142e5..88e0b25 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -177,19 +177,20 @@
<td colspan="1" align="right" scope="col">鏉＄爜</td>
<td class="barcode"colspan="3" align="left" scope="col">
<img class="template-qrcode" src="" width="80%">
+ <div style="letter-spacing: 2px;margin-top: 3px">xxxxxx</div>
</td>
</tr>
<tr>
<td align="right" width="25%">鐗╂枡缂栫爜</td>
- <td align="right" width="25%">1902980-11/12</td>
+ <td align="right" width="25%">xxxxxx-xx/xx</td>
<td align="right" width="25%">鐗╂枡鍚嶇О</td>
- <td align="right" width="25%">閾濆甫|1100-O|0.33*475|</td>
+ <td align="right" width="25%">xxxxxxx</td>
</tr>
<tr>
<td align="right" width="25%">鐗╂枡鍗曚綅</td>
- <td align="right" width="25%">701010015907</td>
+ <td align="right" width="25%">xxxxxxxx</td>
<td align="right" width="25%">鐗╂枡瑙勬牸</td>
- <td align="right" width="25%">榧庤儨閾濅笟棣欐腐_椹潵瑗夸簹UPT</td>
+ <td align="right" width="25%">xxxxxxx</td>
</tr>
</table>
</div>
@@ -220,6 +221,7 @@
<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.barcodeUrl}}" width="80%">
+ <div style="letter-spacing: 2px;margin-top: 3px">{{this.barcode}}</div>
</td>
</tr>
<tr>
--
Gitblit v1.9.1