From 09ca172a1c5dc157b30ce70af17a9a89ff17baf4 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 08 六月 2020 15:31:42 +0800 Subject: [PATCH] # --- src/main/webapp/views/matCode/matCode.html | 37 +++++++++++++++++++++++++++++++++---- src/main/webapp/static/js/matCode/matCode.js | 11 +++++++++-- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js index 630d5e7..20d0018 100644 --- a/src/main/webapp/static/js/matCode/matCode.js +++ b/src/main/webapp/static/js/matCode/matCode.js @@ -334,6 +334,7 @@ // 寮�濮嬫墦鍗� form.on('submit(doPrint)', function (data) { + console.log(data); var templateNo = data.field.selectTemplate; $.ajax({ url: baseUrl+"/macCode/print/auth", @@ -345,9 +346,15 @@ if (res.code === 200){ layer.closeAll(); for (let i=0;i<res.data.length;i++){ - res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].barcode; + 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; + } else { + res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].barcode; + } } - var tpl = $("#templatePreview"+templateNo).html(); + var tpl = templateDom.html(); var template = Handlebars.compile(tpl); var html = template(res); let box = $("#box"); diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html index c4e986a..6b59403 100644 --- a/src/main/webapp/views/matCode/matCode.html +++ b/src/main/webapp/views/matCode/matCode.html @@ -238,7 +238,7 @@ <!-- 妯℃澘寮曟搸 --> <!-- 妯℃澘1 --> -<script type="text/template" id="templatePreview1"> +<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> @@ -266,7 +266,7 @@ {{/each}} </script> <!-- 妯℃澘2 --> -<script type="text/template" id="templatePreview2"> +<script type="text/template" id="templatePreview2" class="template-barcode"> {{#each data}} <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small"> <tr> @@ -297,8 +297,37 @@ {{/each}} </script> <!-- 妯℃澘3 --> -<script type="text/template" id="templatePreview3"> - +<script type="text/template" id="templatePreview3" class="template-qrcode"> + {{#each data}} + <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small"> + <tr> + <td align="center" scope="col" width="50%" colspan="3">鐗╂枡缂栫爜</td> + <td align="center" scope="col" width="50%" colspan="3">{{this.matNo}}</td> + </tr> + <tr> + <td align="center" colspan="3">鐗╂枡鍚嶇О</td> + <td align="center" colspan="3">{{this.matName}}</td> + </tr> + <tr> + <td align="center" width="50%" rowspan="1" colspan="3">鐗╂枡鍗曚綅</td> + <td align="center" width="50%" colspan="3" rowspan="4"> + <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%"> + <div style="letter-spacing: 2px;margin-top: 3px; text-align: center"> + <span>{{this.matNo}}</span> + </div> + </td> + </tr> + <tr> + <td align="center" colspan="3" rowspan="1">{{this.str1}}</td> + </tr> + <tr> + <td align="center" colspan="3" rowspan="1">鐗╂枡瑙勬牸</td> + </tr> + <tr> + <td align="center" colspan="3" rowspan="1">{{this.str2}}</td> + </tr> + </table> + {{/each}} </script> </body> -- Gitblit v1.9.1