From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pla/plaDetl.js |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 4c5df0a..4e9c560 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -24,23 +24,23 @@
         ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
         ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
         ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true,hide:true}
-        ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚,g/10min',edit:true}
-        ,{field: 'water', align: 'center',title: '姘村垎,ppm', hide:true,edit:true}
-        ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣,鈩�',edit:true}
-        ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈�,%', hide:true,edit:true}
-        ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈�,%', hide:true,edit:true}
+        ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛実/10min',edit:true}
+        ,{field: 'water', align: 'center',title: '姘村垎锛宲pm', hide:true,edit:true}
+        ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛屸剝',edit:true}
+        ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈碉紝%', hide:true,edit:true}
+        ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈碉紝%', hide:true,edit:true}
         ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
-        ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴�,%',edit:true}
+        ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紝%',edit:true}
         ,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true}
         ,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true}
         ,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true}
-        ,{field: 'fillIn', align: 'center',title: '濉厖,%',hide:true,edit:true}
-        ,{field: 'str1', align: 'center',title: '鎷変几寮哄害,MPa',hide:true,edit:true}
-        ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜�,%',hide:true,edit:true}
-        ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮,KJ/m2',hide:true,edit:true}
-        ,{field: 'str4', align: 'center',title: '缁村崱,鈩�',hide:true,edit:true}
-        ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂�,min',hide:true,edit:true}
-        ,{field: 'str6', align: 'center',title: '缁撴櫠搴�.%',hide:true,edit:true}
+        ,{field: 'fillIn', align: 'center',title: '濉厖锛�%',hide:true,edit:true}
+        ,{field: 'str1', align: 'center',title: '鎷変几寮哄害锛孧Pa',hide:true,edit:true}
+        ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜囷紝%',hide:true,edit:true}
+        ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮锛孠J/m2',hide:true,edit:true}
+        ,{field: 'str4', align: 'center',title: '缁村崱锛屸剝',hide:true,edit:true}
+        ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂达紝min',hide:true,edit:true}
+        ,{field: 'str6', align: 'center',title: '缁撴櫠搴︼紝%',hide:true,edit:true}
         ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
         ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true,hide:true}
         ,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true,hide:true}
@@ -120,7 +120,7 @@
         },
         //height: 'full',
         limit: 16,
-        limits: [16, 30, 50, 100, 200, 500],
+        limits: [16, 50, 100, 200, 500,2000,5000,10000],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -242,6 +242,7 @@
                         headers: {token: localStorage.getItem('token')},
                         url: baseUrl+'/plaQty/list/auth',
                         where: {
+                            brand: data.brand,
                             batch: data.batch,
                             package_no: data.packageNo
                         },
@@ -466,9 +467,9 @@
         layer.closeAll();
         for (let i=0;i<printData.data.length;i++){
             if (className === 'template-barcode') {
-                printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+(printData.data[i].batch+";"+printData.data[i].packageNo)
+                printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
             } else {
-                printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+(printData.data[i].batch+";"+printData.data[i].packageNo)
+                printData.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+(printData.data[i].brand+";"+printData.data[i].batch+";"+printData.data[i].packageNo+";"+printData.data[i].line)
             }
         }
         var tpl = templateDom.html();

--
Gitblit v1.9.1