Authored by weiqingting

Merge branch 'master' into develop

... ... @@ -269,6 +269,7 @@ var g=new common.grid({
{display:"选择","type":"checkbox"},
{display:"品牌",render:function(item){
//option js
item.__unid=item.brandId+"-"+item.supplierId;
item.brandName=$.trim($("#brandname").find("option:selected").text().replace(/选择品牌/g,''));
return item.brandName;
}},
... ... @@ -357,7 +358,8 @@ e.on("bind",function(){
g2.__rows.length=0;
}else{
g.options.columns[0].type="checkbox";
__feild="supplierId";
__feild="__unid";
}
//common.util.__template($("#template").html(),{})
common.dialog.confirm("添加供应商关系",$("#template").html(),function(){
... ...