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

@@ -27,7 +27,9 @@ module.exports={
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
 				{name:'skuFactoryCode',type:'String'},
-				{name:'appType',type:'Number'}
+				{name:'appType',type:'Number'},
+				{name: 'goodsYears', type: 'Number'},
+				{name: 'goodsSeason', type: 'Number'}
         	]
         },
         getBaseProductList:{
@@ -56,7 +58,9 @@ module.exports={
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
 				{name:'skuFactoryCode',type:'String'},
-				{name: 'appType', type: 'Number'}
+				{name: 'appType', type: 'Number'},
+				{name: 'goodsYears', type: 'Number'},
+				{name: 'goodsSeason', type: 'Number'}
 			]
         },
         addBaseProduct:{

@@ -80,6 +80,18 @@
                 <div class="panel-col2">
                     <div id="sort"></div>
                 </div>
+                <div id="goodsYearsDiv" class="panel-col">
+                </div>
+                <div class="panel-col">
+                    <select id="goodsSeason" class="form-control">
+                      <option value="1">春</option>
+                      <option value="2">夏</option>
+                      <option value="3">秋</option>
+                      <option value="4">冬</option>
+                      <option value="5">春夏</option>
+                      <option value="6">秋冬</option>
+                    </select>
+                </div>
                 
                 <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
@@ -108,6 +120,14 @@
     </div>
 </div>
 
+<script>
+  var htmlStr = '<select id="goodsYears" class="form-control"><option value="-1">璇烽�夋嫨璐у搧骞�</option>';
+  for(var i=2005;i<(new Date).getFullYear()+10;i++){
+		htmlStr += '<option value="' + i + '">' + i + '</option>';
+	}
+  htmlStr += '</select>';
+  document.getElementById('goodsYearsDiv').innerHTML= htmlStr;
+</script>
 
 <script type="text/template" id="template">
     <div class="rows" style="height: 100px;">

@@ -228,7 +228,9 @@ var g = new common.grid({
             founderName: common.util.__input("founderName"),
             factoryCode: common.util.__input("factoryCode"),
             skuFactoryCode: common.util.__input("skuFactoryCode"),
-            appType: common.util.__input("appType")
+            appType: common.util.__input("appType"),
+            goodsYears: common.util.__input("goodsYears"),
+            goodsSeason: common.util.__input("goodsSeason")
         };
     },
     columns: [{

@@ -27,7 +27,9 @@ module.exports={
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
 				{name:'skuFactoryCode',type:'String'},
-				{name:'appType',type:'Number'}
+				{name:'appType',type:'Number'},
+				{name: 'goodsYears', type: 'Number'},
+				{name: 'goodsSeason', type: 'Number'}
         	]
         },
         getBaseProductList:{
@@ -56,7 +58,9 @@ module.exports={
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
 				{name:'skuFactoryCode',type:'String'},
-				{name: 'appType', type: 'Number'}
+				{name: 'appType', type: 'Number'},
+				{name: 'goodsYears', type: 'Number'},
+				{name: 'goodsSeason', type: 'Number'}
 			]
         },
         addBaseProduct:{