Authored by 马力

Merge branch 'dev_网销刷新bug' into grey

... ... @@ -115,6 +115,7 @@
</div>
<div class="panel-col">
<input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
<input type="hidden" name="tab" value="5" id="tab">
</div>
<div class="panel-col">
<select id="isScreen" class="form-control height40">
... ...
... ... @@ -82,13 +82,15 @@ var brandId = new common.dropDown({
}
});
var editPostion = '', isInfoMiss, sortFlag;
var editPostion = '', isInfoMiss, sortFlag, activeTab = 5;
var t = new common.tab2({
el: "#basicTab",
active: 5,
active: refreshHelper.inputHelper("tab"),
click: function () {
var columnname = t.options.columns[t.options.active].name;
activeTab = t.options.active;
g.options.columns[12].hidden = true;
g.options.columns[9].hidden = true;
if (columnname == 3) {
... ... @@ -110,6 +112,7 @@ var t = new common.tab2({
pageSkn = [];
g.init("/goods/netsale/getList");
$("#tab").val(activeTab);
},
columns: [{
name: "0",
... ... @@ -163,7 +166,7 @@ var g = new common.grid({
isOutLets: refreshHelper.inputHelper("isOutLets"),
productStatus: refreshHelper.inputHelper("productStatus"),
productStatusStr: t.options.columns[t.options.active].value,
tab: $('#basicTab').find('.active').index(),
tab: refreshHelper.inputHelper("tab"),
isInfoMiss: isInfoMiss,
sortFlag: sortFlag,
skcOnsaleStatus: refreshHelper.inputHelper("skcOnsaleStatus"),
... ...