Authored by 马力

Merge branch 'dev_厂家颜色支持修改' into gray

... ... @@ -198,9 +198,11 @@ var g=new common.grid({
}else{
if(item.isNew){
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+item.goodsName+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
}else{
// 厂家颜色上架后也能修改
}else if (RESPONSEDATA.isJit =='Y'){
// JIT商品厂家颜色上架后也能修改
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
} else {
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' disabled='disabled' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
}
html.push("<p>色系:&nbsp;"+item.goodsName+"</p>");
... ...