添加了一张logo图片，收银端logo修改为此图片；修改了后端管理界面登录默认商户名；调整了会员管理、商户配置、商城配置、营销平台、数据统计、门店管理的表单数据显示样式，以及添加了水平滚动条

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -32,7 +32,7 @@
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-3 logodiv">
                     <!--center-block-->
-                    <img src="${rc.contextPath}/statics/img/logotest2.jpg" class="img-rounded img-responsive" style="height: 70px;">
+                    <img src="${rc.contextPath}/statics/img/logotest.png" class="img-rounded img-responsive" style="height: 70px;">
                 </div>
                 <div class="col-md-9" style="background-color: #f0f0f0;margin:0px;padding: 0px" >
                     <div v-show="showList">

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

@@ -30,8 +30,11 @@
         <div class="sidebar-collapse">
             <ul class="nav" id="side-menu">
                 <li class="nav-header">
+                    <!--<div class="dropdown profile-element"-->
+                         <!--style="text-align: center;font-size: 18px;font-weight: 600;color: white;">{{user.roleType == 1 ? '中网管理后台':''}}{{user.roleType == 2 ? store.storeName:''}}{{user.roleType == 3 ? user.merchName:''}}{{user.roleType == 4 ? user.thirdPartyMerchCode:''}}-->
+                    <!--</div>-->
                     <div class="dropdown profile-element"
-                         style="text-align: center;font-size: 18px;font-weight: 600;color: white;">{{user.roleType == 1 ? '中网管理后台':''}}{{user.roleType == 2 ? store.storeName:''}}{{user.roleType == 3 ? user.merchName:''}}{{user.roleType == 4 ? user.thirdPartyMerchCode:''}}
+                         style="text-align: center;font-size: 18px;font-weight: 600;color: white;">{{user.roleType == 1 ? '跨境电商收银系统':''}}{{user.roleType == 2 ? store.storeName:''}}{{user.roleType == 3 ? user.merchName:''}}{{user.roleType == 4 ? user.thirdPartyMerchCode:''}}
                     </div>
                     <div class="logo-element">{{user.username}}
                     </div>
@@ -90,7 +93,8 @@
                     data-id="main" seamless></iframe>
         </div>
         <div class="footer">
-            <div class="pull-right">&copy; 2018-2028 <a href="#" target="_blank">中网科技（深圳）有限公司</a>
+            <!--<div class="pull-right">&copy; 2018-2028 <a href="#" target="_blank">中网科技（深圳）有限公司</a>-->
+                <div class="pull-right"><a href="#" target="_blank">跨境电商收银系统</a>
             </div>
         </div>
     </div>

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

@@ -4,16 +4,16 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '活动主题', name: 'title', index: 'title', width: 80},
-			{label: '活动内容', name: 'content', index: 'content', width: 80},
+			{label: '活动主题', name: 'title', index: 'title', width: 180},
+			{label: '活动内容', name: 'content', index: 'content', width: 280},
 			// {label: '活动图片', name: 'itemPicUrl', index: 'item_pic_url', width: 80},
-			{label: '子标题', name: 'subtitle', index: 'subtitle', width: 80},
-			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id', width: 80},
+			{label: '子标题', name: 'subtitle', index: 'subtitle', width: 180},
+			{label: '活动类别名称', name: 'promTypeName', index: 'prom_type_id', width: 180},
 			// {label: '活动价格', name: 'priceInfo', index: 'price_info', width: 80},
 			// {label: '场景图片链接', name: 'scenePicUrl', index: 'scene_pic_url', width: 80},
-			{label: '门店名称', name: 'storeName', index: 'store_id', width: 80},
-			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn', width: 80},
-            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 50, align: 'center',
+			{label: '门店名称', name: 'storeName', index: 'store_id', width: 180},
+			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_merch_sn', width: 180},
+            {label: '是否有效', name: 'isValid', index: 'is_valid', width: 100, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -23,14 +23,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');
                 }}],
@@ -41,6 +41,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -55,7 +58,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

