fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit 9c1104fd4d5635b6cc3acb253d9b67371a331d85 2 parents 4e6d860c 76fecac3

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

Inline Side-by-side
Showing 4 changed files with 33 additions and 10 deletions
... ... @@ -197,8 +197,10 @@ var g=new common.grid({
new common.dropDown({
el: ".btn-sort-chima",
ajax: "sortsize2",
params: {
"sortId" : sort
params: function(){
return {
"sortId" : sort
};
}
});
}
... ... @@ -276,6 +278,12 @@ $(document).on("change",":radio[name=gender]",function(){
});
$(document).on("change",":radio[name=isAdvance]",function(){
g.reload();
$("#stock").val("");
$.each(g.__rows,function(inex,item){
$.each(item.goodsSizeList,function(inex1,item1){
item1.presaleStorageNum="";
});
});
if($(this).val()=="Y"){
$("#expectArrivalTimeStr").attr("required","required");
$("#expectArrivalTimeStrTxt").html("预计到货时间<span class='red'>*</span>");
... ... @@ -416,7 +424,7 @@ e.on("validate",function(){
return "同一颜色包含两组相同尺码";
}
if(_count1>0&&common.util.__input("supplierId")){
return "GIT商品条码不能重复";
return "JIT商品条码不能重复";
}
});
e.on("validate",function(){
... ... @@ -431,7 +439,7 @@ $(document).on("click","#btnReview",function(){
if(e.validate()){
common.dialog.confirm("温馨提示","<p>若是GIT商品,请务必选择供应商！</p><p>你确定提交吗？</p>",function(){
common.dialog.confirm("温馨提示","<p>你确定提交吗？</p>",function(){
e.submit($("#basicForm").attr("action"),function(option){
var select=tabTree.getAddress();
... ...
... ... @@ -18,8 +18,8 @@ var config = {
// 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://172.16.9.8:8080/yohobuy-platform-web',//葛超
domain: 'http://192.168.102.202:8088/platform',
domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
// domain: 'http://192.168.102.202:8088/platform',
loggers: {
api: {
level: 'verbose',
... ...
... ... @@ -85,7 +85,7 @@
</select>
</div>
<div class="col-sm-2">
<input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="digits" type="text"></input>
<input class="form-control btn-sort-xiaoshou" value="[[item.salePrice]]" placeholder="默认销售价" data-index=[[index]] data-eq=[[__index]] required match="numbers" type="text"></input>
</div>
<div class="col-sm-2">
<input class="form-control btn-sort-tiaoma" value="[[item.barCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input>
... ... @@ -139,14 +139,16 @@
<select id="supplierId" class="form-control">
<option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>
</select>
<div class="col-sm-12 control-label red">JIT商品必须选择JIT供应商</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">分类<span class="red">*</span></label>
<div class="col-sm-10">
<div class="col-sm-5">
<div id="tree"></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品名称<span class="red">*</span></label>
... ...
... ... @@ -42,7 +42,20 @@
<div class="col-sm-3">供应商：[[supplierName]]</div>
</div>
<div class="form-group">
<div class="col-sm-3">品类：<span> [[maxSortName]]</span><span> [[middleSortName]]</span><span> [[smallSortName]]</span></div>
<div class="col-sm-3">品类：
[[if maxSortName]]
[[maxSortName]]
[[/if]]
[[if middleSortName]]
>[[middleSortName]]
[[/if]]
[[if smallSortName]]
>[[smallSortName]]
[[/if]]
[[if sortName]]
>[[sortName]]
[[/if]]
</div>
<div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
</div>
... ...