|
@@ -53,16 +53,23 @@ new common.dropDown({ |
|
@@ -53,16 +53,23 @@ new common.dropDown({ |
|
53
|
});
|
53
|
});
|
|
54
|
|
54
|
|
|
55
|
|
55
|
|
|
|
|
56
|
+var editPostion = '';
|
|
|
|
57
|
+
|
|
56
|
var t = new common.tab({
|
58
|
var t = new common.tab({
|
|
57
|
el: "#basicTab",
|
59
|
el: "#basicTab",
|
|
58
|
click: function() {
|
60
|
click: function() {
|
|
59
|
g.options.columns[11].hidden = true;
|
61
|
g.options.columns[11].hidden = true;
|
|
60
|
g.options.columns[8].hidden = true;
|
62
|
g.options.columns[8].hidden = true;
|
|
61
|
- if ($(this).find('a').attr('columnname') == 3) {
|
63
|
+ var columnname = $(this).find('a').attr('columnname');
|
|
|
|
64
|
+ if (columnname == 3) {
|
|
62
|
g.options.columns[11].hidden = false;
|
65
|
g.options.columns[11].hidden = false;
|
|
63
|
- } else if ($(this).find('a').attr('columnname') == 2) {
|
66
|
+ } else if (columnname == 2) {
|
|
64
|
g.options.columns[8].hidden = false;
|
67
|
g.options.columns[8].hidden = false;
|
|
65
|
};
|
68
|
};
|
|
|
|
69
|
+
|
|
|
|
70
|
+ if (columnname == 1 || columnname == 2) {
|
|
|
|
71
|
+ editPostion = '#position9';
|
|
|
|
72
|
+ }
|
|
66
|
g.init($("#gridurl").val());
|
73
|
g.init($("#gridurl").val());
|
|
67
|
},
|
74
|
},
|
|
68
|
columns: [{
|
75
|
columns: [{
|
|
@@ -133,7 +140,10 @@ var g = new common.grid({ |
|
@@ -133,7 +140,10 @@ var g = new common.grid({ |
|
133
|
type: 'checkbox'
|
140
|
type: 'checkbox'
|
|
134
|
}, {
|
141
|
}, {
|
|
135
|
display: 'skn',
|
142
|
display: 'skn',
|
|
136
|
- name: 'productSkn'
|
143
|
+ name: 'productSkn',
|
|
|
|
144
|
+ render: function(item) {
|
|
|
|
145
|
+ return '<a href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
|
|
|
|
146
|
+ }
|
|
137
|
}, {
|
147
|
}, {
|
|
138
|
display: '图片',
|
148
|
display: '图片',
|
|
139
|
name: 'picImgUrl',
|
149
|
name: 'picImgUrl',
|
|
@@ -202,7 +212,7 @@ var g = new common.grid({ |
|
@@ -202,7 +212,7 @@ var g = new common.grid({ |
|
202
|
if (item.shelveTime) {
|
212
|
if (item.shelveTime) {
|
|
203
|
html += '<br>上架时间：' + item.shelveTime;
|
213
|
html += '<br>上架时间：' + item.shelveTime;
|
|
204
|
}
|
214
|
}
|
|
205
|
- if (item.status == 3) {
|
215
|
+ if (item.status == 3 || item.status == 6) {
|
|
206
|
html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
|
216
|
html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
|
|
207
|
}
|
217
|
}
|
|
208
|
return html;
|
218
|
return html;
|
|
@@ -219,13 +229,13 @@ var g = new common.grid({ |
|
@@ -219,13 +229,13 @@ var g = new common.grid({ |
|
219
|
var HtmArr = [];
|
229
|
var HtmArr = [];
|
|
220
|
|
230
|
|
|
221
|
if (item.status == 1) {
|
231
|
if (item.status == 1) {
|
|
222
|
- HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
|
232
|
+ HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
|
|
223
|
HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
|
233
|
HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
|
|
224
|
} else if (item.status != 2 && item.status != 5) {
|
234
|
} else if (item.status != 2 && item.status != 5) {
|
|
225
|
- HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
|
235
|
+ HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
|
|
226
|
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
|
236
|
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
|
|
227
|
}
|
237
|
}
|
|
228
|
- HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>');
|
238
|
+ HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
|
|
229
|
return HtmArr.join('');
|
239
|
return HtmArr.join('');
|
|
230
|
}
|
240
|
}
|
|
231
|
}]
|
241
|
}]
|
|
@@ -277,6 +287,8 @@ function shelveModal(title, html) { |
|
@@ -277,6 +287,8 @@ function shelveModal(title, html) { |
|
277
|
if (res.data.code == 200) {
|
287
|
if (res.data.code == 200) {
|
|
278
|
e.$tip(res.data.message, function() {
|
288
|
e.$tip(res.data.message, function() {
|
|
279
|
shelveLayer.close();
|
289
|
shelveLayer.close();
|
|
|
|
290
|
+ loadtab();
|
|
|
|
291
|
+ g.reload();
|
|
280
|
}, 'growl-success');
|
292
|
}, 'growl-success');
|
|
281
|
} else {
|
293
|
} else {
|
|
282
|
e.$tip(res.data.message);
|
294
|
e.$tip(res.data.message);
|
