From df0b697763217c84e9d42015d82a066a863f3e5a Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 09 十月 2024 13:42:55 +0800
Subject: [PATCH] 添加参数，强制刷新js文件

---
 src/main/webapp/static/js/picking/picking.js |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 76a4937..ba55339 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',
@@ -31,8 +37,9 @@
             ,{align: 'center', title: '浜岀淮鐮�', toolbar: '#operate', width: 200 , hide:true}
             ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
-            // ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', width: 160}
-            ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
+            ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', width: 160}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            ,{field: 'updateTime$', align: 'center',title: '鍑哄簱鏃堕棿'}
             ,{align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
 
         ]],
@@ -99,6 +106,9 @@
             case "del":
                 doDel(data);
                 break;
+            case "printExcel":
+                printExcel(data);
+                break;
             case "look":
                 var $a = $(obj.tr).find('a[lay-event="look"]');
                 var offset = $a.offset();
@@ -106,8 +116,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 +128,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 +144,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: 'updateTime$', 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'}
                             ]],
@@ -322,10 +333,9 @@
 
                         for (let i = 0; i < res.data.length; i++){
                             sum += res.data[i].anfme;
-                            console.log("sum:"+res.data.anfme);
-
                         }
                         json.anfmeSum = sum;
+                        json.custName = json.data[0].custName;
                         var barcodeUrl = baseUrl + "/ManPakOut/code/auth?type=1&param=" + res.data[0].docNum;
                         console.log("barcodeUrl:"+barcodeUrl);
                         json.barcodeUrl = barcodeUrl;
@@ -334,9 +344,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();
@@ -386,9 +396,14 @@
         });
     }
 
-
-
-
+    function printExcel(data){
+        layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+            layer.closeAll();
+            layer.load(1, {shade: [0.1,'#fff']});
+            location.href = baseUrl+"/pakout/printExport/auth?orderNo="+data.doc_num;
+            layer.closeAll('loading');
+        });
+    }
 
 });
 

--
Gitblit v1.9.1