From 7b70a898f62decad0845fd41999dddda31c93456 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 22 一月 2024 11:11:14 +0800 Subject: [PATCH] # PDA入库更新 --- src/main/webapp/static/js/nodeLoc/nodeLoc.js | 5 ++++- src/main/webapp/views/nodeLoc/nodeLoc.html | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/static/js/nodeLoc/nodeLoc.js b/src/main/webapp/static/js/nodeLoc/nodeLoc.js index 81c71e7..237d9d4 100644 --- a/src/main/webapp/static/js/nodeLoc/nodeLoc.js +++ b/src/main/webapp/static/js/nodeLoc/nodeLoc.js @@ -343,10 +343,13 @@ for (var i = 0; i<printContent.length; i ++) { if (printContent[i] != null && printContent[i] !== '') { var barcodeUrl; + var templateDom = $("#templatePreview"+templateNo); + var className = templateDom.attr("class"); + type = className === 'template-barcode' ? 1 : 2; if (type === 1) { barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+200+"&height="+70; } else { - barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+400+"&height="+180; + barcodeUrl = baseUrl+"/mac/code/auth?type="+2+"¶m="+printContent[i]+"&width="+400+"&height="+180; } data.push({ item: printContent[i], diff --git a/src/main/webapp/views/nodeLoc/nodeLoc.html b/src/main/webapp/views/nodeLoc/nodeLoc.html index 6aa0bee..81234eb 100644 --- a/src/main/webapp/views/nodeLoc/nodeLoc.html +++ b/src/main/webapp/views/nodeLoc/nodeLoc.html @@ -267,7 +267,7 @@ <!--鍗曢�夋--> <div class="layui-form-item" style="display: inline-block; margin-bottom: 10px"> <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="checked"> -<!-- <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">--> + <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio"> </div> <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;"> <legend>鎵撳嵃棰勮</legend> @@ -292,7 +292,7 @@ <table class="contain" width="280" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large"> <tr style="height: 74px"> <td class="barcode" colspan="9" align="center" scope="col" style="border: none"> - <img class="template-code template-barcode" src="" width="90%;"> 鈫� + <img class="template-code template-qrcode" src="" width="70%;"> <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small"> <span>xxxxxx</span> </div> @@ -332,12 +332,12 @@ {{/each}} </script> <!-- 妯℃澘2 --> -<script type="text/template" id="templatePreview2" class="template-barcode"> +<script type="text/template" id="templatePreview2" class="template-qrcode"> {{#each data}} <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xxx-large; color:#000;"> <tr style="height: 150px"> <td class="barcode" colspan="9" align="center" scope="col" style="border: none"> - <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;"> 鈫� + <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="79%;"> <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-large"> <span>{{this.item}}</span> </div> -- Gitblit v1.9.1