Merge branch 'dev_2.2' into test

@@ -280,7 +280,7 @@
 
 
         <div class="form-group">
         <div class="form-group">
             <label class="col-sm-2 control-label">预计上架时间<span class="red">*</span></label>
             <label class="col-sm-2 control-label">预计上架时间<span class="red">*</span></label>
-            <div class="col-sm-2"><input type="hidden"  id="firstShelveTime" value="[[firstShelveTime]]" />
+            <div class="col-sm-2">
                 <input type="text" id="expectShelfTimeStr" jsaction="time" value="[[expectShelfTimeStr]]" required class="form-control" readonly="readonly" placeholder="预计上架时间" />
                 <input type="text" id="expectShelfTimeStr" jsaction="time" value="[[expectShelfTimeStr]]" required class="form-control" readonly="readonly" placeholder="预计上架时间" />
             </div>
             </div>
             [[if isAdvance=='Y']]
             [[if isAdvance=='Y']]

@@ -242,7 +242,7 @@ $(document).on("click",".sortadd",function(){
 		common.util.__tip("请填写销售价","warning");
 		common.util.__tip("请填写销售价","warning");
 		return;
 		return;
 	}
 	}
-	if ($.trim($("#firstShelveTime").val())!=""&&$.trim($("#firstShelveTime").val())!=0) {
+	if(ACTION == 1 && !canEditSort){
 		common.util.__tip("商品有过上架操作,不允许修改厂家颜色","warning");
 		common.util.__tip("商品有过上架操作,不允许修改厂家颜色","warning");
 		return;
 		return;
 	}
 	}