From 901dfbf8d57ffb54f9154e6d7db6899b9b4dcc92 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 16:56:13 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index a88f164..90c1539 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/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'},
@@ -639,9 +646,9 @@
                         var className = templateDom.attr("class");
 
                         if (className === 'template-barcode') {
-                            json.data[i]["barcodeUrl"] = baseUrl + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+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].orderNo+";"+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();

--
Gitblit v1.9.1