From bcaac64c83b58e26b733d1b0fbf049bf02d3a58d Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期二, 07 六月 2022 09:38:18 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/locDetl/locDetl.js | 74 +++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 7b4650b..7c9a734 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -1,7 +1,44 @@ var pageCurr; function getCol() { - var cols = [{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}]; - cols.push.apply(cols, detlCols); + 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: '淇敼鏃堕棿'} ) @@ -22,6 +59,9 @@ url: baseUrl+'/locDetl/list/auth', page: true, limit: 20, + where:{ + unreason: false + }, limits: [20, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', @@ -153,7 +193,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')}, @@ -410,11 +450,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); + } + }); }); // 鏃堕棿閫夋嫨鍣� @@ -436,7 +500,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