Merge branch 'test5.3' into gray

@@ -290,7 +290,8 @@ module.exports={
                 {name: "productSkn",type: "number"},
                 {name: "sizeInfoList",type: "string"},
                 {name: "productSizeReferList",type: "string"},
-                {name: "noMeasureIds",type: "string"}
+                {name: "noMeasureIds",type: "string"},
+                {name: "sizeImgFlag",type: "Number"}
             ]
         },
         queryAllBySortId4Html:{

@@ -59,9 +59,13 @@ var toast = function (url, item, noHead, gridList) {
     var content = "";
     if (noHead) {
         content = '<div id="nidaye"><input type="hidden" id="noMeasureIds" for="checkbox">'
+            +'<input type="hidden" id="sizeImgFlag" for="checkbox">'
+            +'<label style="cursor: pointer;"><input type="checkbox" name="sizeImgFlag" value="1">隐藏测量方式图</label>'
             + '<div id="faGrid" style="height: 600px;overflow:auto;"></div></div>';
     } else {
         content = '<div id="nidaye"><input type="hidden" id="noMeasureIds" for="checkbox">'
+            +'<input type="hidden" id="sizeImgFlag" for="checkbox">'
+            +'<label style="cursor: pointer;"><input type="checkbox" name="sizeImgFlag" value="1">隐藏测量方式图</label>'
             + util.__template2($("#modifySize-template").html(), item)
             + '<div id="faGrid" style="height: 600px;overflow:auto;"></div></div>';
     }
@@ -74,6 +78,7 @@ var toast = function (url, item, noHead, gridList) {
             css: 'btn-info',
             callback: function () {
                 var noMeasureIds = JSON.stringify($("#noMeasureIds").val() ? $("#noMeasureIds").val().split("|") : []);//无需测量的列
+                var sizeImgFlag= $("#sizeImgFlag").val()? $("#sizeImgFlag").val():0;
                 //尺码信息列表
                 var sizeInfoList = [];
                 for (var i = 0; i < $(".sizeInfo").length; i++) {
@@ -101,6 +106,7 @@ var toast = function (url, item, noHead, gridList) {
                 var data = {
                     productSkn: item.productSkn,
                     noMeasureIds: noMeasureIds,
+                    sizeImgFlag:sizeImgFlag,
                     sizeInfoList: JSON.stringify(sizeInfoList),
                     productSizeReferList: JSON.stringify(productSizeReferList)
                 };
@@ -182,7 +188,7 @@ var check = function () {
  */
 var rendNoMeasureIds=function (data) {
     var noMeasureIds=data.noMeasureIds||[];
-    // console.log(noMeasureIds);
+    var sizeImgFlag=data.sizeImgFlag||0;
     $("input[name='noMeasureIds']").each(function () {
         var val=$(this).val();
         var _index = $(this).data("index");
@@ -194,6 +200,9 @@ var rendNoMeasureIds=function (data) {
             });
         }
     });
+    if(sizeImgFlag==1){
+        $("[name='sizeImgFlag']").attr("checked",'true');//
+    }
 };
 
 module.exports = {