fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 1e200e84ea6a5578c6a3774b7e551a9042606374 1 parent e987bd23

去除非销售属性

Inline Side-by-side
Showing 2 changed files with 73 additions and 62 deletions
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
2 var $ = require('jquery'), 2 var $ = require('jquery'),
3 common=require('../common/common'); 3 common=require('../common/common');
4 4
  5 +/*基础商品模型(Model)*/
5 var RESPONSEDATA={}; 6 var RESPONSEDATA={};
6 7
  8 +/*获取基础商品数据*/
7 var param = location.href.match(/(add|update|update2)\/(\d+)/); 9 var param = location.href.match(/(add|update|update2)\/(\d+)/);
8 if(param){ 10 if(param){
9 common.util.__ajax({ 11 common.util.__ajax({
@@ -15,6 +17,7 @@ if(param){ @@ -15,6 +17,7 @@ if(param){
15 },true); 17 },true);
16 } 18 }
17 19
  20 +/*货品年,规则从2015年开始，到今年之后的10年*/
18 RESPONSEDATA.ENUMYEAR=(function(){ 21 RESPONSEDATA.ENUMYEAR=(function(){
19 var _y=[]; 22 var _y=[];
20 for(var i=2005;i<(new Date).getFullYear()+10;i++){ 23 for(var i=2005;i<(new Date).getFullYear()+10;i++){
@@ -28,16 +31,17 @@ console.log(RESPONSEDATA); @@ -28,16 +31,17 @@ console.log(RESPONSEDATA);
28 31
29 32
30 33
31 -/*审核*/  
32 - 34 +/*根据Model渲染View 基础商品基本信息*/
33 $("#basicInfo").html(common.util.__template2($("#template2").html(),RESPONSEDATA)); 35 $("#basicInfo").html(common.util.__template2($("#template2").html(),RESPONSEDATA));
34 36
  37 +/*类目配置*/
35 var ENUM={ 38 var ENUM={
36 goodsSizeList:{"sizeId":"","salePrice":$("#salesPriceStr").val(),"barCode":"","isSuppled":"N","presaleStorageNum":""} 39 goodsSizeList:{"sizeId":"","salePrice":$("#salesPriceStr").val(),"barCode":"","isSuppled":"N","presaleStorageNum":""}
37 } 40 }
38 41
39 -/*商品名称*/ 42 +/*公共模块*/
40 var Bll={ 43 var Bll={
  44 + /*判断类目级别，如果符合三级四级,返回对应id*/
41 validateSort:function(){ 45 validateSort:function(){
42 var id=false; 46 var id=false;
43 var select=tabTree.getAddress(); 47 var select=tabTree.getAddress();
@@ -51,6 +55,7 @@ var Bll={ @@ -51,6 +55,7 @@ var Bll={
51 } 55 }
52 return id; 56 return id;
53 }, 57 },
  58 + /*商品名称*/
54 IsEnter:false, 59 IsEnter:false,
55 productNameArr:['','',''], 60 productNameArr:['','',''],
56 setProductName:function(){ 61 setProductName:function(){
@@ -64,45 +69,45 @@ var Bll={ @@ -64,45 +69,45 @@ var Bll={
64 } 69 }
65 70
66 /*非销售属性配置*/ 71 /*非销售属性配置*/
67 -var ag=new common.grid({  
68 - el:"#attributeTable",  
69 - columns:[  
70 - {display:"名称",name:"attributeName",render:function(item){  
71 - item.required=item.isMust=="Y"?"required":"";  
72 - var arr=[];  
73 - arr.push(item.attributeName);  
74 - if(item.required){  
75 - arr.push("<span class='red'>*</span>");  
76 - }  
77 - return arr.join('');  
78 - }},  
79 - {display:"属性",render:function(item){  
80 - item.required=item.isMust=="Y"?"required":"";  
81 - // item.attributeValues=item.attributeValues.split(',').map(function(elem, index, arr){  
82 - // return {name:elem}  
83 - // });  
84 - var attrs=RESPONSEDATA.productStandardRelationBoList;  
85 - if(attrs){  
86 - for(var i in attrs){  
87 - if(attrs[i].standardId==item.attributeId){  
88 - item.val=attrs[i].standardVal  
89 - item.__val=attrs[i].parameterMakeId  
90 - }  
91 - }  
92 - }  
93 -  
94 - // item.attributeValues={name:};  
95 - return common.util.__template2($("#template3").html(),item);  
96 - }},  
97 - {display:"备注",name:"remark"}  
98 - ],  
99 - complete:function(){  
100 - ag.__edit.init();  
101 - }  
102 -});  
103 -ag.__edit=new common.edit("#attributeTable");  
104 -  
105 -/*品类*/ 72 +// var ag=new common.grid({
  73 +// el:"#attributeTable",
  74 +// columns:[
  75 +// {display:"名称",name:"attributeName",render:function(item){
  76 +// item.required=item.isMust=="Y"?"required":"";
  77 +// var arr=[];
  78 +// arr.push(item.attributeName);
  79 +// if(item.required){
  80 +// arr.push("<span class='red'>*</span>");
  81 +// }
  82 +// return arr.join('');
  83 +// }},
  84 +// {display:"属性",render:function(item){
  85 +// item.required=item.isMust=="Y"?"required":"";
  86 +// // item.attributeValues=item.attributeValues.split(',').map(function(elem, index, arr){
  87 +// // return {name:elem}
  88 +// // });
  89 +// var attrs=RESPONSEDATA.productStandardRelationBoList;
  90 +// if(attrs){
  91 +// for(var i in attrs){
  92 +// if(attrs[i].standardId==item.attributeId){
  93 +// item.val=attrs[i].standardVal
  94 +// item.__val=attrs[i].parameterMakeId
  95 +// }
  96 +// }
  97 +// }
  98 +
  99 +// // item.attributeValues={name:};
  100 +// return common.util.__template2($("#template3").html(),item);
  101 +// }},
  102 +// {display:"备注",name:"remark"}
  103 +// ],
  104 +// complete:function(){
  105 +// ag.__edit.init();
  106 +// }
  107 +// });
  108 +// ag.__edit=new common.edit("#attributeTable");
  109 +
  110 +/*品类初始化*/
106 var SORTDATA={ 111 var SORTDATA={
107 url:"/goods/query/querySortBySmallSort", 112 url:"/goods/query/querySortBySmallSort",
108 datas:[ 113 datas:[
@@ -119,18 +124,18 @@ var SORTDATA={ @@ -119,18 +124,18 @@ var SORTDATA={
119 Bll.productNameArr[2]=data[data.length-1].sortName; 124 Bll.productNameArr[2]=data[data.length-1].sortName;
120 Bll.setProductName(); 125 Bll.setProductName();
121 /*查出非销售属性*/ 126 /*查出非销售属性*/
122 - var sorid=Bll.validateSort();  
123 - if(sorid){  
124 - common.util.__ajax({  
125 - url:'/base/goods/queryAllProductAttr',  
126 - data:{  
127 - categoryId:sorid,  
128 - displayPosition:1  
129 - }  
130 - },function(res){  
131 - ag.init(res.data);  
132 - },true);  
133 - } 127 + // var sorid=Bll.validateSort();
  128 + // if(sorid){
  129 + // common.util.__ajax({
  130 + // url:'/base/goods/queryAllProductAttr',
  131 + // data:{
  132 + // categoryId:sorid,
  133 + // displayPosition:1
  134 + // }
  135 + // },function(res){
  136 + // ag.init(res.data);
  137 + // },true);
  138 + // }
134 139
135 } 140 }
136 } 141 }
@@ -469,11 +474,12 @@ e.on("validate",function(){ @@ -469,11 +474,12 @@ e.on("validate",function(){
469 } 474 }
470 }); 475 });
471 476
472 -e.on("validate",function(){  
473 - if(!ag.__edit.validate(true)){  
474 - return ag.__edit.errMessage;  
475 - }  
476 -}); 477 +/*非销售属性验证*/
  478 +// e.on("validate",function(){
  479 +// if(!ag.__edit.validate(true)){
  480 +// return ag.__edit.errMessage;
  481 +// }
  482 +// });
477 483
478 484
479 $(document).on("click","#btnReview",function(){ 485 $(document).on("click","#btnReview",function(){
@@ -502,6 +508,9 @@ $(document).on("click","#btnReview",function(){ @@ -502,6 +508,9 @@ $(document).on("click","#btnReview",function(){
502 508
503 option.data.baseGoodInfoStr=JSON.stringify(g.__rows); 509 option.data.baseGoodInfoStr=JSON.stringify(g.__rows);
504 510
  511 +
  512 + /*获取非销售属性数据*/
  513 + /*
505 option.data.productStandardRelationStr=[]; 514 option.data.productStandardRelationStr=[];
506 if(ag.rows.length>0){ 515 if(ag.rows.length>0){
507 for(var i in ag.rows){ 516 for(var i in ag.rows){
@@ -532,7 +541,9 @@ $(document).on("click","#btnReview",function(){ @@ -532,7 +541,9 @@ $(document).on("click","#btnReview",function(){
532 } 541 }
533 } 542 }
534 } 543 }
535 - option.data.productStandardRelationStr=JSON.stringify(option.data.productStandardRelationStr); 544 + option.data.productStandardRelationStr=JSON.stringify(option.data.productStandardRelationStr);*/
  545 +
  546 +
536 547
537 // option.debug=true; 548 // option.debug=true;
538 // console.log(option.data); 549 // console.log(option.data);
@@ -29,14 +29,14 @@ @@ -29,14 +29,14 @@
29 <div class="panel-body" id="basicInfo"> 29 <div class="panel-body" id="basicInfo">
30 30
31 </div> 31 </div>
32 - <div class="panel-heading"> 32 + <!-- <div class="panel-heading">
33 <h4 class="panel-title">非销售属性</h4> 33 <h4 class="panel-title">非销售属性</h4>
34 </div> 34 </div>
35 <div class="panel-body"> 35 <div class="panel-body">
36 <div class="row"> 36 <div class="row">
37 <div id="attributeTable"></div> 37 <div id="attributeTable"></div>
38 </div> 38 </div>
39 - </div> 39 + </div> -->
40 40
41 <div class="panel-heading"> 41 <div class="panel-heading">
42 <h4 class="panel-title">销售属性</h4> 42 <h4 class="panel-title">销售属性</h4>