调整了分销平台、商品管理、营销平台、系统管理的表单数据显示样式，以及添加了水平滚动条

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

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'menuStoreRealId', name: 'menuStoreRealId', index: 'menuStoreRealId', key: true, hidden: true},
-			{label: '菜单名称', name: 'menuName', index: 'menu_name', width: 80, align: 'center'},
-			{label: '菜单描述', name: 'menuDetail', index: 'menu_detail', width: 80, align: 'center'},
-			{label: '菜单图片链接', name: 'picUrl', index: 'pic_url', width: 80, align: 'center'},
-			{label: '菜单跳转url', name: 'menuUrl', index: 'menu_url', width: 80, align: 'center'},
-            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 80, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
+			{label: '菜单名称', name: 'menuName', index: 'menu_name', width: 180, align: 'center'},
+			{label: '菜单描述', name: 'menuDetail', index: 'menu_detail', width: 280, align: 'center'},
+			{label: '菜单图片链接', name: 'picUrl', index: 'pic_url', width: 600, align: 'center'},
+			{label: '菜单跳转url', name: 'menuUrl', index: 'menu_url', width: 380, align: 'center'},
+            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 180, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
 			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
@@ -19,19 +19,19 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '备注', name: 'note', index: 'note', width: 60, align: 'center'},
-            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 70, align: 'center'},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 110, align: 'center',
+            {label: '备注', name: 'note', index: 'note', width: 160, align: 'center'},
+            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 170, align: 'center'},
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
-            {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 70, align: 'center'},
-            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 110, align: 'center',
+            {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 170, align: 'center'},
+            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
             {
-                label: '操作', width: 160, align: 'center', sortable: false, formatter: function (value, col, row) {
+                label: '操作', width: 260, align: 'center', sortable: false, formatter: function (value, col, row) {
                 let htmlStr = "";
                     htmlStr = "<button class='btn btn-outline btn-primary' " +
                         "onclick='vm.updateMenuStoreReal(" + row.menuStoreRealId + ")'><i class='fa fa-qrcode'></i>修改门店营销菜单</button>"
@@ -48,6 +48,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -62,7 +65,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'distId', name: 'distId', index: 'dist_id', key: true, hidden: true},
-			{label: '分销商名称', name: 'distName', index: 'dist_name', width: 80},
-			{label: '分销商英文名', name: 'distEname', index: 'dist_ename', width: 80},
-			{label: '分销商标识', name: 'distFlag', index: 'dist_flag', width: 80},
-			{label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 80},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80},
-			{label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 80},
+			{label: '分销商名称', name: 'distName', index: 'dist_name', width: 280},
+			{label: '分销商英文名', name: 'distEname', index: 'dist_ename', width: 180},
+			{label: '分销商标识', name: 'distFlag', index: 'dist_flag', width: 180},
+			{label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 180},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 280},
+			{label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 180},
 			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 80},
             {label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
@@ -20,14 +20,14 @@ $(function () {
                     }
                     return '';
                 }},
-			{label: '备注', name: 'note', index: 'note', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80,
+			{label: '备注', name: 'note', index: 'note', width: 180},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 120},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 160,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 80,
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 120},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 160,
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }}],
@@ -38,6 +38,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -52,7 +55,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,7 +4,7 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'distChnlId', name: 'distChnlId', index: 'dist_chnl_id', key: true, hidden: true},
-			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 80},
+			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 280},
 			// {label: '所属分类', name: 'partType', index: 'part_type', width: 80,
              //    formatter: function (value) {
              //        if (value == '00') {
@@ -16,10 +16,10 @@ $(function () {
              //        }
              //        return '';
              //    }},
-            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 80},
-            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 80},
-			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 80},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80,
+            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 180},
+            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 180},
+			{label: '排序', name: 'sortOrder', index: 'sort_order',align: 'center', width: 80},
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80,align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -28,14 +28,14 @@ $(function () {
                     }
                     return '';
                 }},
