|
@@ -101,22 +101,22 @@ grid.prototype = { |
|
@@ -101,22 +101,22 @@ grid.prototype = { |
101
|
param.page = p.page;
|
101
|
param.page = p.page;
|
102
|
} else {
|
102
|
} else {
|
103
|
|
103
|
|
104
|
- if(location.hash.search(/page=(\d+)/g)>-1){
|
104
|
+ if (location.hash.search(/page=(\d+)/g) > -1) {
|
105
|
param.page = /page=(\d+)/g.exec(location.hash)[1];
|
105
|
param.page = /page=(\d+)/g.exec(location.hash)[1];
|
106
|
}
|
106
|
}
|
107
|
-
|
107
|
+
|
108
|
}
|
108
|
}
|
109
|
- if(param.page&&p.hash){
|
|
|
110
|
- if(location.hash.search(/page=(\d+)/g)>-1){
|
|
|
111
|
- location.hash=location.hash.replace(/page=(\d+)/g,function(source,$1){
|
|
|
112
|
- return "page="+param.page;
|
109
|
+ if (param.page && p.hash) {
|
|
|
110
|
+ if (location.hash.search(/page=(\d+)/g) > -1) {
|
|
|
111
|
+ location.hash = location.hash.replace(/page=(\d+)/g, function(source, $1) {
|
|
|
112
|
+ return "page=" + param.page;
|
113
|
})
|
113
|
})
|
114
|
- }else{
|
|
|
115
|
- location.hash+="page="+param.page;
|
114
|
+ } else {
|
|
|
115
|
+ location.hash += "page=" + param.page;
|
116
|
}
|
116
|
}
|
117
|
}
|
117
|
}
|
118
|
-
|
|
|
119
|
-
|
118
|
+
|
|
|
119
|
+
|
120
|
if (param.productStatusStr == 'all') {
|
120
|
if (param.productStatusStr == 'all') {
|
121
|
param.productStatusStr = '';
|
121
|
param.productStatusStr = '';
|
122
|
}
|
122
|
}
|
|
@@ -125,6 +125,10 @@ grid.prototype = { |
|
@@ -125,6 +125,10 @@ grid.prototype = { |
125
|
param.isInfoMiss = '';
|
125
|
param.isInfoMiss = '';
|
126
|
}
|
126
|
}
|
127
|
|
127
|
|
|
|
128
|
+ if (p.size) {
|
|
|
129
|
+ param.size = p.size;
|
|
|
130
|
+ }
|
|
|
131
|
+
|
128
|
return param;
|
132
|
return param;
|
129
|
},
|
133
|
},
|
130
|
__pagination: function(pagination) {
|
134
|
__pagination: function(pagination) {
|
|
@@ -194,6 +198,7 @@ grid.prototype = { |
|
@@ -194,6 +198,7 @@ grid.prototype = { |
194
|
dataType: 'json',
|
198
|
dataType: 'json',
|
195
|
beforeSend: function() {
|
199
|
beforeSend: function() {
|
196
|
//发送请求
|
200
|
//发送请求
|
|
|
201
|
+ g.tbody.html("<tr><td colspan=100><center>正在加载中...</center></td></tr>");
|
197
|
},
|
202
|
},
|
198
|
success: function(res) {
|
203
|
success: function(res) {
|
199
|
var data = res.data.data;
|
204
|
var data = res.data.data;
|
|
@@ -248,7 +253,7 @@ grid.prototype = { |
|
@@ -248,7 +253,7 @@ grid.prototype = { |
248
|
var num = _r_num() + _count;
|
253
|
var num = _r_num() + _count;
|
249
|
|
254
|
|
250
|
item._num = _count;
|
255
|
item._num = _count;
|
251
|
- item.rowid = "wqt_" + num + "_" + _count;
|
256
|
+ // item.rowid = "wqt_" + num + "_" + _count;
|
252
|
if (!item) continue;
|
257
|
if (!item) continue;
|
253
|
g.records.push(_count);
|
258
|
g.records.push(_count);
|
254
|
item.__index = _count;
|
259
|
item.__index = _count;
|