@@ -4,24 +4,24 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-            {label: '广告位置', name: 'adPositionName', index: 'ad_Position_id', width: 80},
-            {label: '广告名称', name: 'name', index: 'name', width: 80},
-            {label: '链接', name: 'link', index: 'link', width: 80},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 140, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180},
+            {label: '广告位置', name: 'adPositionName', index: 'ad_Position_id', width: 180},
+            {label: '广告名称', name: 'name', index: 'name', width: 180},
+            {label: '链接', name: 'link', index: 'link', width: 180},
             {
-                label: '图片', name: 'imageUrl', index: 'image_url', width: 80, formatter: function (value) {
+                label: '图片', name: 'imageUrl', index: 'image_url', width: 120, align: 'center', formatter: function (value) {
                 return transImg(value);
             }
             },
-            {label: '内容', name: 'content', index: 'content', width: 80},
+            {label: '内容', name: 'content', index: 'content', width: 180},
             {
-                label: '结束时间', name: 'endTime', index: 'end_time', width: 80, formatter: function (value) {
+                label: '结束时间', name: 'endTime', index: 'end_time', width: 160, formatter: function (value) {
                 return transDate(value);
             }
             },
-            {label: '排序', name: 'sortOrder', index: 'sortOrder', width: 80},
-            {label: '状态', name: 'enabled', index: 'enabled', width: 80,
+            {label: '排序', name: 'sortOrder', index: 'sortOrder', width: 100, align: 'center'},
+            {label: '状态', name: 'enabled', index: 'enabled', width: 100, align: 'center',
                 formatter: function (value) {
                     return value === 0 ?
                         '<span class="label label-danger">禁用</span>' :
@@ -45,6 +45,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -60,7 +63,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/js/shop/address.js

@@ -9,14 +9,14 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '会员', name: 'shopUserName', index: 'user_id', width: 90},
-            {label: '收货人姓名', name: 'userName', index: 'user_name', width: 80},
-            {label: '手机', name: 'telNumber', index: 'tel_number', width: 80},
-            {label: '收货地址国家码', name: 'nationalCode', index: 'national_Code', width: 80},
-            {label: '省', name: 'provinceName', index: 'province_Name', width: 80},
-            {label: '市', name: 'cityName', index: 'city_Name', width: 80},
-            {label: '区', name: 'countyName', index: 'county_Name', width: 80},
-            {label: '详细收货地址信息', name: 'detailInfo', index: 'detail_Info', width: 150},
+            {label: '会员', name: 'shopUserName', index: 'user_id', width: 240},
+            {label: '收货人姓名', name: 'userName', index: 'user_name', width: 100},
+            {label: '手机', name: 'telNumber', index: 'tel_number', width: 140},
+            {label: '收货地址国家码', name: 'nationalCode', index: 'national_Code', width: 120},
+            {label: '省', name: 'provinceName', index: 'province_Name',align:'center', width: 140},
+            {label: '市', name: 'cityName', index: 'city_Name',align:'center', width: 80},
+            {label: '区', name: 'countyName', index: 'county_Name',align:'center', width: 80},
+            {label: '详细收货地址信息', name: 'detailInfo', index: 'detail_Info', width: 400},
             {label: '邮编', name: 'postalCode', index: 'postal_Code', width: 80}],
         viewrecords: true,
         height: 550,
@@ -25,6 +25,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -40,7 +43,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/js/shop/adposition.js

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '位置名称', name: 'name', index: 'name', width: 80},
-            {label: '宽度', name: 'width', index: 'width', width: 80},
-            {label: '高度', name: 'height', index: 'height', width: 80},
-            {label: '描述', name: 'desc', index: 'desc', width: 80}],
+            {label: '位置名称', name: 'name', index: 'name', width: 300},
+            {label: '宽度', name: 'width', index: 'width', width: 180},
+            {label: '高度', name: 'height', index: 'height', width: 180},
+            {label: '描述', name: 'desc', index: 'desc', width: 480}],
         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: {
@@ -30,7 +33,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/js/shop/attribute.js

@@ -4,13 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-            {label: '所属分类', name: 'categoryName', index: 'attribute_category_id', width: 80},
-            {label: '名称', name: 'name', index: 'name', width: 80},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 120, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+            {label: '所属分类', name: 'categoryName', index: 'attribute_category_id', width: 180},
+            {label: '名称', name: 'name', index: 'name', width: 500},
             // {label: '类型', name: 'inputType', index: 'input_type', width: 80},
             // {label: '值', name: 'value', index: 'value', width: 80},
-            {label: '排序', name: 'sortOrder', index: 'sort_order', width: 80}],
+            {label: '排序', name: 'sortOrder', index: 'sort_order',align: 'center', width: 120}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -18,6 +18,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -33,7 +36,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/js/shop/brand.js