-			{label: '备注', name: 'note', index: 'note', width: 80},
-            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 80,
+			{label: '备注', name: 'note', index: 'note', width: 180},
+            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 120},
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 160,align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
-            {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 80,
+            {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 120},
+            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 160,align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }}],
@@ -46,6 +46,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -60,7 +63,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,13 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'sellAllocId', name: 'sellAllocId', index: 'sell_alloc_id', key: true, hidden: true},
-			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 80},
-            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 80},
-            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 80},
-			{label: '商品所属分销商', name: 'distName', index: 'distName', width: 80},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80},
-			{label: '商品', name: 'goodsName', index: 'goodsName', width: 80},
-			{label: '分配方式', name: 'allocType', index: 'alloc_type', width: 80,
+			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 280},
+            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 180},
+            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 180},
+			{label: '商品所属分销商', name: 'distName', index: 'distName', width: 180},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180},
+			{label: '商品', name: 'goodsName', index: 'goodsName', width: 280},
+			{label: '分配方式', name: 'allocType', index: 'alloc_type', width: 80,align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '比例';
@@ -19,9 +19,9 @@ $(function () {
                     }
                     return '';
                 }},
-			{label: '子级分销商id规则', name: 'expendDistIds', index: 'expend_dist_ids', width: 120},
-			{label: '子级分销额度分配（点数/金额）', name: 'expendDistLines', index: 'expend_dist_lines', width: 120},
-            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 60,
+			{label: '子级分销商id规则', name: 'expendDistIds', index: 'expend_dist_ids', width: 160},
+			{label: '子级分销额度分配（点数/金额）', name: 'expendDistLines', index: 'expend_dist_lines', width: 220},
+            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 80,align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -30,14 +30,14 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '备注', name: 'note', index: 'note', width: 60},
-            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 70},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 110,
+            {label: '备注', name: 'note', index: 'note', width: 160},
+            {label: '创建人编号', name: 'createrSn', index: 'creater_sn', align: 'center',width: 120},
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 160,align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
-            {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 70},
-            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 110,
+            {label: '修改人编号', name: 'moderSn', index: 'moder_sn',  align: 'center',width: 120},
+            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 160,align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }}],
@@ -48,6 +48,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -62,7 +65,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,13 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 80, align: 'center'},
-            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 70, align: 'center'},
-            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 70, align: 'center'},
-            {label: '商品', name: 'goodsName', index: 'goodsName', width: 80, align: 'center'},
-            {label: '商品所属分销商', name: 'goodsDistName', index: 'distName', width: 70, align: 'center'},
-			{label: '商品价格', name: 'goodsPrice', index: 'goods_price', width: 50, align: 'center'},
-			{label: '分配方式', name: 'allocType', index: 'alloc_type', width: 50, align: 'center',
+			{label: '分销渠道名称', name: 'distFlag', index: 'dist_flag', width: 180},
+            {label: '所属三方商户', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 170, align: 'center'},
+            {label: '所属供应商', name: 'childSupplierName', index: 'childSupplierName', width: 170, align: 'center'},
+            {label: '商品', name: 'goodsName', index: 'goodsName', width: 180, align: 'center'},
+            {label: '商品所属分销商', name: 'goodsDistName', index: 'distName', width: 170, align: 'center'},
+			{label: '商品价格', name: 'goodsPrice', index: 'goods_price', width: 150, align: 'right'},
+			{label: '分配方式', name: 'allocType', index: 'alloc_type', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '比例';
@@ -19,11 +19,11 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '子级分销商id规则', name: 'expendDistIds', index: 'expendDistIds', width: 80, align: 'center'},
-            {label: '子级分销额度分配规则', name: 'expendDistLines', index: 'expendDistLines', width: 80, align: 'center'},
-			{label: '子级分销商', name: 'expendDistName', index: 'expend_dist_id', width: 80, align: 'center'},
-			{label: '子级分销商额度【点数/金额】', name: 'expendDistPrice', index: 'expend_dist_price', width: 100, align: 'center'},
-			{label: '子级分销商等级', name: 'expendDistLevel', index: 'expend_dist_level', width: 70, align: 'center',
+            {label: '子级分销商id规则', name: 'expendDistIds', index: 'expendDistIds', width: 180},
+            {label: '子级分销额度分配规则', name: 'expendDistLines', index: 'expendDistLines', width: 180},
+			{label: '子级分销商', name: 'expendDistName', index: 'expend_dist_id', width: 180},
+			{label: '子级分销商额度【点数/金额】', name: 'expendDistPrice', index: 'expend_dist_price', width: 220},
+			{label: '子级分销商等级', name: 'expendDistLevel', index: 'expend_dist_level', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '1') {
                         return '一级';
@@ -34,10 +34,10 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '订单编号', name: 'orderSn', index: 'orderSn', width: 100, align: 'center'},
+            {label: '订单编号', name: 'orderSn', index: 'orderSn', width: 180},
             // {label: '订单用户', name: 'userName', index: 'userName', width: 70},
 			// {label: '来源', name: 'expendSource', index: 'expend_source', width: 80},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 60, align: 'center',
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -47,11 +47,11 @@ $(function () {
                     return '';
                 }},
             // {label: '备注', name: 'note', index: 'note', width: 60},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 110, align: 'center',
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }},
-            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 110, align: 'center',
+            {label: '修改时间', name: 'modTime', index: 'mod_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }}],
@@ -62,6 +62,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -76,7 +79,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -28,7 +28,7 @@ $(function () {
                         '<span class="label label-success">正常</span>';
                 }
             },
-            {label: '操作', width: 90, align: 'center', sortable: false,
+            {label: '操作', width: 180, align: 'center', sortable: false,
                 formatter: function (value, col, row) {
                     if(hasPermission('ad:saveCopyAd')) {
                         return "&nbsp;&nbsp;&nbsp;&nbsp;<button class='btn btn-primary' " +

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

@@ -34,7 +34,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '商户编号', name: 'merchSn', index: 'merchSn', width: 80},
-            {label: '门店名称', name: 'storeName', index: 'storeName', width: 80},
-            {label: '问题', name: 'question', index: 'question', width: 80},
-            {label: '回答', name: 'answer', index: 'answer', width: 250}],
+            {label: '商户编号', name: 'merchSn', index: 'merchSn', width: 180},
+            {label: '门店名称', name: 'storeName', index: 'storeName', width: 280},
+            {label: '问题', name: 'question', index: 'question', width: 380},
+            {label: '回答', name: 'answer', index: 'answer', width: 380}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -15,6 +15,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -29,7 +32,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,8 +4,8 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '问题分类', name: 'typeName', index: 'type_name', width: 80},
-			{label: '排序', name: 'sort', index: 'sort', width: 80}],
+			{label: '问题分类', name: 'typeName', index: 'type_name', width: 480},
+			{label: '排序', name: 'sort', index: 'sort', width: 480}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -13,6 +13,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -27,7 +30,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -8,18 +8,18 @@ $(function () {
         url: url,
         datatype: "json",
         colModel: [
-            {label: 'id', name: 'id', index: 'id', key: true, width: 20},
-            {label: '商品', name: 'goodsName', index: 'goods_id', width: 120},
+            {label: 'id', name: 'id', index: 'id', key: true, width: 120},
+            {label: '商品', name: 'goodsName', index: 'goods_id', width: 380},
             {
                 label: '商品规格',
                 name: 'goodsSpecificationNameValue',
                 index: 'goods_specification_ids',
-                width: 100,
+                width: 160,
                 formatter: function (value, options, row) {
                     return value.replace(row.goodsName + " ", '');
                 }
             },
-            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 80},
+            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 180},
             // {label: '商品库存', name: 'goodsNumber', index: 'goods_number', width: 80},
             // {label: '零售价格(元)', name: 'retailPrice', index: 'retail_price', width: 80},
             // {label: '市场价格(元)', name: 'marketPrice', index: 'market_price', width: 80}
@@ -31,6 +31,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -45,7 +48,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

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

@@ -4,14 +4,14 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'sn', name: 'sn', index: 'sn', key: true, hidden: true},
-			{label: '代码', name: 'code', index: 'code', width: 80},
-			{label: '名称', name: 'name', index: 'name', width: 80},
+			{label: '代码', name: 'code', index: 'code', width: 180},
+			{label: '名称', name: 'name', index: 'name', width: 280},
             {
                 label: '是否有效',
                 name: 'isValid',
                 align: 'center',
                 index: 'is_valid',
-                width: '50px',
+                width: '100px',
                 formatter: function (value) {
                     if(value == 0){
                         value = 1;
@@ -21,7 +21,7 @@ $(function () {
                     return transIsNot(value);
                 }
             },
-            {label: '备注', name: 'remark', index: 'remark', width: 80}],
+            {label: '备注', name: 'remark', index: 'remark', width: 280}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -29,6 +29,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -43,7 +46,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/config.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'ID', name: 'id', key: true, hidden: true},
-            {label: '参数名', name: 'key', width: 60},
-            {label: '参数值', name: 'value', width: 100},
-            {label: '是否启用', name: 'status', width: 100,
+            {label: '参数名', name: 'key', width: 260},
+            {label: '参数值', name: 'value', width: 500},
+            {label: '是否启用', name: 'status', align: 'center',width: 100,
                 formatter: function (value) {
                     if (value == '1') {
                         return '启用';
@@ -15,7 +15,7 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '备注', name: 'remark', width: 80}
+            {label: '备注', name: 'remark', width: 380}
         ],
         viewrecords: true,
         height: 550,
@@ -24,6 +24,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -38,8 +41,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            //隐藏grid底部滚动条
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/log.js

@@ -4,13 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', key: true, hidden: true},
-            {label: '用户名', name: 'username', width: 50},
-            {label: '用户操作', name: 'operation', width: 70},
-            {label: '请求方法', name: 'method', width: 150},
-            {label: '请求参数', name: 'params', width: 80},
-            {label: 'IP地址', name: 'ip', width: 70},
+            {label: '用户名', name: 'username', width: 150},
+            {label: '用户操作', name: 'operation', width: 110},
+            {label: '请求方法', name: 'method', width: 450},
+            {label: '请求参数', name: 'params', width: 280},
+            {label: 'IP地址', name: 'ip', width: 130},
             {
-                label: '创建时间', name: 'createDate', width: 90, formatter: function (value) {
+                label: '创建时间', name: 'createDate', width: 160, align: 'center',formatter: function (value) {
                 return transDate(value);
             }
             }
@@ -22,6 +22,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: false,
         pager: "#jqGridPager",
         jsonReader: {
@@ -36,8 +39,8 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            //隐藏grid底部滚动条
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            //显示grid底部滚动条
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/notice.js

@@ -4,13 +4,14 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '通知内容', name: 'context', index: 'context', width: 280},
-            {label: '通知标题', name: 'title', index: 'title', width: 150},
+            {label: '通知内容', name: 'context', index: 'context', width: 380},
+            {label: '通知标题', name: 'title', index: 'title', width: 300},
             {
                 label: '通知来源',
                 name: 'soucre',
                 index: 'soucre',
-                width: 80,
+                width: 120,
+                align: 'center',
                 formatter: function (value) {
                     if (value == 1) {
                         return '普通通知';
@@ -22,7 +23,7 @@ $(function () {
                 }
             },
             {
-                label: '通知状态', name: 'status', index: 'status', width: 80,
+                label: '通知状态', name: 'status', index: 'status', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == 0) {
                         return '已发布';
@@ -34,7 +35,7 @@ $(function () {
                 }
             },
             {
-                label: '是否紧急', name: 'isUrgent', index: 'is_urgent', width: 80,
+                label: '是否紧急', name: 'isUrgent', index: 'is_urgent', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == 1) {
                         return '否';
@@ -46,23 +47,23 @@ $(function () {
                 }
             },
             {
-                label: '发布时间', name: 'releaseTimee', index: 'release_timee', width: 80, formatter: function (value) {
+                label: '发布时间', name: 'releaseTimee', index: 'release_timee', width: 160,  align: 'center',formatter: function (value) {
                 return transDate(value);
             }
             },
             {
-                label: '创建时间', name: 'createTime', index: 'create_time', width: 80, formatter: function (value) {
+                label: '创建时间', name: 'createTime', index: 'create_time', width: 160, align: 'center', formatter: function (value) {
                 return transDate(value);
             }
             },
             {
-                label: '修改时间', name: 'updateTime', index: 'update_time', width: 80, formatter: function (value) {
+                label: '修改时间', name: 'updateTime', index: 'update_time', width: 160,  align: 'center',formatter: function (value) {
                 return transDate(value);
             }
             },
-            {label: '创建人', name: 'createId', index: 'create_id', width: 80},
-            {label: '修改人', name: 'updateId', index: 'update_id', width: 80},
-            {label: '备注', name: 'remark', index: 'remark', width: 80}],
+            {label: '创建人', name: 'createId', index: 'create_id', align: 'center', width: 120},
+            {label: '修改人', name: 'updateId', index: 'update_id', align: 'center', width: 120},
+            {label: '备注', name: 'remark', index: 'remark', width: 180}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -70,6 +71,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -84,7 +88,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/noticeuser.js

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '用户id', name: 'userName', index: 'user_id', width: 80},
-            {label: '通知', name: 'noticeContent', index: 'notice_id', width: 80},
+            {label: '用户id', name: 'userName', index: 'user_id', width: 180},
+            {label: '通知', name: 'noticeContent', index: 'notice_id', width: 380},
             {
-                label: '状态', name: 'status', index: 'status', width: 80,
+                label: '状态', name: 'status', index: 'status', width: 100,align: 'center',
                 formatter: function (value) {
                     if (value == 1) {
                         return '未读';
@@ -18,7 +18,7 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '备注', name: 'remark', index: 'remark', width: 80}],
+            {label: '备注', name: 'remark', index: 'remark', width: 280}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -26,6 +26,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -40,7 +43,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/oss.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', key: true, hidden: true},
-            {label: 'URL地址', name: 'url', width: 160},
+            {label: 'URL地址', name: 'url', width: 660},
             {
-                label: '创建时间', name: 'createDate', width: 40, formatter: function (value) {
+                label: '创建时间', name: 'createDate', width: 160,align: 'center', formatter: function (value) {
                 return transDate(value);
             }
             }
@@ -18,6 +18,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -32,8 +35,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            //隐藏grid底部滚动条
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 

kmall-admin/src/main/webapp/js/sys/printer.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '打印机名称', name: 'name', index: 'name', width: 80},
-            {label: '打印机编号', name: 'sn', index: 'sn', width: 80},
-            {label: '所属门店', name: 'storeName', index: 'store_name', width: 80}],
+            {label: '打印机名称', name: 'name', index: 'name', width: 380},
+            {label: '打印机编号', name: 'sn', index: 'sn', width: 380},
+            {label: '所属门店', name: 'storeName', index: 'store_name', width: 380}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -14,6 +14,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -28,7 +31,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/role.js

@@ -3,12 +3,12 @@ $(function () {
         url: '../sys/role/list',
         datatype: "json",
         colModel: [
-            {label: '角色ID', name: 'roleId', index: "role_id", key: true, width: 20},
-            {label: '角色名称', name: 'roleName', index: "role_name", width: 75},
+            {label: '角色ID', name: 'roleId', index: "role_id", key: true, width: 80},
+            {label: '角色名称', name: 'roleName', index: "role_name", width: 275},
             // {label: '所属部门', name: 'deptName', width: 75},
-            {label: '备注', name: 'remark', width: 100},
+            {label: '备注', name: 'remark', width: 275},
             {
-                label: '创建时间', name: 'createTime', index: "create_time", width: 80, formatter: function (value) {
+                label: '创建时间', name: 'createTime', index: "create_time",align: 'center', width: 160, formatter: function (value) {
                 return transDate(value);
             }
             }
@@ -20,6 +20,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -34,8 +37,8 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            //隐藏grid底部滚动条
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            //显示grid底部滚动条
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/smslog.js

@@ -4,18 +4,18 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '发送人', name: 'userName', index: 'user_name', width: 80},
-            {label: '发送编号', name: 'sendId', index: 'send_id', width: 60},
-            {label: '发送内容', name: 'content', index: 'content', width: 250},
-            {label: '手机号', name: 'mobile', index: 'mobile', width: 50},
+            {label: '发送人', name: 'userName', index: 'user_name', width: 100},
+            {label: '发送编号', name: 'sendId', index: 'send_id', width: 160},
+            {label: '发送内容', name: 'content', index: 'content', width: 540},
+            {label: '手机号', name: 'mobile', index: 'mobile',align: 'center', width: 110},
             {
-                label: '发送时间', name: 'stime', index: 'stime', width: 60, formatter: function (value) {
+                label: '发送时间', name: 'stime', index: 'stime', width: 160,align: 'center', formatter: function (value) {
                 return transDate(value, 'yyyy-MM-dd hh:mm:ss');
             }
             },
             // {label: '用户签名', name: 'sign', index: 'sign', width: 80},
             {
-                label: '发送状态', name: 'sendStatus', index: 'send_status', width: 30, formatter: function (value) {
+                label: '发送状态', name: 'sendStatus', index: 'send_status', width: 110,align: 'center', formatter: function (value) {
                 if (value === 1) {
                     return '<span class="label label-success">成功</span>';
                 }
@@ -25,7 +25,7 @@ $(function () {
             // {label: '无效号码数', name: 'invalidNum', index: 'invalid_num', width: 80},
             // {label: '成功提交数', name: 'successNum', index: 'success_num', width: 80},
             // {label: '黑名单数', name: 'blackNum', index: 'black_num', width: 80},
-            {label: '返回消息', name: 'returnMsg', index: 'return_msg', width: 60}],
+            {label: '返回消息', name: 'returnMsg', index: 'return_msg', width: 260}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -33,6 +33,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -47,7 +50,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/thirdmerchswitch.js

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'thirdMerchSn', name: 'thirdMerchSn', index: 'third_merch_sn', key: true, hidden: true},
-            {label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80, align: 'center'},
-			{label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'third_party_merch_code', width: 80, align: 'center'},
-			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_party_merch_name', width: 80, align: 'center'},
-            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 80, align: 'center',
+            {label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 220, align: 'center'},
+			{label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'third_party_merch_code', width: 180, align: 'center'},
+			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_party_merch_name', width: 180, align: 'center'},
+            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '禁用';
@@ -25,7 +25,7 @@ $(function () {
             //         }
             //         return '';
             //     }},
-            {label: '商户地图是否显示', name: 'isMapShow', index: 'isMapShow', width: 80, align: 'center',
+            {label: '商户地图是否显示', name: 'isMapShow', index: 'isMapShow', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '禁用';
@@ -34,7 +34,7 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '渠道分销是否启用', name: 'isDistSellStart', index: 'isDistSellStart', width: 80, align: 'center',
+            {label: '渠道分销是否启用', name: 'isDistSellStart', index: 'isDistSellStart', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '禁用';
@@ -43,7 +43,7 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '供应商模式商品是否启用', name: 'isSupplierGoods', index: 'isSupplierGoods', width: 80, align: 'center',
+            {label: '供应商模式商品是否启用', name: 'isSupplierGoods', index: 'isSupplierGoods', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '禁用';
@@ -52,7 +52,7 @@ $(function () {
                     }
                     return '';
                 }},
-            {label: '是否使用人脸核验', name: 'isFaceCheck', index: 'isFaceCheck', width: 80, align: 'center',
+            {label: '是否使用人脸核验', name: 'isFaceCheck', index: 'isFaceCheck', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '禁用';
@@ -61,7 +61,7 @@ $(function () {
                     }
                     return '';
                 }},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -77,6 +77,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -91,7 +94,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/js/sys/user.js

@@ -3,9 +3,9 @@ $(function () {
         url: '../sys/user/list',
         datatype: "json",
         colModel: [
-            {label: '用户ID', name: 'userId', index: "user_id", key: true, width: 20},
-            {label: '用户名', name: 'username', width: 75},
-            {label: '所属商户', name: 'merchName', width: 75,
+            {label: '用户ID', name: 'userId', index: "user_id", key: true, width: 120},
+            {label: '用户名', name: 'username', width: 180},
+            {label: '所属商户', name: 'merchName', width: 180,
                 formatter: function (value) {
                     if (value == '' || value == null) {
                         return '-';
@@ -14,7 +14,7 @@ $(function () {
                     }
                 }
             },
-            {label: '所属第三方商户', name: 'thirdPartyMerchCode', width: 75,
+            {label: '所属第三方商户', name: 'thirdPartyMerchCode', width: 175,
                 formatter: function (value) {
                     if (value == '' || value == null) {
                         return '-';
@@ -23,7 +23,7 @@ $(function () {
                     }
                 }
             },
-            {label: '所属门店', name: 'storeName', width: 75,
+            {label: '所属门店', name: 'storeName', width: 175,
                 formatter: function (value) {
                     if (value == '' || value == null) {
                         return '-';
@@ -32,8 +32,8 @@ $(function () {
                     }
                 }
             },
-            {label: '所属角色', name: 'roleName', width: 75},
-            {label: '角色类型', name: 'roleType', width: 75,
+            {label: '所属角色', name: 'roleName', width: 175},
+            {label: '角色类型', name: 'roleType', width: 125,
                 formatter: function (value) {
                     if (value == '1') {
                         return '操作员';
@@ -48,17 +48,17 @@ $(function () {
                     }
                 }
             },
-            {label: '邮箱', name: 'email', width: 90},
-            {label: '手机号', name: 'mobile', width: 100},
+            {label: '邮箱', name: 'email', width: 190},
+            {label: '手机号', name: 'mobile', align: 'center',width: 120},
             {
-                label: '状态', name: 'status', width: 80, formatter: function (value) {
+                label: '状态', name: 'status', align: 'center',width: 100, formatter: function (value) {
                 return value === 0 ?
                     '<span class="label label-danger">禁用</span>' :
                     '<span class="label label-success">正常</span>';
             }
             },
             {
-                label: '创建时间', name: 'createTime', index: "create_time", width: 80, formatter: function (value) {
+                label: '创建时间', name: 'createTime', index: "create_time",align: 'center', width: 160, formatter: function (value) {
                 return transDate(value);
             }
             }],
@@ -69,6 +69,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -84,7 +87,7 @@ $(function () {
         },
         gridComplete: function () {
             //隐藏grid底部滚动条
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });

kmall-admin/src/main/webapp/login.html

@@ -53,11 +53,10 @@
         </div>-->
         <div class="col-md-7" >
             <p style="font-size: 35px;font-family: 微软雅黑;color: #3bc8ff;text-shadow: 2px 2px 5px #000;padding-right: 10px;margin: 45px 0 0;" align="center">
-                <span >现场速递</span>
+                <span >CW大药房</span>
                 <br/>
                 <span style="font-size: 45px">收 银 系 统</span>
                 <br/>
-                <span style="font-size: 23px">0755-8818999</span>
             </p>
             <!--<p style="font-size: 20px;font-family: 微软雅黑;color: #3bc8ff;text-shadow: 2px 2px 5px #000;padding-right: 10px;margin: 30px 0 0;"></p>-->
         </div>