Merge branch 'dev_size_5.3' into grey

@@ -11,6 +11,8 @@ module.exports=function(app) {
     app.post("/product/querySizeAttributesByName","select_querySizeAttributesByName");
     app.post("/product/querySizeAttributesByName","select_querySizeAttributesByName");
 
 
     app.post("/product/querySizeListBySortId4Html","select_querySizeListBySortId4Html");
     app.post("/product/querySizeListBySortId4Html","select_querySizeListBySortId4Html");
+
+    app.post("/product/querySizeListBySkn","select_querySizeListBySkn");
     /*尺码模糊查询【验证通过】*/
     /*尺码模糊查询【验证通过】*/
     app.post("/product/querySizeByNameForSelect","select_querySizeByNameForSelect");
     app.post("/product/querySizeByNameForSelect","select_querySizeByNameForSelect");
     /*查询品牌列表接口*/
     /*查询品牌列表接口*/

@@ -41,6 +41,14 @@ module.exports={
                 {name: "sortId", type: "Number"}
                 {name: "sortId", type: "Number"}
             ]
             ]
         },
         },
+        querySizeListBySkn:{
+            title:'',
+            url: '/product/querySizeListBySkn',
+            params: [
+                {name: "idName", type: "String"},
+                {name: "productSkn", type: "Number"}
+            ]
+        },
         querySizeByNameForSelect:{
         querySizeByNameForSelect:{
             title:'尺码模糊查询【验证通过】',
             title:'尺码模糊查询【验证通过】',
             url: '/product/querySizeByNameForSelect',
             url: '/product/querySizeByNameForSelect',

@@ -16,6 +16,7 @@ var urlObj = {
     'shopsRest': '/ShopsRest/selectCheckPassShopsByName', // 店铺列表
     'shopsRest': '/ShopsRest/selectCheckPassShopsByName', // 店铺列表
     'xiangouID': '/DrawlineActivityRest/selectActivityListForSelect', //限购ID
     'xiangouID': '/DrawlineActivityRest/selectActivityListForSelect', //限购ID
     'sortsize2': '/product/querySizeListBySortId4Html', //尺码
     'sortsize2': '/product/querySizeListBySortId4Html', //尺码
+    'sortsize3':'/product/querySizeListBySkn',//尺码
     'sortbybrand': '/ShopsRest/queryShopsByBrandId',
     'sortbybrand': '/ShopsRest/queryShopsByBrandId',
     'getjitSup': '/AgreementRest/getJitSupplierByBrandId',
     'getjitSup': '/AgreementRest/getJitSupplierByBrandId',
     // 'getsort':'/goods/query/querySortBySmallSort',
     // 'getsort':'/goods/query/querySortBySmallSort',
@@ -60,7 +61,7 @@ var urlObj = {
     'queryProdSizeListForSel':"/productSize/queryProdSizeListForSel"
     'queryProdSizeListForSel':"/productSize/queryProdSizeListForSel"
 };
 };
 
 
-var minimumResultsForSearch = ["sortbybrand", "getjitSup", "sortsize2", "querySupplier"];
+var minimumResultsForSearch = ["sortbybrand", "getjitSup", "sortsize2", "querySupplier","sortsize3"];
 
 
 var dropDown = function(option) {
 var dropDown = function(option) {
     new dropDown.prototype.init(option);
     new dropDown.prototype.init(option);

@@ -66,6 +66,7 @@ var g = new common.grid({
 
 
             }
             }
         },
         },
+        {display: "操作人", name: "updateUserName"},
         {
         {
             display: "操作", name: "", render: function (item1) {
             display: "操作", name: "", render: function (item1) {
             var arr = [];
             var arr = [];

@@ -78,23 +78,13 @@ var getAllInfo = function (item, callback) {
         callback(modelLists);
         callback(modelLists);
         var e = new common.edit("#baseInfo");
         var e = new common.edit("#baseInfo");
         e.init();
         e.init();
-        var sortId;
-        if (item.smallSortId && item.smallSortId > 1) {
-            sortId = item.smallSortId;
-        } else {
-            if (item.middleSortId || item.middleSortId > 1) {
-                sortId = item.middleSortId;
-            }
-            else {
-                sortId = item.maxSortId;
-            }
-        }
+        var skn= item.productSkn;
         new common.dropDown({
         new common.dropDown({
             el: '.fit_size',
             el: '.fit_size',
-            ajax: 'sortsize2',
+            ajax: 'sortsize3',
             params: function () {
             params: function () {
                 return {
                 return {
-                    "sortId": sortId
+                    "productSkn": skn
                 };
                 };
             }
             }
         });
         });