From 997175b461ab192d8e249e216e1364d8a4d6c524 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 14 五月 2024 11:02:09 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 4aeba9a..62ab391 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -136,6 +136,14 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
+                            {field: 'supp', title: '绔嬪簱搴撳瓨', templet: function (item){
+                                    if(item.supp >= item.anfme)   return `<span style="color: #00FF00">${item.supp}</span>`;
+                                    else return `<span style="color: red">${item.supp}</span>`;
+                                }},
+                            {field: 'suppCode', title: '骞冲簱搴撳瓨' , templet: function (item){
+                                if(item.suppCode >= item.anfme)   return `<span style="color: #00FF00">${item.suppCode}</span>`;
+                                else return `<span style="color: red">${item.suppCode}</span>`;
+                                }},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
@@ -541,10 +549,10 @@
                         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].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
                         } 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].matnr+";"+res.data[i].batch+";"+res.data[i].anfme;
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1