fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit a1569e41d0b5819ff74bf01081239fee61e2d489 1 parent 15c8bfb2

client/js/basegppds/edit.js回滚到4.8号

Inline Side-by-side
Showing 1 changed file with 46 additions and 48 deletions
... ... @@ -41,8 +41,8 @@ console.log(RESPONSEDATA);
$("#basicInfo").html(common.util.__template2($("#template2").html(),RESPONSEDATA));
/*类目配置*/
var ENUM={//"presaleStorageNum":""
goodsSizeList:{"sizeId":"","salePrice":$("#salesPriceStr").val(),"factoryCode":"","isSuppled":"Y"}
var ENUM={
goodsSizeList:{"sizeId":"","salePrice":$("#salesPriceStr").val(),"barCode":"","isSuppled":"N","presaleStorageNum":""}
}
/*公共模块*/
... ... @@ -142,7 +142,7 @@ var SORTDATA={
// ag.init(res.data);
// },true);
// }
}
}
};
... ... @@ -184,17 +184,17 @@ if(!param){//RESPONSEDATA.isAuditing!=200
var g=new common.grid({
el:"#basicTable",
columns:[
{display:"颜色",render:function(item){
{display:"分类名称",render:function(item){
var html=[];
var txt=item.factoryGoodsName?item.factoryGoodsName:"";
html.push("<p>厂家颜色:<input type='text' class='w-goods-text' data-index="+item.__index+" value='"+txt+"' placeholder='分类名称' required/><p>");
html.push("<p>名称:<input type='text' class='w-goods-text' data-index="+item.__index+" value='"+txt+"' placeholder='分类名称' required/><p>");
html.push("<p>色系:"+item.goodsName+"<p>");
html.push('<button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button>');
return html.join("");
}},
{
display:"图片",render:function(item){
display:"分类图片",render:function(item){
//goodsColorImage
return "<input type=file name='goodsColorImage' id='file__"+item.__index+"' value='"+item.goodsColorImage+"' />";
}
... ... @@ -205,13 +205,11 @@ var g=new common.grid({
g.__gsm[item.__index]=item.goodsSizeList.length;
}
var html=[];
html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' /></div></div>");
html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>是否补货</div></div></div>");
html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.modelCode+"' data-index="+item.__index+" class='modelCode form-control' placeholder='款型编码' /></div></div>");
html.push('<div class="rows" id="rows__'+item.__index+'">');
item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)];
// var ISXIANGO=(common.util.__input("isAdvance")=="Y"&&+RESPONSEDATA.isAuditing==200)?true:false;
//ISXIANGO:ISXIANGO
html.push(common.util.__template2($("#template").html(),{index:item.__index,goodsSizeList:item.goodsSizeList}));
var ISXIANGO=(common.util.__input("isAdvance")=="Y"&&+RESPONSEDATA.isAuditing==200)?true:false;
html.push(common.util.__template2($("#template").html(),{index:item.__index,ISXIANGO:ISXIANGO,goodsSizeList:item.goodsSizeList}));
html.push('</div>');
return html.join('');
}
... ... @@ -281,7 +279,7 @@ $(document).on("click",".sortadd",function(){
var goodsSizeList=$.extend({},ENUM.goodsSizeList);
goodsSizeList.salePrice=$("#salesPriceStr").val();
g.__rows.push({
"factoryCode": "",
"modelCode": "",
"goodsColorImage": "",
goodsName: $(this).text(),
colorId: (+$(this).data("id")),
... ... @@ -300,8 +298,8 @@ $(document).on("change","#brandId",function(){
var id=$(this).val();
Bll.productNameArr[0]=$(this).find("option[value='"+id+"']").text();
Bll.setProductName();
$("#supplierId").val(-1).trigger("change");
$("#shopId").val(-1).trigger("change");
$("#supplierId").val(-1).trigger("change");
$("#shopId").val(-1).trigger("change");
tabTree.isfeeze=false;
tabTree.init([{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""}]);
});
... ... @@ -315,12 +313,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="";
// });
// });
$("#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>");
... ... @@ -343,7 +341,7 @@ $(document).on("click",".sortdelete",function(){
});
$(document).on("change",".modelCode",function(){
var item=g.__rows[$(this).data("index")];
item.factoryCode=$(this).val();
item.modelCode=$(this).val();
});
$(document).on("click",".btn-sort-add",function(){
var item=g.__rows[$(this).data("index")];
... ... @@ -377,7 +375,7 @@ $(document).on("change",".btn-sort-tiaoma",function(){
var _index=$(this).data("index");
var _eq=$(this).data("eq");
var item=g.__rows[_index].goodsSizeList[_eq];
item.factoryCode=$(this).val();
item.barCode=$(this).val();
});
$(document).on("change",".btn-sort-kebu",function(){
var _index=$(this).data("index");
... ... @@ -385,19 +383,19 @@ $(document).on("change",".btn-sort-kebu",function(){
var item=g.__rows[_index].goodsSizeList[_eq];
item.isSuppled=$(this).val();
});
// $(document).on("change",".btn-sort-kucun",function(){
// var _index=$(this).data("index");
// var _eq=$(this).data("eq");
// var item=g.__rows[_index].goodsSizeList[_eq];
// item.presaleStorageNum=$(this).val();
// var total=0;
// $.each(g.__rows,function(index,item1){
// $.each(item1.goodsSizeList,function(index,item2){
// total+=(+item2.presaleStorageNum);
// });
// });
// $("#stock").val(total);
// });
$(document).on("change",".btn-sort-kucun",function(){
var _index=$(this).data("index");
var _eq=$(this).data("eq");
var item=g.__rows[_index].goodsSizeList[_eq];
item.presaleStorageNum=$(this).val();
var total=0;
$.each(g.__rows,function(index,item1){
$.each(item1.goodsSizeList,function(index,item2){
total+=(+item2.presaleStorageNum);
});
});
$("#stock").val(total);
});
$(document).on("change",".w-goods-text",function(){
var item=g.__rows[$(this).data("index")];
item.factoryGoodsName=$(this).val();
... ... @@ -457,43 +455,43 @@ e.on("validate",function(){
}
//RESPONSEDATA.productSkn
console.log("item1.factoryCode",item1.factoryCode)
console.log("item1.barCode",item1.barCode)
map[gname+"_"+item1.sizeId]="";
//修改
if(RESPONSEDATA.productSkn){
if(index1>g.__gsm[index]-1){
//大于原来的计算
if(map2.hasOwnProperty(item1.factoryCode)){
if(map2.hasOwnProperty(item1.barCode)){
_count1++;
}
map2[item1.factoryCode]="";
console.log("大于原来的计算",item1.factoryCode+":"+_count1);
map2[item1.barCode]="";
console.log("大于原来的计算",item1.barCode+":"+_count1);
}else{
//小于原来，并且有值
if(item1.factoryCode){
if(map2.hasOwnProperty(item1.factoryCode)){
if(item1.barCode){
if(map2.hasOwnProperty(item1.barCode)){
_count1++;
}
map2[item1.factoryCode]="";
map2[item1.barCode]="";
console.log("小于原来，并且有值",_count1);
}
console.log("没值",_count1);
}
}else{
//添加时候计算
if(item1.factoryCode){
if(map2.hasOwnProperty(item1.factoryCode)){
if(item1.barCode){
if(map2.hasOwnProperty(item1.barCode)){
_count1++;
}
map2[item1.factoryCode]="";
map2[item1.barCode]="";
}
console.log("添加时候计算",_count1);
}
if(g.__gsm[index]&&index1<g.__gsm[index]){
return;
}
map3.push(item1.factoryCode);
map3.push(item1.barCode);
});
});
}
... ... @@ -510,7 +508,7 @@ e.on("validate",function(){
ispass="商品条码不能为空";
return ispass;
}
common.util.__ajax({
common.util.__ajax2({
url:'/goods/base/checkSkuBarCodeExist',
async:false,
data:{barCode:map3.join(',')}
... ...