From 5919f1e14ea00a57c6022a48ecb089e82c9f105c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 10:17:45 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locDetl/locDetl.js |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7adbca0..90e8841 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,15 +1,15 @@
 var pageCurr;
 function getCol() {
     var cols = [
-        {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
-        {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+        {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: false}
-        ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, 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: 'specs', align: 'center',title: '瑙勬牸'}
         ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
         ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
         ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -58,8 +58,8 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/locDetl/list/auth',
         page: true,
-        limit: 20,
-        limits: [20, 30, 50, 100, 200, 500],
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -190,6 +190,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')},
@@ -198,6 +199,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');
@@ -445,6 +447,7 @@
         tableReload(false);
     });
 
+
     // 鎼滅储鏍忛噸缃簨浠�
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
@@ -471,7 +474,8 @@
 });
 
 function tableReload(child) {
-    var searchData = {};
+    var searchData = {
+    };
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });

--
Gitblit v1.9.1