build

@@ -42,7 +42,8 @@ webpackJsonp([156],[
 	            arriveEndTime: new Date(common.util.__input('endTime')).getTime() / 1000,
 	            isMeasure: common.util.__input('hasMeasure-filter'),
 	            maxSortId: tabTree.getAddress()[0] ? tabTree.getAddress()[0].id : "",
-	            nationalCode: common.util.__input('nationalCode')
+	            nationalCode: common.util.__input('nationalCode'),
+	            sknFactoryCode: common.util.__input('sknFactoryCode'),
 	        };
 	    },
 	    columns: [

@@ -102,7 +102,8 @@ module.exports = {
                 arriveStartTime: {type: Number},
                 arriveEndTime: {type: Number},
                 isMeasure: {type: String},
-                nationalCode: {type:String}
+                nationalCode: {type:String},
+                sknFactoryCode:{type:String}
             }
         },
 

@@ -42,6 +42,9 @@
                     <input type="text" id="nationalCode" class="form-control" name="nationalCode" placeholder="品牌条码"/>
                 </div>
                 <div class="panel-col">
+                    <input type="text" id="sknFactoryCode" class="form-control" name="sknFactoryCode" placeholder="厂家编号"/>
+                </div>
+                <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
                     <a id="filter-all" href="/meterManage/meterSize/index" class="btn btn-info">全部</a>
                 </div>