From d3234825d804a6a205dba1c6092acc8e29981b81 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 06 三月 2025 10:11:23 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locDetl/locDetl.js |   89 ++++++++++++++++++++++++++++++--------------
 1 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 87ce65e..820c6c7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,4 +1,49 @@
 var pageCurr;
+function getCol() {
+    var cols = [
+        {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
+        {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: 'anfme', align: 'center',title: '鏁伴噺'}
+        ,{field: 'zpallet', 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}
+        ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+        ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+        ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+        ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+        ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
+        ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+        ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+        ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+        ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+        ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+        ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+        ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+        ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+        ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+        ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+        ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+        ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+        ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+        ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+        ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+        ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+        ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+
+    ];
+
+    // cols.push.apply(cols, detlCols);
+    cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+    )
+    return cols;
+}
+
 layui.use(['table','laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -12,30 +57,12 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/locDetl/list/auth',
         page: true,
-        limit: 10,
-        skin: 'line',
+        limit: 16,
+        limits: [16, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
-        cols: [[
-            {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-            ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
-            ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-            ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
-            ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
-            // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-            ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪', width:150}
-            ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺', width:80}
-            ,{field: 'altme', align: 'center',title: '鍗曚綅', width:80}
-            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-            ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
-            // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
-            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        ]],
+        cols: [getCol()],
         request: {
             pageName: 'curr',
             pageSize: 'limit'
@@ -53,7 +80,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -83,7 +110,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -135,7 +162,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = "/";
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -145,7 +172,7 @@
                 }
                 break;
             case 'exportData':
-                layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+                layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -162,6 +189,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')},
@@ -170,11 +198,12 @@
                         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');
                             } else if (res.code === 403) {
-                                top.location.href = "/";
+                                top.location.href = baseUrl+"/";
                             } else {
                                 layer.msg(res.msg)
                             }
@@ -392,7 +421,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -416,6 +445,7 @@
         pageCurr = 1;
         tableReload(false);
     });
+
 
     // 鎼滅储鏍忛噸缃簨浠�
     form.on('submit(reset)', function (data) {
@@ -443,7 +473,8 @@
 });
 
 function tableReload(child) {
-    var searchData = {};
+    var searchData = {
+    };
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });
@@ -454,7 +485,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = "/";
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1