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

1

9 天以前 7b6329313ca3a5e6ff96246eeaf96f839df7760b

 src/main/webapp/static/js/mat/mat.js

@@ -5,6 +5,9 @@
    var cols = [
        {type: 'checkbox'}
        ,{field: 'tagId$', align: 'center',title: '归类', templet: '#tagTpl'}
        ,{field: 'store_max', align: 'center',title: '库存上限',hide : true}
        ,{field: 'store_min', align: 'center',title: '库存下限',hide : true}
        ,{field: 'store_max_date', align: 'center',title: '库龄上限(天)',hide : true}
    ];
    cols.push.apply(cols, matCols);
    cols.push(
@@ -331,9 +334,19 @@
                        var templateDom = $("#templatePreview"+templateNo);
                        var className = templateDom.attr("class");
                        if (className === 'template-barcode') {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr;
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="
                                +"orderNo;cs2025092313;"
                                +"sku;" +res.data[i].matnr+";"
                                +"po;" +res.data[i].supp+";"
                                +"upc;" +res.data[i].sku+";"
                                +"supplier;" +res.data[i].supplier;
                        } else {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr;
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="
                                +"orderNo;cs2025092313;"
                                +"sku;" +res.data[i].matnr+";"
                                +"po;" +res.data[i].supp+";"
                                +"upc;" +res.data[i].sku+";"
                                +"supplier;" +res.data[i].supplier;
                        }
                    }
                    var tpl = templateDom.html();