liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 2a9b481cf55d7befddd8b6d150fa865fed878c65 2 parents 8e4e0b2c 35baf3e1

Merge branch 'yohobuy_portak_dev_v4.8_20160620'

Inline Side-by-side
Showing 3 changed files with 14 additions and 2 deletions
@@ -35,6 +35,9 @@ module.exports=function(app) { @@ -35,6 +35,9 @@ module.exports=function(app) {
35 /*添加数据接口*/ 35 /*添加数据接口*/
36 app.post("/base/goods/ajax/add","basegoods_addBaseProduct"); 36 app.post("/base/goods/ajax/add","basegoods_addBaseProduct");
37 37
  38 + /*检查下SKU是否存在*/
  39 + app.post("/product/checkSkuBarCodeExist","basegoods_checkSkuBarCodeExist");
  40 +
38 /*修改页面*/ 41 /*修改页面*/
39 app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){ 42 app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){
40 this.$extend={ 43 this.$extend={
@@ -457,9 +457,15 @@ e.on("validate",function(){ @@ -457,9 +457,15 @@ e.on("validate",function(){
457 map3=map3.filter(function(item){ 457 map3=map3.filter(function(item){
458 return $.trim(item.factoryCode)?true:false; 458 return $.trim(item.factoryCode)?true:false;
459 }); 459 });
  460 + var __m={};
  461 + map3.forEach(function(item){
  462 + if(!__m.hasOwnProperty(item.factoryCode)){
  463 + __m[item.factoryCode]=true;
  464 + }
  465 + });
460 466
461 var ispass=true; 467 var ispass=true;
462 - if(len==map3.length){ 468 + if(len==map3.length&&len==Object.keys(__m).length){
463 common.util.__ajax2({ 469 common.util.__ajax2({
464 url:'/product/checkSkuBarCodeExist', 470 url:'/product/checkSkuBarCodeExist',
465 async:false, 471 async:false,
@@ -470,7 +476,7 @@ e.on("validate",function(){ @@ -470,7 +476,7 @@ e.on("validate",function(){
470 } 476 }
471 },true); 477 },true);
472 }else{ 478 }else{
473 - ispass="商品条码不可为空"; 479 + ispass="商品条码不可为空或者条码重复";
474 } 480 }
475 481
476 return ispass; 482 return ispass;
@@ -35,6 +35,9 @@ module.exports=function(app) { @@ -35,6 +35,9 @@ module.exports=function(app) {
35 /*添加数据接口*/ 35 /*添加数据接口*/
36 app.post("/base/goods/ajax/add","basegoods_addBaseProduct"); 36 app.post("/base/goods/ajax/add","basegoods_addBaseProduct");
37 37
  38 + /*检查下SKU是否存在*/
  39 + app.post("/product/checkSkuBarCodeExist","basegoods_checkSkuBarCodeExist");
  40 +
38 /*修改页面*/ 41 /*修改页面*/
39 app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){ 42 app.get("/base/goods/update/:productSkn/:isAuditing","goods.basegoods.Edit",["basegoods_queryProductColors","basegoods_getBaseProduct"],function(colos,info){
40 this.$extend={ 43 this.$extend={