From 1b16865afc26b5ae7d2618237c76ea6b99931d8f Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 27 六月 2022 08:16:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/webapp/static/js/locDetl/locDetl.js | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7c9a734..211c380 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,10 +5,9 @@
{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: '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: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -58,11 +57,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locDetl/list/auth',
page: true,
- limit: 20,
- where:{
- unreason: false
- },
- limits: [20, 30, 50, 100, 200, 500],
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -458,29 +454,6 @@
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);
- }
- });
- });
-
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#modiTime\\$',
@@ -501,7 +474,6 @@
function tableReload(child) {
var searchData = {
- unreason: false
};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
--
Gitblit v1.9.1