#

LSH

2023-12-27 94e4a7598d2ed0bee320174bcd44a3844d59cc0d

 src/main/webapp/static/js/order/order.js

@@ -197,6 +197,7 @@
                            {field: 'payment$', title: '货物特征', width: 160},
                            // {field: 'batch', title: '批号'},
                            {field: 'anfme', title: '数量'},
                            {field: 'batch', title: '批次'},
                            {field: 'workQty', title: '作业数量'},
                            {field: 'qty', title: '完成数量', style: 'font-weight: bold'},
                            // {field: 'unit', title: '单位'},
@@ -271,6 +272,11 @@
                            layer.msg('数量不能小于已作业数量', {icon: 2});
                            return false;
                        }

                        if (nList[xi].batch === ""){
                            layer.msg('批次不能为空', {icon: 2});
                            return false;
                        }
                    }
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].owner <= 0){
@@ -321,6 +327,7 @@
                        {field: 'specs', title: '规格'},
                        {field: 'weight', title: '重量', edit: true},
                        {field: 'anfme', title: '数量(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'batch', title: '批次(修改)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'owner', title: '货主编号', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                        {field: 'payment', title: '货物状态', style: 'color: blue;font-weight: bold', templet: '#payment'},
                        // {field: 'payment', title: '货物状态',align: 'center', templet: '#payment'},
@@ -633,14 +640,15 @@
                    var barcodeUrl = baseUrl + "/order/code/auth?type=1&param=" + res.data[0].docNum;
                    console.log("barcodeUrl:"+barcodeUrl);
                    json.barcodeUrl = barcodeUrl;
                    console.log(json.data);
                    for (let i = 0; i < json.data.length; i++) {
                        var templateDom = $("#templatePreview" + templateNo);
                        var className = templateDom.attr("class");

                        if (className === 'template-barcode') {
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
                        } else {
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
                        }
                    }
                    var tpl = templateDom.html();