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

马力
Commit 54cef3c9d1c147ecf22833bebc497fbd5e2d1e9c 2 parents 36b5dec0 22158ad8
Showing 1 changed file with 4 additions and 2 deletions
code/static/js.jquery/module/goods/basegoods/Edit.js
--- a/code/static/js.jquery/module/goods/basegoods/Edit.js
View file @54cef3c
+++ b/code/static/js.jquery/module/goods/basegoods/Edit.js
View file @54cef3c
@@ -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>");