#
luxiaotao1123
2020-07-01 0bc76829418b6a594baae8a4ef30caa4caa65945
#
4个文件已修改
30 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MatCodeController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/utils/BarcodeUtils.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/matCode/matCode.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/matCode/matCode.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -157,7 +157,7 @@
    }
    // 打印
    @RequestMapping(value = "/macCode/print/auth")
    @RequestMapping(value = "/matCode/print/auth")
    @ManagerAuth(memo = "物料编码打印")
    public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
        if(Cools.isEmpty(param)) {
src/main/java/com/zy/common/utils/BarcodeUtils.java
@@ -18,8 +18,8 @@
 */
public class BarcodeUtils {
    private static final int DEFAULT_WIDTH = 264;
    private static final int DEFAULT_HEIGHT = 48;
    private static final int DEFAULT_WIDTH = 100;
    private static final int DEFAULT_HEIGHT = 30;
    /**
     * 条形码编码
src/main/webapp/static/js/matCode/matCode.js
@@ -14,7 +14,7 @@
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/matCode/list/auth',
        page: true,
        limit: 16,
        limit: 3,
        limits: [16, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
@@ -338,7 +338,7 @@
    form.on('submit(doPrint)', function (data) {
        var templateNo = data.field.selectTemplate;
        $.ajax({
            url: baseUrl+"/macCode/print/auth",
            url: baseUrl+"/matCode/print/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {param: printMatCodeNos},
            method: 'POST',
@@ -350,9 +350,9 @@
                        var templateDom = $("#templatePreview"+templateNo);
                        var className = templateDom.attr("class");
                        if (className === 'template-barcode') {
                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].barcode;
                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].matNo;
                        } else {
                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2&param="+res.data[i].barcode;
                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2&param="+res.data[i].matNo;
                        }
                    }
                    var tpl = templateDom.html();
src/main/webapp/views/matCode/matCode.html
@@ -259,27 +259,21 @@
<!-- 模板1 -->
<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>
            <td align="center" colspan="1" scope="col">条码</td>
    <table class="contain" width="296" style="overflow: hidden;font-size: xx-small">
        <tr style="height: 80px">
            <td align="center" colspan="1" scope="col">物料编码</td>
            <td align="center" class="barcode" colspan="3" scope="col">
                <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
                    <span>{{this.barcode}}</span>
                    <span>{{this.matNo}}</span>
                </div>
            </td>
        </tr>
        <tr>
            <td align="center" width="25%">物料编码</td>
            <td align="center" width="25%">{{this.matNo}}</td>
        <tr style="height: 80px">
            <td align="center" width="25%">物料名称</td>
            <td align="center" width="25%">{{this.matName}}</td>
        </tr>
        <tr>
            <td align="center" width="25%">物料单位</td>
            <td align="center" width="25%">{{this.str1}}</td>
            <td align="center" width="25%">物料规格</td>
            <td align="center" width="25%">{{this.str2}}</td>
        </tr>
    </table>
    {{/each}}