From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位

---
 src/main/webapp/static/js/locDetl/locDetl.js |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index fb3fe5b..8ad0940 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -1,15 +1,17 @@
 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: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
         ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+        ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+        ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+        ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+        ,{field: 'memo', align: 'center',title: '澶囨敞',sort: true}
+        ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+        ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
 
-        ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+        ,{field: 'anfme', 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}
@@ -19,7 +21,7 @@
         ,{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: 'manu', align: 'center',title: '瀹㈡埛淇℃伅', hide: false}
         ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
         ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
         ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
@@ -59,6 +61,9 @@
         url: baseUrl+'/locDetl/list/auth',
         page: true,
         limit: 20,
+        where:{
+          unreason: false
+        },
         limits: [20, 30, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
@@ -190,7 +195,7 @@
                         'locDetl': exportData,
                         'fields': fields
                     };
-                    var loadIndex = layer.load(2);
+                    var loadIndex = layer.msg('姝e湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
                     $.ajax({
                         url: baseUrl+"/locDetl/export/auth",
                         headers: {'token': localStorage.getItem('token')},
@@ -447,11 +452,35 @@
         tableReload(false);
     });
 
+
     // 鎼滅储鏍忛噸缃簨浠�
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
         clearFormVal($('#search-box'));
         tableReload(false);
+    });
+
+    //鏌ョ湅寮傚父鏁版嵁
+    form.on('submit(unreason)', function (data) {
+        pageCurr = 1;
+
+        tableIns.reload({
+            where: {
+                unreason: true
+            },
+            page: {
+                curr: pageCurr
+            },
+            done: function (res, curr, count) {
+
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+                pageCurr=curr;
+
+                limit(child);
+            }
+        });
     });
 
     // 鏃堕棿閫夋嫨鍣�
@@ -473,7 +502,9 @@
 });
 
 function tableReload(child) {
-    var searchData = {};
+    var searchData = {
+        unreason: false
+    };
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });

--
Gitblit v1.9.1