Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/webapp/js/alarm/mall2orderingearlywarningreminds.js

@@ -21,7 +21,7 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
+        // multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

kmall-admin/src/main/webapp/js/alarm/mall2reminderrulesconfig.js

@@ -45,10 +45,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+		beforeSelectRow: function(rowid, e){
+			jQuery("#jqGrid").jqGrid('resetSelection');
+			return(true);
+		},
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+	var myGrid = $("#jqGrid");
+	$("#cb_"+myGrid[0].id).hide();
 });
 
 let vm = new Vue({

kmall-admin/src/main/webapp/js/alarm/mall2shippingreminderalarm.js

@@ -29,7 +29,7 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
-        multiselect: true,
+        // multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",

kmall-admin/src/main/webapp/js/cashier/cashierManager.js

@@ -34,10 +34,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
 });
 
 let vm = new Vue({

kmall-admin/src/main/webapp/js/mk/mk2memberbirthday.js

@@ -54,10 +54,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
 });
 
 let vm = new Vue({

kmall-admin/src/main/webapp/js/sale/goodsPanorama.js

@@ -89,10 +89,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
     $('#goodsDesc').editable({
         inlineMode: false,
         alwaysBlank: true,

kmall-admin/src/main/webapp/js/shop/cart.js

@@ -46,10 +46,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
 });
 
 var vm = new Vue({
@@ -137,4 +143,4 @@ var vm = new Vue({
             }).trigger("reloadGrid");
         }
     }
-});
+});

kmall-admin/src/main/webapp/js/shop/collect.js

@@ -33,10 +33,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
 });
 
 var vm = new Vue({
@@ -124,4 +130,4 @@ var vm = new Vue({
             }).trigger("reloadGrid");
         }
     }
-});
+});

kmall-admin/src/main/webapp/js/shop/footprint.js

@@ -30,10 +30,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
 });
 
 var vm = new Vue({
@@ -121,4 +127,4 @@ var vm = new Vue({
             }).trigger("reloadGrid");
         }
     }
-});
+});

kmall-admin/src/main/webapp/js/shop/searchhistory.js

@@ -2,7 +2,7 @@ $(function () {
     $("#jqGrid").jqGrid({
         url: '../searchhistory/list',
         datatype: "json",
-        colModel: [			
+        colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '关键字', name: 'keyword', index: 'keyword', width: 500 },
 			// {label: '搜索来源', name: 'from', index: 'from', width: 80 },
@@ -12,8 +12,8 @@ $(function () {
         height: 550,
         rowNum: 10,
         rowList: [10, 30, 50],
-        rownumbers: true, 
-        rownumWidth: 25, 
+        rownumbers: true,
+        rownumWidth: 25,
         autowidth:true,
         shrinkToFit: false,
         autoScroll: true,   //开启水平滚动条
@@ -31,10 +31,16 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+		beforeSelectRow: function(rowid, e){
+			jQuery("#jqGrid").jqGrid('resetSelection');
+			return(true);
+		},
         gridComplete: function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+	var myGrid = $("#jqGrid");
+	$("#cb_"+myGrid[0].id).hide();
 });
 
 var vm = new Vue({
@@ -63,7 +69,7 @@ var vm = new Vue({
 			}
 			vm.showList = false;
             vm.title = "修改";
-            
+
             vm.getInfo(id)
 		},
 		saveOrUpdate: function (event) {
@@ -89,7 +95,7 @@ var vm = new Vue({
 			if(ids == null){
 				return ;
 			}
-			
+
 			confirm('确定要删除选中的记录？', function(){
 				$.ajax({
 					type: "POST",
@@ -122,4 +128,4 @@ var vm = new Vue({
             }).trigger("reloadGrid");
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/shop/userlevel.js

@@ -26,11 +26,18 @@ $(function () {
             rows: "limit",
             order: "order"
         },
+        beforeSelectRow: function(rowid, e){
+            jQuery("#jqGrid").jqGrid('resetSelection');
+            return(true);
+        },
         gridComplete: function () {
             //隐藏grid底部滚动条
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+    var myGrid = $("#jqGrid");
+    $("#cb_"+myGrid[0].id).hide();
+
 });
 
 var vm = new Vue({
@@ -135,4 +142,4 @@ var vm = new Vue({
             handleResetForm(this, name);
         }
     }
-});
+});