Merge branch 'dev_base_prod_1017' into grey

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.productdesc.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.specialgoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Audit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.articleCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.author.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.brandConcern.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.comment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStar.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStarCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tagCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Category.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Content.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/libs.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.BrandCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.AddOrUpdate.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.PublicCoupon.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Send.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.SendHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.UseHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.ProductPool.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.QueryCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Product.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.entrance.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.generateLinks.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotRankTag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotsuggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.icon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.notice.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.payment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.TagMgmt.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.shopsVersionUpdate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.staticFile.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.subject.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.suggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.version.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.ziplist.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.platformManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.ContentManage.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceSortManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.HotBrand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.SearchWords.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.Model.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ProPhoto.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ShootRequire.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryModel.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Administrator.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Decoration.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationBLK.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Info.js
#	server/interfaces/goods.netsale.js

@@ -26,6 +26,7 @@ module.exports={
 				{name: 'isAuditing', type: 'Number'},
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
+				{name:'skuFactoryCode',type:'String'},
 				{name:'appType',type:'Number'}
         	]
         },
@@ -54,6 +55,7 @@ module.exports={
 				{name: 'isAuditing', type: 'Number'},
 				{name: 'founderName', type: 'String'},
 				{name:'factoryCode',type:'String'},
+				{name:'skuFactoryCode',type:'String'},
 				{name: 'appType', type: 'Number'}
 			]
         },

@@ -30,8 +30,8 @@ module.exports={
 	            {name:'isAdvance', type:'string'},
 	            {name:'skcOnsaleStatus', type:'string'},
 	            {name:'factoryCode',type:'String'},
-				{name: 'appType', type: 'Number'},
-				{name:'skuFactoryCode',type:'String'}
+				{name:'skuFactoryCode',type:'String'},
+				{name: 'appType', type: 'Number'}
 	        ]
         },
         queryTabProductNum:{
@@ -59,7 +59,7 @@ module.exports={
 	            {name:'factoryCode',type:'String'},
 	            {name: 'appType', type: 'Number'},
 				{name:'skuFactoryCode',type:'String'}
-	        ]
+			]
         },
         updateProductSknTimingInfo:{
         	title:'批量skn处理',

@@ -53,7 +53,7 @@
     <div class="form-group">
         <!-- <label class="col-sm-1 red">*</label> -->
         <div class="col-sm-2">
-            <select class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码">
+            <select id="sizeName" class="form-control btn-sort-chima" data-index=[[index]] data-eq=[[__index]] value='[[item.sizeId]]' required placeholder="尺码">
                 <option value="[[item.sizeId||'-1']]">[[item.sizeName||'选择尺码']]</option>
             </select>
         </div>

@@ -73,6 +73,9 @@
                 <div class="panel-col">
                     <input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
                 </div>
+                <div class="panel-col">
+                    <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
+                </div>
                 <div class="panel-col2">
                     <div id="sort"></div>
                 </div>

@@ -112,7 +112,9 @@
                 <div class="panel-col">
                     <input type="text" id="factoryCode" class="form-control" placeholder="厂家编号" style="height: 39px;"/>
                 </div>
-
+                <div class="panel-col">
+                    <input type="text" id="skuFactoryCode" class="form-control" placeholder="条码" style="height: 39px;"/>
+                </div>
                 <div class="panel-col">
                     <select id="isScreen" class="form-control">
                         <option value="-1">是否已摄影传图</option>
@@ -121,9 +123,6 @@
                     </select>
                 </div>
                 <div class="panel-col">
-                    <input type="text" id="skuFactoryCode" class="form-control" placeholder="sku条码" style="height: 39px;"/>
-                </div>
-                <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
                     <a id="all-btn" href="" class="btn btn-info">全部</a>
                 </div>

@@ -61,7 +61,7 @@ var urlObj = {
     'queryProdSizeListForSel':"/productSize/queryProdSizeListForSel"
 };
 
-var minimumResultsForSearch = ["sortbybrand", "getjitSup", "sortsize2", "querySupplier","sortsize3"];
+var minimumResultsForSearch = ["sortbybrand", "getjitSup", "querySupplier","sortsize3"];
 
 var dropDown = function(option) {
     new dropDown.prototype.init(option);

@@ -219,6 +219,7 @@ var g = new common.grid({
             sortId: select[3] ? select[3].id : "",
             founderName: common.util.__input("founderName"),
             factoryCode: common.util.__input("factoryCode"),
+            skuFactoryCode: common.util.__input("skuFactoryCode"),
             appType: common.util.__input("appType")
         };
     },

@@ -139,8 +139,8 @@ var g = new common.grid({
             skcOnsaleStatus: common.util.__input("skcOnsaleStatus"),
             isAdvance: common.util.__input("isAdvance"),
             factoryCode: common.util.__input("factoryCode"),
-            appType: common.util.__input("appType"),
-            skuFactoryCode: common.util.__input("skuFactoryCode")
+            skuFactoryCode: common.util.__input("skuFactoryCode"),
+            appType: common.util.__input("appType")
         };
     },
     columns: [{