@@ -3,47 +3,47 @@ $(function () {
         url: '../brand/list',
         datatype: "json",
         colModel: [{
-            label: 'id', name: 'id', index: 'id', key: true, width: 60
+            label: 'id', name: 'id', index: 'id', key: true, width: 140,align: 'center'
         },
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-            {label: '所属分类', name: 'categoryName', index: 'categoryName', width: 60, align: 'center'},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 180, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+            {label: '所属分类', name: 'categoryName', index: 'categoryName', width: 180, align: 'center'},
             {
-            label: '品牌名称', name: 'name', index: 'name', width: 80
+            label: '品牌名称', name: 'name', index: 'name', width: 300
         }, {
-            label: '图片', name: 'listPicUrl', index: 'list_pic_url', width: 80, formatter: function (value) {
+            label: '图片', name: 'listPicUrl', index: 'list_pic_url', width: 100, align: 'center', formatter: function (value) {
                 return transImg(value);
             }
         }, {
-            label: '描述', name: 'simpleDesc', index: 'simple_desc', width: 80
+            label: '描述', name: 'simpleDesc', index: 'simple_desc', width: 100
         }, {
-            label: '图片', name: 'picUrl', index: 'pic_url', width: 80, formatter: function (value) {
+            label: '图片', name: 'picUrl', index: 'pic_url', width: 100, align: 'center', formatter: function (value) {
                 return transImg(value);
             }
         }, {
-            label: '排序', name: 'sortOrder', index: 'sort_order', width: 80
+            label: '排序', name: 'sortOrder', index: 'sort_order', width: 100, align: 'center'
         }, {
-            label: '显示', name: 'isShow', index: 'is_show', width: 80, formatter: function (value) {
+            label: '显示', name: 'isShow', index: 'is_show', width: 100, align: 'center', formatter: function (value) {
                 return transIsNot(value)
             }
         }, {
-            label: '展示价格', name: 'floorPrice', index: 'floor_Price', width: 80
+            label: '展示价格', name: 'floorPrice', index: 'floor_Price', width: 100, align: 'right'
         }, {
-            label: 'app显示图片', name: 'appListPicUrl', index: 'app_list_pic_url', width: 80, formatter: function (value) {
+            label: 'app显示图片', name: 'appListPicUrl', index: 'app_list_pic_url', align: 'center', width: 100, formatter: function (value) {
                 return transImg(value);
             }
         }, {
-            label: '新品牌', name: 'isNew', index: 'is_new', width: 80, formatter: function (value) {
+            label: '新品牌', name: 'isNew', index: 'is_new', align: 'center', width: 100, formatter: function (value) {
                 return transIsNot(value)
             }
         }, {
-            label: '新品牌图片', name: 'newPicUrl', index: 'new_pic_url', width: 80, formatter: function (value) {
+            label: '新品牌图片', name: 'newPicUrl', index: 'new_pic_url', align: 'center', width: 100, formatter: function (value) {
                 return transImg(value);
             }
         }, {
-            label: '新品牌排序', name: 'newSortOrder', index: 'new_sort_order', width: 80
+            label: '新品牌排序', name: 'newSortOrder', index: 'new_sort_order', align: 'center', width: 80
         },
-            {label: '操作', width: 90, align: 'center', sortable: false,
+            {label: '操作', width: 150, align: 'center', sortable: false,
                 formatter: function (value, col, row) {
                     if(hasPermission('brand:saveCopyBrand')) {
                         return "&nbsp;&nbsp;&nbsp;&nbsp;<button class='btn btn-primary' " +
@@ -60,6 +60,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -74,7 +77,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/cart.js

@@ -9,16 +9,16 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '会员', name: 'userName', index: 'user_name', width: 20},
+            {label: '会员', name: 'userName', index: 'user_name', width: 180},
             // {label: 'sessionId', name: 'sessionId', index: 'session_id', width: 80 },
-            {label: '商品', name: 'goodsName', index: 'goods_name', width: 100},
-            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 30},
+            {label: '商品', name: 'goodsName', index: 'goods_name', width: 400},
+            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 120},
             // {label: '产品Id', name: 'productId', index: 'product_id', width: 80 },
-            {label: '规格名称', name: 'goodsName', index: 'goods_name', width: 80},
-            {label: '市场价', name: 'marketPrice', index: 'market_price', width: 20},
-            {label: '零售价格', name: 'retailPrice', index: 'retail_price', width: 30},
-            {label: '数量', name: 'number', index: 'number', width: 20},
-            {label: '规格属性', name: 'goodsSpecificationNameValue', index: 'goods_specification_name_value', width: 100}
+            {label: '规格名称', name: 'goodsName', index: 'goods_name', width: 400},
+            {label: '市场价', name: 'marketPrice', index: 'market_price', align:'right',width: 100},
+            {label: '零售价格', name: 'retailPrice', index: 'retail_price',align:'right', width: 100},
+            {label: '数量', name: 'number', index: 'number',align:'right', width: 100},
+            {label: '规格属性', name: 'goodsSpecificationNameValue', index: 'goods_specification_name_value', width: 120}
             // {label: 'product表对应的goods_specifition_ids', name: 'goodsSpecificationIds', index: 'goods_specification_ids', width: 80 },
             // {label: '', name: 'checked', index: 'checked', width: 80 },
             // {label: '商品图片', name: 'listPicUrl', index: 'list_pic_url', width: 80 }
@@ -30,6 +30,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -44,7 +47,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/collect.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '用户', name: 'userName', index: 'user_name', width: 80},
-            {label: '商品', name: 'valueName', index: 'value_name', width: 80},
-            {label: '添加时间', name: 'addTime', index: 'add_time', width: 80}
+            {label: '用户', name: 'userName', index: 'user_name', width: 180},
+            {label: '商品', name: 'valueName', index: 'value_name', width: 670},
+            {label: '添加时间', name: 'addTime', index: 'add_time', align:'center',width: 160}
             // {label: '提醒', name: 'isAttention', index: 'is_attention', width: 80}
             // {label: '类型', name: 'typeId', index: 'type_id', width: 80}
             ],
@@ -17,6 +17,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {

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

@@ -14,8 +14,8 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '商品', name: 'valueName', index: 'value_id', width: 180},
-            {label: '规格', name: 'goodsSpecificationNameValue', index: 'value_id', width: 80},
+            {label: '商品', name: 'valueName', index: 'value_id', width: 400},
+            {label: '规格', name: 'goodsSpecificationNameValue', index: 'value_id', width: 100},
             {label: '评价', name: 'content', index: 'content', width: 180},
             {
                 label: '评论时间', name: 'addTime', index: 'add_time',align:"center", width: 140, formatter: function (value) {

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

@@ -5,7 +5,7 @@ $(function () {
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '导入商品异常数据', name: 'exportExceptionData', index: 'export_exception_data', width: 550},
-			{label: '导入数据类型', name: 'exportDataType', index: 'export_data_type', width: 40,align: 'center',
+			{label: '导入数据类型', name: 'exportDataType', index: 'export_data_type', width: 160,align: 'center',
                 formatter: function (value) {
                     if (value == '1') {
                         return '商品导入';
@@ -16,7 +16,7 @@ $(function () {
                 }},
 			// {label: '用户id', name: 'userId', index: 'user_id', width: 80},
 			// {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 40, align: 'center',formatter: function (value) {
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 160, align: 'center',formatter: function (value) {
                 return transDate(value);
             }},
 			// {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
@@ -37,6 +37,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -51,7 +54,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/feedback.js

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'msgId', name: 'msgId', index: 'msg_id', key: true, hidden: true},
-            {label: '商户编号', name: 'merchSn', index: 'merchSn', width: 60},
-            {label: '门店名称', name: 'storeName', index: 'storeName', width: 80},
-            {label: '会员名称', name: 'userName', index: 'user_name', width: 80},
-            {label: '手机', name: 'mobile', index: 'mobile', width: 100},
+            {label: '商户编号', name: 'merchSn', index: 'merchSn', align: 'center',width: 240},
+            {label: '门店名称', name: 'storeName', index: 'storeName',width: 180},
+            {label: '会员名称', name: 'userName', index: 'user_name', width: 180},
+            {label: '手机', name: 'mobile', index: 'mobile',align: 'center', width: 140},
             {
-                label: '反馈类型', name: 'feedType', index: 'feed_Type', width: 80, formatter: function (value) {
+                label: '反馈类型', name: 'feedType', index: 'feed_Type', width: 120, formatter: function (value) {
                 if (value == 1) {
                     return '商品相关';
                 } else if (value == 2) {
@@ -28,8 +28,8 @@ $(function () {
                 return '';
             }
             },
-            {label: '详细内容', name: 'content', index: 'content', width: 80},
-            {label: '反馈时间', name: 'addTime', index: 'add_time', width: 80,formatter:function (value) {
+            {label: '详细内容', name: 'content', index: 'content', width: 220},
+            {label: '反馈时间', name: 'addTime', index: 'add_time',align: 'center',  width: 160,formatter:function (value) {
                 return transDate(value);
             }}],
         viewrecords: true,
@@ -39,6 +39,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -53,7 +56,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/footprint.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '会员', name: 'userName', index: 'user_name', width: 80},
-            {label: '商品', name: 'goodsName', index: 'goods_name', width: 80},
-            {label: '记录时间', name: 'addTime', index: 'add_time', width: 80}],
+            {label: '会员', name: 'userName', index: 'user_name', width: 180},
+            {label: '商品', name: 'goodsName', index: 'goods_name', width: 670},
+            {label: '记录时间', name: 'addTime', index: 'add_time', align:'center',width: 160}],
         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/shop/freight.js

@@ -3,23 +3,23 @@ $(function () {
         url: '../freight/list',
         datatype: "json",
         colModel: [
-            {label: 'ID', name: 'id', index: 'id', width: 20, key: true},
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-            {label: '模版名称', name: 'name', index: 'name'},
+            {label: 'ID', name: 'id', index: 'id', width: 80, align: 'center', key: true},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 140, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+            {label: '模版名称', name: 'name', width: 180, index: 'name'},
             {
-                label: '模版类型', name: 'templateType', index: 'template_type', width: 100,
+                label: '模版类型', name: 'templateType', index: 'template_type', width: 200,
                 formatter: function (value) {
                     return transTemplateType(value);
                 }
             },
             {
-                label: '计价方式', name: 'pricingManner', index: 'pricing_manner', width: 100,
+                label: '计价方式', name: 'pricingManner', index: 'pricing_manner', width: 180,
                 formatter: function (value) {
                     return transPricingManner(value);
                 }
             },
-            {label: '操作', width: 90, align: 'center', sortable: false,
+            {label: '操作', width: 190, align: 'center', sortable: false,
                 formatter: function (value, col, row) {
                     if(hasPermission('freight:saveCopyFreight')) {
                         return "&nbsp;&nbsp;&nbsp;&nbsp;<button class='btn btn-primary' " +
@@ -36,6 +36,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -50,7 +53,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/goods.js

@@ -10,7 +10,7 @@ $(function () {
             {label: 'SKU', name: 'sku', index: 'sku', width: 180, align: 'center'},
             {label: '产品条码', name: 'prodBarcode', index: 'prod_barcode', width: 160, align: 'center'},
             // {label: '商品类型', name: 'categoryName', index: 'category_id', width: 40, align: 'center'},
-            {label: '名称', name: 'name', index: 'name', width: 260, align: 'left'},
+            {label: '名称', name: 'name', index: 'name', width: 500, align: 'left'},
             {
                 label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 100, align: 'center',
                 formatter: function (value) {

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

@@ -4,28 +4,28 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '商品类型', name: 'categoryName', index: 'category_id', width: 80},
-            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 80, hidden: true},
-            {label: '名称', name: 'name', index: 'name', width: 160},
+            {label: '商品类型', name: 'categoryName', index: 'category_id', width: 180},
+            {label: '商品序列号', name: 'goodsSn', index: 'goods_sn', width: 180, hidden: true},
+            {label: '名称', name: 'name', index: 'name', width: 400},
             // {label: '品牌', name: 'brandName', index: 'brand_id', width: 120},
             // {label: '关键字', name: 'keywords', index: 'keywords', width: 80, hidden: true},
             // {label: '简明介绍', name: 'goodsBrief', index: 'goods_brief', width: 80, hidden: true},
-            {label: '商品描述', name: 'goodsDesc', index: 'goods_desc', width: 80, hidden: true},
+            {label: '商品描述', name: 'goodsDesc', index: 'goods_desc', width: 180, hidden: true},
             {
-                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 50,
+                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 100,align: 'center',
                 formatter: function (value) {
                     return transIsNot(value);
                 }
             },
             {
-                label: '添加时间', name: 'addTime', index: 'add_time', width: 80, formatter: function (value) {
+                label: '添加时间', name: 'addTime', index: 'add_time', align: 'center',width: 160, formatter: function (value) {
                 return transDate(value);
             }
             },
             {label: '删除状态', name: 'isDelete', index: 'is_delete', width: 80, hidden: true},
             // {label: '属性类别', name: 'attributeCategoryName', index: 'attribute_category', width: 80},
             {label: '是否新商品', name: 'isNew', index: 'is_new', width: 80, hidden: true},
-            {label: '商品单位', name: 'goodsUnit', index: 'goods_unit', width: 80},
+            {label: '商品单位', name: 'goodsUnit', index: 'goods_unit', align: 'center',width: 100},
             {label: '商品主图', name: 'primaryPicUrl', index: 'primary_pic_url', width: 80, hidden: true},
             {label: '商品列表图', name: 'listPicUrl', index: 'list_pic_url', width: 80, hidden: true},
             // {label: '零售价格', name: 'retailPrice', index: 'retail_price', width: 80},
@@ -41,7 +41,7 @@ $(function () {
             // }
             // },
             {
-                label: '热销', name: 'isHot', index: 'is_hot', width: 80, formatter: function (value) {
+                label: '热销', name: 'isHot', index: 'is_hot', align: 'center',width: 100, formatter: function (value) {
                 return transIsNot(value);
             }
             }],
@@ -52,6 +52,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -66,7 +69,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/helpissue.js

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '商户编号', name: 'merchSn', index: 'merchSn', width: 60},
-            {label: '门店名称', name: 'storeName', index: 'storeName', width: 80},
-            {label: '问题分类', name: 'typeName', index: 'type_id', width: 60},
-            {label: '问', name: 'question', index: 'question', width: 80},
-            {label: '答', name: 'answer', index: 'answer', width: 280},
-            {label: '排序', name: 'sort', index: 'sort', width: 80}],
+            {label: '商户编号', name: 'merchSn', index: 'merchSn', align: 'center',width: 220},
+            {label: '门店名称', name: 'storeName', index: 'storeName', width: 180},
+            {label: '问题分类', name: 'typeName', index: 'type_id', align: 'center',width: 160},
+            {label: '问', name: 'question', index: 'question', width: 400},
+            {label: '答', name: 'answer', index: 'answer', width: 500},
+            {label: '排序', name: 'sort', index: 'sort',align: 'center', width: 80}],
         viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -17,6 +17,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -31,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/merch.js

@@ -4,21 +4,21 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80},
-			{label: '商户名称', name: 'merchName', index: 'merch_name', width: 80},
-			{label: '商户简称', name: 'merchShortName', index: 'merch_short_name', width: 80},
-			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 80},
+			{label: '商户编号', name: 'merchSn', index: 'merch_sn', align: 'center',width: 220},
+			{label: '商户名称', name: 'merchName', index: 'merch_name', align: 'center',width: 180},
+			{label: '商户简称', name: 'merchShortName', index: 'merch_short_name', width: 100},
+			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 100},
             {
                 label: '显示',
                 name: 'isShow',
                 align: 'center',
                 index: 'is_show',
-                width: '50px',
+                width: '120px',
                 formatter: function (value) {
                     return transIsNot(value);
                 }
             },
-			{label: '备注', name: 'remark', index: 'remark', width: 80}],
+			{label: '备注', name: 'remark', index: 'remark', width: 220}],
 		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/shop/offilineOrderList.js

@@ -130,7 +130,7 @@ $(function () {
             }
         ],
         viewrecords: true,
-        height: 675,
+        height: 575,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,

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

@@ -3,21 +3,27 @@ $(function () {
         {
             datatype : "local",
             height : 600,
-            width: 1700,
+            shrinkToFit: false,
+            autowidth: true,
+            autoScroll: true,   //开启水平滚动条
+            width: 1500,
             rownumbers: true,
             colNames : [ 'ID', '产品条码','门店', 'SKU', '名称', '零售价格','数量','库存', '商品图'],
             colModel : [
                 {name : 'id',index : 'id',width : 60,sorttype : "int",hidden: true, key: true},
-                {name : 'prodBarcode',index : 'prodBarcode',width : 80, align: 'center'},
-                {name : 'storeName',index : 'storeName',width : 90, align: 'center'},
-                {name: 'sku', index: 'sku', width: 80, align: 'center'},
+                {name : 'prodBarcode',index : 'prodBarcode',width : 180, align: 'center'},
+                {name : 'storeName',index : 'storeName',width : 180, align: 'center'},
+                {name: 'sku', index: 'sku', width: 180, align: 'center'},
                 {name: 'goodsName', index: 'name', width: 160, align: 'center'},
-                {name: 'storeRetailPrice', index: 'storeRetailPrice', width: 60, align: 'center'},
-                {name: 'number', index: 'nums', width: 60, align: 'center'},
-                {name: 'stockNum', index: 'stockNum', width: 60, align: 'center'},
-                {name: 'listPicUrl', index: 'listPicUrl', width: 80, align: 'center'}
+                {name: 'storeRetailPrice', index: 'storeRetailPrice', width: 120, align: 'right'},
+                {name: 'number', index: 'nums', width: 100, align: 'center'},
+                {name: 'stockNum', index: 'stockNum', width: 100, align: 'center'},
+                {name: 'listPicUrl', index: 'listPicUrl', width: 100, align: 'center'}
             ],
-            multiselect : true
+            multiselect : true,
+            gridComplete: function () {
+                $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
+            }
      });
     // $("#jqGrid").jqGrid({
     //     url: '../goods/scannInfo',

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

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [			
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '关键字', name: 'keyword', index: 'keyword', width: 80 },
+			{label: '关键字', name: 'keyword', index: 'keyword', width: 500 },
 			// {label: '搜索来源', name: 'from', index: 'from', width: 80 },
-			{label: '搜索时间', name: 'addTime', index: 'add_time', width: 80 },
-			{label: '会员', name: 'userName', index: 'user_name', width: 80 }		],
+			{label: '搜索时间', name: 'addTime', index: 'add_time', width: 160 },
+			{label: '会员', name: 'userName', index: 'user_name', width: 280 }		],
 		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/shopuser.js

@@ -5,37 +5,37 @@ $(function () {
         colModel: [{
             label: 'id', name: 'id', index: 'id', key: true, hidden: true
         }, {
-            label: '会员名称', name: 'username', index: 'username', width: 80
+            label: '会员名称', name: 'username', index: 'username', width: 150
         }, {
             label: '会员密码', name: 'password', index: 'password', hidden: true
         }, {
-            label: '性别', name: 'gender', index: 'gender', width: 40, formatter: function (value) {
+            label: '性别', name: 'gender', index: 'gender',align:'center', width: 80, formatter: function (value) {
                 return transGender(value);
             }
         }, {
-            label: '出生日期', name: 'birthday', index: 'birthday', width: 80, formatter: function (value) {
+            label: '出生日期', name: 'birthday', index: 'birthday',align:'center', width: 140, formatter: function (value) {
                 return transDate(value);
             }
         }, {
-            label: '注册时间', name: 'registerTime', index: 'register_time', width: 80, formatter: function (value) {
+            label: '注册时间', name: 'registerTime', index: 'register_time', align:'center',width: 140, formatter: function (value) {
                 return transDate(value);
             }
         }, {
-            label: '最后登录时间', name: 'lastLoginTime', index: 'last_login_time', width: 80, formatter: function (value) {
+            label: '最后登录时间', name: 'lastLoginTime', index: 'last_login_time', align:'center',width: 140, formatter: function (value) {
                 return transDate(value);
             }
         }, {
             label: '最后登录Ip', name: 'lastLoginIp', index: 'last_login_ip', hidden: true
         }, {
-            label: '会员等级', name: 'levelName', width: 40
+            label: '会员等级', name: 'levelName', align:'center',width: 120
         }, {
-            label: '微信名', name: 'nickname', index: 'nickname', width: 80
+            label: '微信名', name: 'nickname', index: 'nickname', width: 240
         }, {
-            label: '手机号码', name: 'mobile', index: 'mobile', width: 120
+            label: '手机号码', name: 'mobile', index: 'mobile', align:'center',width: 140
         }, {
             label: '注册Ip', name: 'registerIp', index: 'register_ip', hidden: true
         }, {
-            label: '头像', name: 'avatar', index: 'avatar', width: 80, formatter: function (value) {
+            label: '头像', name: 'avatar', index: 'avatar', align:'center',width: 100, formatter: function (value) {
                 return transImg(value);
             }
         }, {
@@ -48,6 +48,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -63,7 +66,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/js/shop/store.js

@@ -3,23 +3,23 @@ $(function () {
         url: '../store/list',
         datatype: "json",
         colModel: [
-            {label: 'id', name: 'id', index: 'id', key: true, width: 40},
-            {label: '商户编号', name: 'merchSn', index: 'merch_sn', width: 80},
-            {label: '商户名称', name: 'merchName', index: 'merch_name', width: 60, align: 'center'},
-            {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 60, align: 'center'},
-            {label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 60, align: 'center'},
-            {label: '门店名称', name: 'storeName', index: 'store_name', width: 80, align: 'center'},
-            {label: '门店编号', name: 'storeNumber', index: 'store_number', width: 80, align: 'center'},
-            {label: '门店地址', name: 'storeAddress', index: 'store_address', width: 80, align: 'center'},
-            {label: '省份', name: 'provinceName', index: 'province_name', width: 60, align: 'center'},
-            {label: '城市', name: 'cityName', index: 'city_name', width: 60, align: 'center'},
-            {label: '区', name: 'countyName', index: 'county_name', width: 60, align: 'center'},
-            {label: '纬度', name: 'latitude', index: 'latitude', width: 80, align: 'center'},
-            {label: '经度', name: 'longitude', index: 'longitude', width: 80, align: 'center'},
+            {label: 'id', name: 'id', index: 'id', key: true, align:'center',width: 60},
+            {label: '商户编号', name: 'merchSn', index: 'merch_sn', align:'center',width: 210},
+            {label: '商户名称', name: 'merchName', index: 'merch_name', width: 160, align: 'center'},
+            {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 160, align: 'center'},
+            {label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'thirdPartyMerchName', width: 160, align: 'center'},
+            {label: '门店名称', name: 'storeName', index: 'store_name', width: 120},
+            {label: '门店编号', name: 'storeNumber', index: 'store_number', width: 180, align: 'center'},
+            {label: '门店地址', name: 'storeAddress', index: 'store_address', width: 400},
+            {label: '省份', name: 'provinceName', index: 'province_name', width: 140, align: 'center'},
+            {label: '城市', name: 'cityName', index: 'city_name', width: 80, align: 'center'},
+            {label: '区', name: 'countyName', index: 'county_name', width: 80, align: 'center'},
+            {label: '纬度', name: 'latitude', index: 'latitude', width: 120, align: 'right'},
+            {label: '经度', name: 'longitude', index: 'longitude', width: 120, align: 'right'},
             // {label: '配送半径（km）', name: 'coverRadius', index: 'cover_radius', width: 60, align: 'center'},
-            {label: '备注', name: 'remark', index: 'remark', width: 40, align: 'center'},
+            {label: '备注', name: 'remark', index: 'remark', width: 80, align: 'center'},
 
-            {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,6 +47,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -61,7 +64,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/storeProductStock.js

@@ -6,11 +6,11 @@ $(function () {
         colModel: [
             {label: 'ID', name: 'id', index: 'id', hidden: true, key: true},
             {label: '商品商户编号', name: 'goods_merch_sn', index: 'goods_merch_sn', hidden: true},
-            {label: '所属商户', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
-            {label: '所属门店', name: 'storeName', index: 'storeName', width: 100, align: 'center'},
-            {label: '商品类型', name: 'categoryName', index: 'categoryName', width: 80, align: 'center'},
+            {label: '所属商户', name: 'merchName', index: 'merchName', width: 140, align: 'center'},
+            {label: '所属门店', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+            {label: '商品类型', name: 'categoryName', index: 'categoryName', width: 120, align: 'center'},
             {
-                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 90, align: 'center',
+                label: '货品业务类型', name: 'goodsBizType', index: 'goods_biz_type', width: 120, align: 'center',
                 formatter: function (value) {
                     if (value == '00') {
                         return '保税备货';
@@ -23,21 +23,21 @@ $(function () {
                 }
             },
             {label: '商品编码', name: 'goodsSn', index: 'goodsSn', width: 180, align: 'center'},
-            {label: '名称', name: 'goodsName', index: 'goodsName', width: 260, align: 'left'},
-            {label: '产品编码', name: 'productSn', index: 'productSn', width: 100, align: 'center'},
+            {label: '名称', name: 'goodsName', index: 'goodsName', width: 500, align: 'left'},
+            {label: '产品编码', name: 'productSn', index: 'productSn', width: 140, align: 'center'},
             {
-                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 40, align: 'center',
+                label: '上架', name: 'isOnSale', index: 'is_on_sale', width: 80, align: 'center',
                 formatter: function (value) {
                     return transIsNot(value);
                 }
             },
             {
-                label: '热销', name: 'isHot', index: 'isHot', width: 40, align: 'center',
+                label: '热销', name: 'isHot', index: 'isHot', width: 80, align: 'center',
                 formatter: function (value) {
                     return transIsNot(value);
                 }
             },
-            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 90, align: 'center',
+            {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 100, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '否';
@@ -46,15 +46,15 @@ $(function () {
                     }
                     return '-';
                 }},
-            {label: '门店库存', name: 'stockNum', index: 'stockNum', width: 70, align: 'center'},
-            {label: '零售价格', name: 'retailPrice', index: 'retailPrice', width: 70, align: 'right'},
-            {label: '市场价', name: 'marketPrice', index: 'marketPrice', width: 60, align: 'right'},
+            {label: '门店库存', name: 'stockNum', index: 'stockNum', width: 80, align: 'center'},
+            {label: '零售价格', name: 'retailPrice', index: 'retailPrice', width: 80, align: 'right'},
+            {label: '市场价', name: 'marketPrice', index: 'marketPrice', width: 80, align: 'right'},
             // {label: '库存价格', name: 'stockPrice', index: 'stockPrice', width: 80},
             {
                 label: '销售量',
                 name: 'sellVolume',
                 index: 'a.sell_volume',
-                width: 60,
+                width: 80,
                 sortable: true, align: 'center',
                 onSortCol: function (index, colindex, sortorder) {
                     //列排序事件

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

@@ -4,13 +4,13 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '一级商户编号', name: 'levelMerchSn', index: 'level_merch_sn', width: 80, align: 'center'},
-			{label: '一级商户标识', name: 'levelMerchFlag', index: 'level_merch_flag', width: 80, align: 'center'},
-            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 80, align: 'center'},
-			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 80, align: 'center'},
-			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 80, align: 'center'},
-			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 80, align: 'center'},
-			{label: '是否禁用', name: 'isShow', index: 'is_show', width: 80, align: 'center', formatter: function (value) {
+			{label: '一级商户编号', name: 'levelMerchSn', index: 'level_merch_sn', width: 200, align: 'center'},
+			{label: '一级商户标识', name: 'levelMerchFlag', index: 'level_merch_flag', width: 120, align: 'center'},
+            {label: '所属第三方商户', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 120},
+			{label: '二级供货商名称', name: 'childSupplierName', index: 'child_supplier_sn', width: 220 },
+			{label: '二级供货商标识', name: 'childSupplierFlag', index: 'child_supplier_flag', width: 120 },
+			{label: '排序', name: 'sortOrder', index: 'sort_order', width: 100, align: 'center'},
+			{label: '是否禁用', name: 'isShow', index: 'is_show', width: 100, align: 'center', formatter: function (value) {
                 return value == 0 ?
                     '<span class="label label-danger">否</span>' :
                     '<span class="label label-success">是</span>';
@@ -22,6 +22,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -36,7 +39,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/syscusnationcode.js

@@ -4,16 +4,17 @@ $(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: 'ename', index: 'ename', width: 80},
-			{label: '优普税率类型', name: 'discountsTaxType', index: 'discounts_tax_type', width: 80},
+			{label: '代码', name: 'code', index: 'code', align: 'center',width: 120},
+			{label: '名称(简称)', name: 'name', index: 'name', width: 180},
+			{label: '英文名(简称)', name: 'ename', index: 'ename', width: 280},
+			{label: '优普税率类型', name: 'discountsTaxType', index: 'discounts_tax_type',align: 'center', width: 100},
             {
                 label: '是否有效',
                 name: 'isValid',
                 align: 'center',
                 index: 'is_valid',
-                width: '50px',
+                width: '80px',
+                align: 'center',
                 formatter: function (value) {
                     if(value == 0){
                         value = 1;
@@ -23,7 +24,7 @@ $(function () {
                     return transIsNot(value);
                 }
             },
-            {label: '备注', name: 'remark', index: 'remark', width: 80}],
+            {label: '备注', name: 'remark', index: 'remark', width: 100}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -31,6 +32,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -45,7 +49,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/thirdmerchantbiz.js

@@ -4,9 +4,9 @@ $(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: 'merchSn', index: 'merch_sn', width: 220, align: 'center'},
+			{label: '第三方商户代码', name: 'thirdPartyMerchCode', index: 'third_party_merch_code', width: 180},
+			{label: '第三方商户名称', name: 'thirdPartyMerchName', index: 'third_party_merch_name', width: 180, align: 'center'},
             // {label: '库存是否共享', name: 'isStockShare', index: 'isStockShare', width: 80, align: 'center',
             //     formatter: function (value) {
             //         if (value == '0') {
@@ -43,7 +43,7 @@ $(function () {
             //         }
             //         return '';
             //     }},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 100, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
                         return '有效';
@@ -52,11 +52,11 @@ $(function () {
                     }
                     return '';
                 }},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80, 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: 80, align: 'center',
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }}],
@@ -67,6 +67,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -81,7 +84,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/thirdmerchexpress.js

@@ -4,17 +4,17 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-			{label: '商户快递账号', name: 'expressAccount', index: 'express_account', width: 80},
-			{label: '商户快递密码', name: 'expressPwd', index: 'express_pwd', width: 80},
-			{label: '商户快递月结账号', name: 'expressCusId', index: 'express_cus_id', width: 80},
-			{label: '第三方商户代码', name: 'thirdPartyMerchName', index: 'third_party_merch_code', width: 80},
-			{label: '备注', name: 'remark', index: 'remark', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80, formatter: function (value) {
+			{label: '商户快递账号', name: 'expressAccount', index: 'express_account', width: 180},
+			{label: '商户快递密码', name: 'expressPwd', index: 'express_pwd', width: 250},
+			{label: '商户快递月结账号', name: 'expressCusId', index: 'express_cus_id',align: 'center', width: 220},
+			{label: '第三方商户代码', name: 'thirdPartyMerchName', index: 'third_party_merch_code', align: 'center',width: 180},
+			{label: '备注', name: 'remark', index: 'remark', 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, formatter: function (value) {
+			{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');
             }}],
 		viewrecords: true,
@@ -24,6 +24,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -38,7 +41,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/statis/mkstorepromstat.js

@@ -4,29 +4,29 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'promStatId', name: 'promStatId', index: 'prom_stat_id', key: true, hidden: true},
-			{label: '推广名称', name: 'promName', index: 'promName', width: 80, align: 'center'},
-			{label: '门店名称', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-            {label: '推广用户', name: 'shareUserName', index: 'shareUserName', width: 80, align: 'center'},
-			{label: '浏览数', name: 'browseNum', index: 'browse_num', width: 60, align: 'center'},
-			{label: '访客量', name: 'visitNum', index: 'visit_num', width: 60, align: 'center'},
+			{label: '推广名称', name: 'promName', index: 'promName', width: 180, align: 'center'},
+			{label: '门店名称', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+            {label: '推广用户', name: 'shareUserName', index: 'shareUserName', width: 120, align: 'center'},
+			{label: '浏览数', name: 'browseNum', index: 'browse_num', width: 100, align: 'center'},
+			{label: '访客量', name: 'visitNum', index: 'visit_num', width: 100, align: 'center'},
 			// {label: '连带浏览量', name: 'relaBrowseNum', index: 'rela_browse_num', width: 80},
 			// {label: '连带访客量', name: 'relaVisitorNum', index: 'rela_visitor_num', width: 80},
 			// {label: '人均停留时长(秒)', name: 'aveStopTime', index: 'ave_stop_time', width: 80},
 			// {label: '人均访问次数', name: 'aveVisitorNum', index: 'ave_visitor_num', width: 80},
-			{label: '页面访问深度', name: 'visitPageDeep', index: 'visit_page_deep', width: 80, align: 'center'},
-			{label: '转发访客量', name: 'transVisitorNum', index: 'trans_visitor_num', width: 80, align: 'center'},
-			{label: '转发次数', name: 'transNum', index: 'trans_num', width: 60, align: 'center'},
-            {label: '下单单数', name: 'submitOrderNum', index: 'submitOrderNum', width: 80, align: 'center'},
-            {label: '下单人数', name: 'submitNum', index: 'submitNum', width: 80, align: 'center'},
-			{label: '支付单数', name: 'payOrderNum', index: 'pay_order_num', width: 80, align: 'center'},
+			{label: '页面访问深度', name: 'visitPageDeep', index: 'visit_page_deep', width: 100, align: 'center'},
+			{label: '转发访客量', name: 'transVisitorNum', index: 'trans_visitor_num', width: 100, align: 'center'},
+			{label: '转发次数', name: 'transNum', index: 'trans_num', width: 100, align: 'center'},
+            {label: '下单单数', name: 'submitOrderNum', index: 'submitOrderNum', width: 100, align: 'center'},
+            {label: '下单人数', name: 'submitNum', index: 'submitNum', width: 100, align: 'center'},
+			{label: '支付单数', name: 'payOrderNum', index: 'pay_order_num', width: 100, align: 'center'},
 			// {label: '连带支付单数', name: 'relaPayOrderNum', index: 'rela_pay_order_num', width: 80},
-			{label: '支付人数', name: 'payerNum', index: 'payer_num', width: 60, align: 'center'},
+			{label: '支付人数', name: 'payerNum', index: 'payer_num', width: 100, align: 'center'},
 			// {label: '连带支付人数', name: 'relaPayerNum', index: 'rela_payer_num', width: 80},
-			{label: '支付件数', name: 'payCaseNum', index: 'pay_case_num', width: 60, align: 'center'},
+			{label: '支付件数', name: 'payCaseNum', index: 'pay_case_num', width: 100, align: 'center'},
 			// {label: '连带支付件数', name: 'relaPayCaseNum', index: 'rela_pay_case_num', width: 80},
-			{label: '应收金额', name: 'receivMoney', index: 'receiv_money', width: 60, align: 'center'},
+			{label: '应收金额', name: 'receivMoney', index: 'receiv_money', width: 100, align: 'right'},
 			// {label: '连带应收金额', name: 'relaReceivMoney', index: 'rela_receiv_money', width: 80},
-			{label: '实收金额', name: 'actMoney', index: 'act_money', width: 60, align: 'center'},
+			{label: '实收金额', name: 'actMoney', index: 'act_money', width: 100, align: 'right'},
             {
                 label: '操作', width: 160, align: 'center', sortable: false, formatter: function (value, col, row) {
                 let htmlStr = "<button class='btn btn-outline btn-primary' " +
@@ -50,6 +50,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -64,7 +67,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/statis/mkstoretopicstat.js

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'storeTopicStatId', name: 'storeTopicStatId', index: 'store_topic_stat_id', key: true, hidden: true},
-			{label: '活动名称', name: 'storeTopicName', index: 'storeTopicName', width: 80, align: 'center'},
-            {label: '活动类型', name: 'storeTopicType', index: 'storeTopicType', width: 80, align: 'center'},
-			{label: '门店名称', name: 'storeName', index: 'storeName', width: 80, align: 'center'},
-			{label: '浏览数', name: 'browseNum', index: 'browse_num', width: 80, align: 'center'},
-			{label: '访客量', name: 'visitNum', index: 'visit_num', width: 80, align: 'center'},
-            {label: '领取量', name: 'receiveNum', index: 'receiveNum', width: 80, align: 'center',
+			{label: '活动名称', name: 'storeTopicName', index: 'storeTopicName', width: 180, align: 'center'},
+            {label: '活动类型', name: 'storeTopicType', index: 'storeTopicType', width: 180, align: 'center'},
+			{label: '门店名称', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
+			{label: '浏览数', name: 'browseNum', index: 'browse_num', width: 100, align: 'center'},
+			{label: '访客量', name: 'visitNum', index: 'visit_num', width: 100, align: 'center'},
+            {label: '领取量', name: 'receiveNum', index: 'receiveNum', width: 100, align: 'center',
                 formatter: function (value) {
                     if ((value == null || value == '')) {
                         return '-';
@@ -18,19 +18,19 @@ $(function () {
             }},
 			// {label: '连带浏览量', name: 'relaBrowseNum', index: 'rela_browse_num', width: 80},
 			// {label: '连带访客量', name: 'relaVisitorNum', index: 'rela_visitor_num', width: 80},
-			{label: '页面访问深度', name: 'visitPageDeep', index: 'visit_page_deep', width: 80, align: 'center'},
+			{label: '页面访问深度', name: 'visitPageDeep', index: 'visit_page_deep', width: 100, align: 'center'},
 			// {label: '转发访客量', name: 'transVisitorNum', index: 'trans_visitor_num', width: 80},
-			{label: '下单单数', name: 'submitOrderNum', index: 'submit_order_num', width: 80, align: 'center'},
-			{label: '下单人数', name: 'submitNum', index: 'submit_num', width: 80, align: 'center'},
-			{label: '支付单数', name: 'payOrderNum', index: 'pay_order_num', width: 80, align: 'center'},
+			{label: '下单单数', name: 'submitOrderNum', index: 'submit_order_num', width: 100, align: 'center'},
+			{label: '下单人数', name: 'submitNum', index: 'submit_num', width: 100, align: 'center'},
+			{label: '支付单数', name: 'payOrderNum', index: 'pay_order_num', width: 100, align: 'center'},
 			// {label: '连带支付单数', name: 'relaPayOrderNum', index: 'rela_pay_order_num', width: 80},
-			{label: '支付人数', name: 'payerNum', index: 'payer_num', width: 80, align: 'center'},
+			{label: '支付人数', name: 'payerNum', index: 'payer_num', width: 100, align: 'center'},
 			// {label: '连带支付人数', name: 'relaPayerNum', index: 'rela_payer_num', width: 80},
-			{label: '支付件数', name: 'payCaseNum', index: 'pay_case_num', width: 80, align: 'center'},
+			{label: '支付件数', name: 'payCaseNum', index: 'pay_case_num', width: 100, align: 'center'},
 			// {label: '连带支付件数', name: 'relaPayCaseNum', index: 'rela_pay_case_num', width: 80},
-			{label: '应收金额', name: 'receivMoney', index: 'receiv_money', width: 80, align: 'center'},
+			{label: '应收金额', name: 'receivMoney', index: 'receiv_money', width: 100, align: 'right'},
 			// {label: '连带应收金额', name: 'relaReceivMoney', index: 'rela_receiv_money', width: 80},
-			{label: '实收金额', name: 'actMoney', index: 'act_money', width: 80, align: 'center'},
+			{label: '实收金额', name: 'actMoney', index: 'act_money', width: 100, align: 'right'},
 			// {label: '连带实收金额', name: 'relaActMoney', index: 'rela_act_money', width: 80, align: 'center'},
 			// {label: '是否有效,0:有效，1:无效', name: 'isValid', index: 'is_valid', width: 80},
 			// {label: '备注', name: 'note', index: 'note', width: 80, align: 'center'},
@@ -56,6 +56,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -70,7 +73,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });