|
@@ -41,7 +41,9 @@ var Bll={ |
|
@@ -41,7 +41,9 @@ var Bll={ |
41
|
},
|
41
|
},
|
42
|
productNameArr:['','',''],
|
42
|
productNameArr:['','',''],
|
43
|
setProductName:function(){
|
43
|
setProductName:function(){
|
44
|
- $("#productName").val(Bll.productNameArr.join("-"));
|
44
|
+ if(!param){
|
|
|
45
|
+ $("#productName").val(Bll.productNameArr.join(""));
|
|
|
46
|
+ }
|
45
|
}
|
47
|
}
|
46
|
}
|
48
|
}
|
47
|
|
49
|
|
|
@@ -286,21 +288,26 @@ e.on("validate",function(){ |
|
@@ -286,21 +288,26 @@ e.on("validate",function(){ |
286
|
if((+$("#salesPriceStr").val())>(+$("#retailPriceStr").val())){
|
288
|
if((+$("#salesPriceStr").val())>(+$("#retailPriceStr").val())){
|
287
|
return "销售价应该限定小于等于吊牌价";
|
289
|
return "销售价应该限定小于等于吊牌价";
|
288
|
}
|
290
|
}
|
289
|
-})
|
291
|
+});
|
|
|
292
|
+//
|
|
|
293
|
+
|
290
|
$(document).on("click","#btnReview",function(){
|
294
|
$(document).on("click","#btnReview",function(){
|
|
|
295
|
+
|
|
|
296
|
+ if(e.validate()){
|
|
|
297
|
+ common.dialog.confirm("温馨提示","<p>若是JIT商品,请务必选择供应商!</p><p>你确定提交吗?</p>",function(){
|
291
|
e.submit($("#basicForm").attr("action"),function(option){
|
298
|
e.submit($("#basicForm").attr("action"),function(option){
|
292
|
var select=tabTree.getAddress();
|
299
|
var select=tabTree.getAddress();
|
293
|
|
300
|
|
294
|
option.data.supplierId=common.util.__input("supplierId")?$("#supplierId").val():"0";
|
301
|
option.data.supplierId=common.util.__input("supplierId")?$("#supplierId").val():"0";
|
|
|
302
|
+ option.data.shopId=common.util.__input("shopId")?$("#shopId").val():"0";
|
295
|
|
303
|
|
296
|
option.data.productSkn=param?param[2]:"";
|
304
|
option.data.productSkn=param?param[2]:"";
|
297
|
option.data.maxSortId=select[0]?select[0].id:"";
|
305
|
option.data.maxSortId=select[0]?select[0].id:"";
|
298
|
option.data.middleSortId=select[1]?select[1].id:"";
|
306
|
option.data.middleSortId=select[1]?select[1].id:"";
|
299
|
option.data.smallSortId=select[2]?select[2].id:"";
|
307
|
option.data.smallSortId=select[2]?select[2].id:"";
|
300
|
|
308
|
|
301
|
- option.data.shopId=$("#shopId").val();
|
309
|
+ // option.data.shopId=$("#shopId").val();
|
302
|
option.data.brandId=$("#brandId").val();
|
310
|
option.data.brandId=$("#brandId").val();
|
303
|
- option.data.supplierId=$("#supplierId").val();
|
|
|
304
|
|
311
|
|
305
|
option.data.isAuditing=RESPONSEDATA.isAuditing?RESPONSEDATA.isAuditing:"";
|
312
|
option.data.isAuditing=RESPONSEDATA.isAuditing?RESPONSEDATA.isAuditing:"";
|
306
|
|
313
|
|
|
@@ -324,5 +331,8 @@ $(document).on("click","#btnReview",function(){ |
|
@@ -324,5 +331,8 @@ $(document).on("click","#btnReview",function(){ |
324
|
e.$tip(res.message);
|
331
|
e.$tip(res.message);
|
325
|
}
|
332
|
}
|
326
|
});
|
333
|
});
|
|
|
334
|
+ })
|
|
|
335
|
+ }
|
|
|
336
|
+
|
327
|
return false;
|
337
|
return false;
|
328
|
}); |
338
|
}); |