fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 08c1bcc3ba1a0228e11f023647ed3f0d38ec5c07 2 parents f745c3c1 eb08d6fe

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 5 changed files with 21 additions and 17 deletions
... ... @@ -175,9 +175,9 @@ var g=new common.grid({
},
{
display:"<label class='red'>分类名称,款型编码,选择尺码,默认销售价必填</label>",render:function(item){
// if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
// g.__gsm[item.__index]=item.goodsSizeList.length;
// }
if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
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.factoryCode+"' data-index="+item.__index+" class='factoryCode form-control' placeholder='款型编码' required/></div></div>");
html.push('<div class="rows" id="rows__'+item.__index+'">');
... ... @@ -201,17 +201,19 @@ var g=new common.grid({
});
}
g.__e.init();
// for(var i in g.__gsm){
// var warp=$("#rows__"+i).children(".form-group").slice(0, 1);
// warp.find("input").prop("readonly",true);
// warp.find("select").prop("disabled",true);
// warp.find("btn-sort-remove").remove();
// }
for(var i in g.__gsm){
var warp=$("#rows__"+i).children(".form-group").slice(0, 1);
warp.find("input").prop("readonly",true);
warp.find("select").prop("disabled",true);
warp.find("btn-sort-remove").remove();
warp.find(".btn-sort-kucun").prop("readonly",false);
}
for(var i=0;i<g.__length;i++){
var warp=$("#basicTable").find("tbody").children("tr").eq(i);
warp.find("input").prop("readonly",true).prop("disabled",true);
warp.find("select").prop("disabled",true);
warp.find("button").remove();
warp.find(".w-goods-text").prop("readonly",true).prop("disabled",true);
warp.find("input[name=file]").prop("readonly",true).prop("disabled",true);
warp.find(".factoryCode").prop("readonly",true).prop("disabled",true);
warp.find(".sortdelete").remove();
}
}
});
... ...
... ... @@ -56,6 +56,8 @@ dropDown.prototype = {
var param={};
if(Object.prototype.toString.call(option.params)=="[object Function]"){
param=option.params();
}else{
param=option.params;
}
var data = $.extend({}, {
... ...
... ... @@ -106,7 +106,9 @@ tabTree.prototype= {
p.stepMet(g.selected, g.active_count)
}
g.changeVolume();
// g.setHeadVal();
if(!p.url){
g.setHeadVal();
}
return event.stopPropagation()
});
$(document).click(function() {
... ...
... ... @@ -14,10 +14,10 @@ var config = {
apiKey: 'sd4H1ecAqlp',
//http: //192.168.102.214:8088/platform
// domain: 'http://172.16.6.240:8088/platform',
// domain:'http://172.16.6.240:8088/platform',
domain:'http://172.16.6.240:8088/platform',
// domain: 'http://172.16.6.252:9080',//陈超
// domain:'http://172.16.6.227:8088/platform',//玛丽
domain: 'http://192.168.102.202:8088/platform',
// domain: 'http://192.168.102.202:8088/platform',
loggers: {
api: {
level: 'verbose',
... ...
... ... @@ -82,8 +82,6 @@
<div class="panel-footer">
[[if isAuditing!="200"&&isAuditing!="300"]]
<button class="btn btn-primary apply-success">通过</button>
[[/if]]
[[if isAuditing!="300"]]
<button class="btn btn-primary apply-back">驳回</button>
[[/if]]
</div>
... ...