Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 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+"&param="+printContent[i]+"&width="+200+"&height="+70;
                } else {
                    barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printContent[i]+"&width="+400+"&height="+180;
                    barcodeUrl = baseUrl+"/mac/code/auth?type="+2+"&param="+printContent[i]+"&width="+400+"&height="+180;
                }
                data.push({
                    item: printContent[i],