fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by mali
Commit 7c503cd66d89babdc1a96072aeb2c6b60385558b 2 parents a9170115 3c3715ff

Merge branch 'dev_基础商品新增货品年筛选' into gray

Inline Side-by-side
Showing 4 changed files with 35 additions and 5 deletions
@@ -27,7 +27,9 @@ module.exports={ @@ -27,7 +27,9 @@ module.exports={
27 {name: 'founderName', type: 'String'}, 27 {name: 'founderName', type: 'String'},
28 {name:'factoryCode',type:'String'}, 28 {name:'factoryCode',type:'String'},
29 {name:'skuFactoryCode',type:'String'}, 29 {name:'skuFactoryCode',type:'String'},
30 - {name:'appType',type:'Number'} 30 + {name:'appType',type:'Number'},
  31 + {name: 'goodsYears', type: 'Number'},
  32 + {name: 'goodsSeason', type: 'Number'}
31 ] 33 ]
32 }, 34 },
33 getBaseProductList:{ 35 getBaseProductList:{
@@ -56,7 +58,9 @@ module.exports={ @@ -56,7 +58,9 @@ module.exports={
56 {name: 'founderName', type: 'String'}, 58 {name: 'founderName', type: 'String'},
57 {name:'factoryCode',type:'String'}, 59 {name:'factoryCode',type:'String'},
58 {name:'skuFactoryCode',type:'String'}, 60 {name:'skuFactoryCode',type:'String'},
59 - {name: 'appType', type: 'Number'} 61 + {name: 'appType', type: 'Number'},
  62 + {name: 'goodsYears', type: 'Number'},
  63 + {name: 'goodsSeason', type: 'Number'}
60 ] 64 ]
61 }, 65 },
62 addBaseProduct:{ 66 addBaseProduct:{
@@ -80,6 +80,18 @@ @@ -80,6 +80,18 @@
80 <div class="panel-col2"> 80 <div class="panel-col2">
81 <div id="sort"></div> 81 <div id="sort"></div>
82 </div> 82 </div>
  83 + <div id="goodsYearsDiv" class="panel-col">
  84 + </div>
  85 + <div class="panel-col">
  86 + <select id="goodsSeason" class="form-control">
  87 + <option value="1">春</option>
  88 + <option value="2">夏</option>
  89 + <option value="3">秋</option>
  90 + <option value="4">冬</option>
  91 + <option value="5">春夏</option>
  92 + <option value="6">秋冬</option>
  93 + </select>
  94 + </div>
83 95
84 <div class="panel-col"> 96 <div class="panel-col">
85 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> 97 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
@@ -108,6 +120,14 @@ @@ -108,6 +120,14 @@
108 </div> 120 </div>
109 </div> 121 </div>
110 122
  123 +<script>
  124 + var htmlStr = '<select id="goodsYears" class="form-control"><option value="-1">璇烽�夋嫨璐у搧骞�</option>';
  125 + for(var i=2005;i<(new Date).getFullYear()+10;i++){
  126 + htmlStr += '<option value="' + i + '">' + i + '</option>';
  127 + }
  128 + htmlStr += '</select>';
  129 + document.getElementById('goodsYearsDiv').innerHTML= htmlStr;
  130 +</script>
111 131
112 <script type="text/template" id="template"> 132 <script type="text/template" id="template">
113 <div class="rows" style="height: 100px;"> 133 <div class="rows" style="height: 100px;">
@@ -228,7 +228,9 @@ var g = new common.grid({ @@ -228,7 +228,9 @@ var g = new common.grid({
228 founderName: common.util.__input("founderName"), 228 founderName: common.util.__input("founderName"),
229 factoryCode: common.util.__input("factoryCode"), 229 factoryCode: common.util.__input("factoryCode"),
230 skuFactoryCode: common.util.__input("skuFactoryCode"), 230 skuFactoryCode: common.util.__input("skuFactoryCode"),
231 - appType: common.util.__input("appType") 231 + appType: common.util.__input("appType"),
  232 + goodsYears: common.util.__input("goodsYears"),
  233 + goodsSeason: common.util.__input("goodsSeason")
232 }; 234 };
233 }, 235 },
234 columns: [{ 236 columns: [{
@@ -27,7 +27,9 @@ module.exports={ @@ -27,7 +27,9 @@ module.exports={
27 {name: 'founderName', type: 'String'}, 27 {name: 'founderName', type: 'String'},
28 {name:'factoryCode',type:'String'}, 28 {name:'factoryCode',type:'String'},
29 {name:'skuFactoryCode',type:'String'}, 29 {name:'skuFactoryCode',type:'String'},
30 - {name:'appType',type:'Number'} 30 + {name:'appType',type:'Number'},
  31 + {name: 'goodsYears', type: 'Number'},
  32 + {name: 'goodsSeason', type: 'Number'}
31 ] 33 ]
32 }, 34 },
33 getBaseProductList:{ 35 getBaseProductList:{
@@ -56,7 +58,9 @@ module.exports={ @@ -56,7 +58,9 @@ module.exports={
56 {name: 'founderName', type: 'String'}, 58 {name: 'founderName', type: 'String'},
57 {name:'factoryCode',type:'String'}, 59 {name:'factoryCode',type:'String'},
58 {name:'skuFactoryCode',type:'String'}, 60 {name:'skuFactoryCode',type:'String'},
59 - {name: 'appType', type: 'Number'} 61 + {name: 'appType', type: 'Number'},
  62 + {name: 'goodsYears', type: 'Number'},
  63 + {name: 'goodsSeason', type: 'Number'}
60 ] 64 ]
61 }, 65 },
62 addBaseProduct:{ 66 addBaseProduct:{