From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/webapp/views/pakStore/locDetlQuery.html | 51 ++++-----------------------------------------------
1 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 56a2355..c23ef35 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -53,7 +53,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -70,7 +70,6 @@
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
</div>
</fieldset>
@@ -94,7 +93,6 @@
</body>
<script>
- var pageCurr;
function getCol() {
var cols = [
{type: 'checkbox'}
@@ -122,7 +120,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/out/list/auth',
page: true,
- limit: 10,
+ limits: [16, 30, 50, 100, 200, 500],
+ limit: 16,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -146,15 +145,6 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
@@ -175,14 +165,6 @@
// 鎼滅储鏍忔悳绱簨浠�
form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload();
- });
-
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
tableReload();
});
@@ -193,39 +175,14 @@
});
})
- function tableReload(child) {
+ function tableReload() {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
locDetlTableIns.reload({
where: searchData,
- page: {
- curr: pageCurr
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- locDetlTableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
- }
});
- }
-
- function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
}
</script>
</html>
--
Gitblit v1.9.1