From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1

---
 src/main/webapp/static/js/locDetl/locDetl.js |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index eca2026..e06bb69 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,7 +1,24 @@
 var pageCurr;
 function getCol() {
-    var cols = [{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}];
-    cols.push.apply(cols, detlCols);
+    var cols = [
+        {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
+        ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+        ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+        ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+        ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+        ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+        ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+        ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+        ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
+        ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
+        ,{field: 'sku', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
+        ,{field: 'suppCode', align: 'center',title: '鏉ユ簮鍗曞彿', hide: false}
+
+    ];
+
+    // cols.push.apply(cols, detlCols);
     cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
     )
@@ -153,6 +170,7 @@
                         'locDetl': exportData,
                         'fields': fields
                     };
+                    var loadIndex = layer.msg('姝e湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
                     $.ajax({
                         url: baseUrl+"/locDetl/export/auth",
                         headers: {'token': localStorage.getItem('token')},
@@ -161,6 +179,7 @@
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
+                            layer.close(loadIndex);
                             layer.closeAll();
                             if (res.code === 200) {
                                 table.exportFile(titles,res.data,'xls');
@@ -408,6 +427,7 @@
         tableReload(false);
     });
 
+
     // 鎼滅储鏍忛噸缃簨浠�
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
@@ -434,7 +454,8 @@
 });
 
 function tableReload(child) {
-    var searchData = {};
+    var searchData = {
+    };
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });

--
Gitblit v1.9.1