fe / yohobuy-shops-fe · Commits

Go to a project

Authored by liuyue
Commit 6a863f7643a423fb0304b11289b499db3e84613f 2 parents f8569b18 401fccff

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-shops-fe into develop

Inline Side-by-side
Showing 2 changed files with 14 additions and 6 deletions
... ... @@ -148,7 +148,12 @@ var SORTDATA={
};
var tabTree=new common.tabTree("#tree",SORTDATA);
tabTree.init(SORTDATA.datas);
tabTree.isfeeze=true;
if(param&&(RESPONSEDATA.isAuditing==100||(RESPONSEDATA.isAuditing==200&&RESPONSEDATA.status==8))){
//上架之前可以修改，编辑状态
tabTree.isfeeze=false;
}else{
tabTree.isfeeze=true;
}
... ... @@ -199,7 +204,7 @@ var g=new common.grid({
g.__gsm[item.__index]=item.goodsSizeList.length;
}
var html=[];
html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.modelCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' required/></div></div>");
html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.modelCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' /></div></div>");
html.push('<div class="rows" id="rows__'+item.__index+'">');
item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)];
var ISXIANGO=(common.util.__input("isAdvance")=="Y"&&+RESPONSEDATA.isAuditing==200)?true:false;
... ... @@ -226,7 +231,7 @@ var g=new common.grid({
for(var i in g.__gsm){
var warp=$("#rows__"+i).children(".form-group").slice(0, g.__gsm[i]);
warp.find("input").prop("readonly",true);
warp.find("select").prop("disabled",true);
warp.find(".btn-sort-chima").prop("disabled",true);
warp.find(".btn-sort-remove").remove();
warp.find(".btn-sort-kucun").prop("readonly",false);
}
... ... @@ -234,7 +239,7 @@ var g=new common.grid({
var warp=$("#basicTable").find("tbody").children("tr").eq(i);
warp.find(".w-goods-text").prop("readonly",true).prop("disabled",true);
warp.find("input[name=file]").prop("readonly",true).prop("disabled",true);
warp.find(".modelCode").prop("readonly",true).prop("disabled",true);
// warp.find(".modelCode").prop("readonly",true).prop("disabled",true);
// 如果为undefind,则清除require,并且设置为空
if(warp.find(".modelCode").val()=="undefined"){
warp.find(".modelCode").removeAttr("required").val('');
... ... @@ -548,6 +553,9 @@ $(document).on("click","#btnReview",function(){
option.data.middleSortId=select[1]?select[1].id:"";
option.data.smallSortId=select[2]?select[2].id:"";
option.data.sortId=select[3]?select[3].id:"";
option.data.isVip=option.data.isVip||'B';
option.data.isOutLets=option.data.isOutLets||'B';
// option.data.shopId=$("#shopId").val();
option.data.brandId=$("#brandId").val();
... ...
... ... @@ -62,7 +62,7 @@ $(document).on("click",".apply-success",function(){
var data=function(){
return {
productSknList:JSON.stringify([param[2]]),
productSknList:JSON.stringify([param[0]]),
};
}
BllPass.toast("你确定审核通过吗？",data);
... ... @@ -79,7 +79,7 @@ $(document).on("click",".apply-back",function(){
}
return {
productSknList:JSON.stringify([param[2]]),
productSknList:JSON.stringify([param[0]]),
rejectReason:reason
};
}
... ...