From 9c3338912c05158b144ebf977c36863cd46a1970 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 13:56:11 +0800
Subject: [PATCH] 打印标签加日期
---
src/main/webapp/static/js/mat/mat.js | 1 +
src/main/webapp/views/mat/mat.html | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 6c1723a..f435790 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -338,6 +338,7 @@
} else {
res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2¶m="+res.data[i].matnr;
}
+ res.data[i].date = dateToStr(new Date());
}
var tpl = templateDom.html();
var template = Handlebars.compile(tpl);
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 933ceb3..8abe8e4 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -504,7 +504,7 @@
<tr style="height: 50px;font-size: 18px; font-weight: 400" >
<td width="50px" align="center" scope="col" colspan="1">鍟嗗搧</td>
<td width="170px" align="center" scope="col" colspan="1">{{this.maktx}}</td>
- <td align="center" scope="col" colspan="2" rowspan="2">
+ <td align="center" scope="col" colspan="3" rowspan="2">
<img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 1px;margin-top: 1px; text-align: center; font-weight: 400">
<span>{{this.matnr}}</span>
@@ -524,6 +524,14 @@
-webkit-box-orient: vertical;
word-break: break-all;
">{{this.specs}}</td>
+ <td align="center" colspan="1" style="
+ overflow:hidden;
+ text-overflow:ellipsis;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ word-break: break-all;
+ font-size: 11px;
+ ">{{this.date}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1