From 012f80529db9aa5065f51bde3fd65ff1ffe9eb61 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 08:23:10 +0800
Subject: [PATCH] bug修复

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

diff --git a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
index e07f8a8..c86a99a 100644
--- a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
+++ b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
@@ -30,10 +30,11 @@
             ,{field: 'anfme', align: 'center',title: '閲嶉噺(kg)', width:100,hide: false}
             ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', width:120,hide: false}
             ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О',hide: false}
-            ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: true}
-            ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', width:100,hide: true}
-            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', width:120,hide: false}
-            ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide: false}
+            ,{field: 'owner$', align: 'center',title: '璐т富',hide: false}
+            ,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿', width:120,hide: false}
+            ,{field: 'createBy$', align: 'center',title: '鍏ュ簱浜哄憳', width:100,hide: false}
+            ,{field: 'updateTime$', align: 'center',title: '鎵撳嵃鏃堕棿', width:120,hide: false}
+            ,{field: 'updateBy$', align: 'center',title: '鎵撳嵃浜哄憳',hide: false}
             ,{field: 'memo', align: 'center',title: '澶囨敞',hide: false}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
@@ -274,9 +275,17 @@
                         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].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="
+                                +res.data[i].matnr+";" +res.data[i].batch+";"
+                                +res.data[i].anfme+";" +res.data[i].locNo+";"
+                                +res.data[i].ownerId+";"+res.data[i].maktx+";"
+                                +res.data[i].id;
                         } else {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
+                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="
+                                +res.data[i].matnr+";" +res.data[i].batch+";"
+                                +res.data[i].anfme+";" +res.data[i].locNo+";"
+                                +res.data[i].ownerId+";"+res.data[i].maktx+";"
+                                +res.data[i].id;
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1