From eee555f527cb7de989a37cfed50c0a944c13fb33 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 03 七月 2024 14:14:49 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 62ab391..2f525b3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -134,6 +134,7 @@
                             {type: 'numbers'},
                             {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+                            {field: 'bomCode', title: 'Bom鍙�'},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'supp', title: '绔嬪簱搴撳瓨', templet: function (item){
@@ -260,6 +261,7 @@
                         {type: 'numbers', title: '#'},
                         {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                         {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+                        {field: 'bomCode', title: 'Bom鍙�', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'batch', title: '鎵瑰彿', edit: true},
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
@@ -529,9 +531,6 @@
     }
     // 鎵撳嵃
     function btnPrint(orderId, orderNo, settle) {
-        console.log(orderId);
-        console.log(orderNo);
-        console.log(settle);
         printMatCodeNos.push(orderNo)
         var templateNo = 3;
         $.ajax({
@@ -543,16 +542,21 @@
             success: function (res) {
                 if (res.code === 200){
                     layer.closeAll();
-                    console.log(res);
                     for (let i=0;i<res.data.length;i++){
                         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].orderNo+
-                                ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
+                                ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].bomCode;
                         } else {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].orderNo+
-                                ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
+                            if (res.data[i].bomCode) {
+                                res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].orderNo+
+                                    ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].bomCode;
+                            } else {
+                                res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].orderNo+
+                                    ";"+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
+                            }
+
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1