From 2fc7f93972ce21bd0ec3ef5d167a9b53a73c0b59 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 四月 2024 14:28:04 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/picking/picking.js |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 353249b..8650d74 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -12,6 +12,12 @@
     var form = layui.form;
     var admin = layui.admin;
 
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
+
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#saasLog',
@@ -106,8 +112,8 @@
                 var left = offset.left;
                 layer.open({
                     type: 1,
-                    title: false,
-                    area: '1200px',
+                    title: '鍗曟嵁鏄庣粏',
+                    area: '1500px',
                     offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
                     shade: .01,
                     shadeClose: true,
@@ -118,7 +124,7 @@
                             id:'lookSSXMTable',
                             elem: '#lookSSXMTable',
                             headers: {token: localStorage.getItem('token')},
-                            url: baseUrl+'/ManPakOut/list/auth',
+                            url: baseUrl+'/ManPakOut/list/auth1',
                             where: {
                                 doc_num: data.doc_num,
                                 uuid: data.uuid
@@ -134,12 +140,13 @@
                                 ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
                                 ,{field: 'barcode', align: 'center',title: '鍖呭彿'}
                                 // ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-                                // ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+                                ,{field: 'maktx', align: 'center',title: '鐗屽彿'}
                                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                                 ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
                                 ,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
                                 ,{field: 'status$', align: 'center',title: '鐘舵��'}
                                 ,{field: 'memo', align: 'center',title: '澶囨敞'}
+                                ,{field: 'specs', align: 'center',title: '鍙戣揣鏃堕棿'}
                                 ,{field: 'createBy', align: 'center',title: '', hide:true}
                                 ,{align: 'center', title: '鎿嶄綔', toolbar: '#operateDetl'}
                             ]],
@@ -334,9 +341,9 @@
                             var className = templateDom.attr("class");
 
                             if (className === 'template-barcode') {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";"+json.data[i].maktx);
                             } else {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";"+json.data[i].maktx);
                             }
                         }
                         var tpl = templateDom.html();

--
Gitblit v1.9.1