From cc618c3aa07d847bbe313adfee2d7a45f836a9a1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 27 九月 2025 15:56:38 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 7a4fab3..2325fdd 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -42,15 +42,15 @@
         cellMinWidth: 100,
         cols: [[
             {type: 'numbers'},
-            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
-            {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
-            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
-            {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl',minWidth: 200},
+            {field: 'docType$', align: 'center', title: '绫诲瀷'},
+            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook'},
+            {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
             {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
             {field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
             {field: 'itemName', align: 'center',title: '浠撳簱'},
             {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
-            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+            {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
         ]],
         request: {
             pageName: 'curr',
@@ -128,6 +128,9 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'specs', title: '瑙勬牸', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
+                            {field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
+                            ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+                            ,{field: 'temp1', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -181,7 +184,7 @@
                         var templateDom = $("#templatePreview1");
                         var className = templateDom.attr("class");
                         var param = "缂栫爜:"+data.matnr+";鍚嶇О:"+data.maktx+";鎵规:"+data.batch+";瑙勬牸:"+data.specs
-                            +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";瀹㈡埛鍚嶇О:"+data.cstmrName;
+                            +";鍗曚綅:"+data.unit+";鏁伴噺:"+data.anfme+";閿�鍞崟鍙�:"+data.suppCode+";瀹㈡埛鍚嶇О:"+data.sku;
                         var encodeUrl = encodeURIComponent(param);
                         data["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+encodeUrl;
                         console.log(data["barcodeUrl"]);

--
Gitblit v1.9.1