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

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

@@ -28,8 +28,15 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="cashier" :rules="ruleValidate" :label-width="80">
-            <Form-item label="机器码类型" prop="machineCodeType">
-                <i-input v-model="cashier.machineCodeType" placeholder="机器码类型"/>
+            <!--<Form-item label="机器码类型" prop="machineCodeType">-->
+                <!--<i-input v-model="cashier.machineCodeType" placeholder="机器码类型"/>-->
+            <!--</Form-item>-->
+            <Form-item label="机器码类型" prop="machineCodeType" >
+                <i-select v-model="cashier.machineCodeType"  placeholder="机器码类型"
+                          label-in-value style="width: 268px;">
+                    <i-option v-for="machineCode in machineCodeTypes" :value="machineCode.value" :key="machineCode.id">{{machineCode.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="机器码" prop="machineCode">
                 <i-input v-model="cashier.machineCode" placeholder="机器码"/>

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

@@ -31,7 +31,7 @@
             <Form-item label="活动名称" prop="topicName">
                 <i-input v-model="mk2MemberBirthday.topicName" placeholder="活动名称"/>
             </Form-item>
-            <Form-item label="优惠类型" prop="topicType">
+            <Form-item label="优惠类型(00:按比例；10：按金额)" prop="topicType">
                 <i-input v-model="mk2MemberBirthday.topicType" placeholder="优惠类型"/>
             </Form-item>
             <Form-item label="优惠金额" prop="topicPrice">

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

@@ -5,29 +5,35 @@
     <title>实时销售监测</title>
     #parse("sys/header.html")
     <style>
-        .coldiv{
+        .coldiv {
             background-color: #f8f8f9;
         }
-        body{
+
+        body {
             color: #515a6e;
         }
-        span,button,select,input{
+
+        span, button, select, input {
             font-size: 18px;
             font-family: 微软雅黑;
         }
-        #refreshTime,#storeId,#categoryId{
+
+        #refreshTime, #storeId, #categoryId {
             width: 100px;
         }
-        #merchSn{
+
+        #merchSn {
             width: 300px;
         }
-        i{
+
+        i {
             font-size: 20px;
         }
-        input{
+
+        input {
             border: 1px #dcdee2 solid;
             border-radius: 5px;
-            outline-color:#5cadff;
+            outline-color: #5cadff;
         }
     </style>
 </head>
@@ -39,27 +45,28 @@
                 <div class="col-md-12">
 
                     <span>日期：</span>
-                    <input type="date" name="salesDate" id="salesDate" v-model="salesDate" />&nbsp;
+                    <input type="date" name="salesDate" id="salesDate" v-model="salesDate"/>&nbsp;
                     <span>刷新间隔：</span>
-                    <input type="number" name="refreshTime" v-model="refreshTime"  id="refreshTime" oninput="if(value > 1000 || value < 1 ){alert('非法输入！');value = ''}"/>
+                    <input type="number" name="refreshTime" v-model="refreshTime" id="refreshTime"
+                           oninput="if(value > 1000 || value < 1 ){alert('非法输入！');value = ''}"/>
                     <span>秒</span>&nbsp;
 
 
                     <input type="radio" name="type" value="store" v-model="type" id="store">
                     <label for="store"><span>门店 </span></label>&nbsp;
-                    <input type="radio" name="type" value="dept"  v-model="type" id="dept" />
+                    <input type="radio" name="type" value="dept" v-model="type" id="dept"/>
                     <label for="dept"> <span>部门 </span></label>&nbsp;
-                    <input type="radio" name="type" value="category"  v-model="type" id="category" />
+                    <input type="radio" name="type" value="category" v-model="type" id="category"/>
                     <label for="category"> <span>品类 </span></label>&nbsp;
 
                     <!--统计图类型-->
                     <select name="seriesTypeSelect" v-model="seriesTypeSelect" @change="seriesTypeSwitch">
-                        <option :value="seriesType.id" v-for="seriesType in seriesTypeList" >{{seriesType.name}}</option>
+                        <option :value="seriesType.id" v-for="seriesType in seriesTypeList">{{seriesType.name}}</option>
                     </select>
 
                     <!--含税下拉框-->
-                    <select name="rateSelect" v-model="rateSelect">
-                        <option :value="rate.id" v-for="rate in rateList" >{{rate.name}}</option>
+                    <select name="rateSelect" v-model="rateSelect" disabled>
+                        <option :value="rate.id" v-for="rate in rateList">{{rate.name}}</option>
                     </select>
                 </div>
             </div>
@@ -78,16 +85,21 @@
                     <span style="color: red;margin: 10px">{{merchName}}</span> &nbsp;&nbsp;
                     <span>业态：</span>
                     <!--业态下拉框-->
-                    <select name="formatsSelect" v-model="formatsSelect">
-                        <option :value="formats.id" v-for="formats in formatsList" >{{formats.name}}</option>
+                    <select name="formatsSelect" v-model="formatsSelect" disabled>
+                        <option :value="formats.id" v-for="formats in formatsList">{{formats.name}}</option>
                     </select>&nbsp;
                 </div>
             </div>
             <div class="row" style="border:0;margin-bottom:10px">
                 <div class="col-md-12 ">
-                    <i-button style="margin-right: 10px" type="primary" icon="refresh" size="24px" v-on:click="refresh" id="refresh">刷新</i-button>
-                    <i-button style="margin-right: 10px" type="info" icon="arrow-down-c" v-on:click="saveFlushTime" id="saveFlushTime">保存条件</i-button>
-                    <i-button type="warning" icon="close" v-on:click="clearFlushTime" id="clearFlushTime">清除条件</i-button>
+                    <i-button style="margin-right: 10px" type="primary" icon="refresh" size="24px" v-on:click="refresh"
+                              id="refresh">刷新
+                    </i-button>
+                    <i-button style="margin-right: 10px" type="info" icon="arrow-down-c" v-on:click="saveFlushTime"
+                              id="saveFlushTime">保存条件
+                    </i-button>
+                    <i-button type="warning" icon="close" v-on:click="clearFlushTime" id="clearFlushTime">清除条件
+                    </i-button>
                 </div>
             </div>
 
@@ -96,11 +108,13 @@
                     <span>项目:</span>
                     <!--项目下拉框-->
                     <select name="projectSelect" v-model="projectSelect">
-                        <option :value="project.id" v-for="project in projectList" >{{project.name}}</option>
+                        <option :value="project.id" v-for="project in projectList">{{project.name}}</option>
                     </select>&nbsp;
                     <span>比较日期：</span>
-                    <input type="date" name="compareDate" id="compareDate" v-model="compareDate" /> &nbsp;
-                    <i-button style="margin-right: 10px"  type="primary" shape="circle" icon="arrow-swap" v-on:click="compare" id="clearFlushTime">比较</i-button>
+                    <input type="date" name="compareDate" id="compareDate" v-model="compareDate"/> &nbsp;
+                    <i-button style="margin-right: 10px" type="primary" shape="circle" icon="arrow-swap"
+                              v-on:click="compare" id="clearFlushTime">比较
+                    </i-button>
 
                 </div>
             </div>
@@ -109,14 +123,21 @@
         </div>
     </header>
     <!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
-    <div id="main" style="width: 90%;height:400px;margin-top: 10px"></div>
-    <hr/>
+    <div class="row" style="border:0;margin-bottom:10px">
+        <div class="col-md-12 ">
+            <div id="main" style="width: 90%;height:400px;margin-top: 10px"></div>
+            <hr/>
+        </div>
+    </div>
     <footer>
-        <div v-show="showList">
-            <table id="jqGrid" style="margin-top: 10px"></table>
+        <div class="row" style="border:0;margin-bottom:10px">
+            <div class="col-md-12 ">
+                <div v-show="showList">
+                    <table id="jqGrid" style="margin-top: 10px"></table>
+                </div>
+            </div>
         </div>
 
-
     </footer>
     <script src="${rc.contextPath}/js/sale/echarts.js"></script>
     <script src="${rc.contextPath}/js/sale/realtimeSalesDetection.js"></script>

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

@@ -4,11 +4,11 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'moewrId', name: 'moewrId', index: 'moewr_id', key: true, hidden: true},
-			{label: '商品id', name: 'goodsId', index: 'goods_id', align:"center",width: 80},
-			{label: '商品名称', name: 'goodsName', index: 'goods_name',align:"center", width: 80},
-			{label: '商品sku', name: 'sku', index: 'sku',align:"center", width: 80},
-			{label: '平均销量', name: 'averageSales', index: 'average_sales',align:"center", width: 80},
-			{label: '总库存数', name: 'totalNum', index: 'total_num',align:"center", width: 80},
+			{label: '商品id', name: 'goodsId', index: 'goods_id', align:"center",width: 160},
+			{label: '商品名称', name: 'goodsName', index: 'goods_name',width: 380},
+            {label: '商品sku', name: 'sku', index: 'sku',align:"center", width: 80},
+            {label: '平均销量', name: 'averageSales', index: 'average_sales',align:"right", width: 120},
+			{label: '总库存数', name: 'totalNum', index: 'total_num',align:"right", width: 120},
 			{
 				label: '预警时间', name: 'alarmTime', index: 'alarm_time',align:"center", width: 80, formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
@@ -22,6 +22,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/alarm/mall2reminderrulesconfig.js

@@ -4,9 +4,9 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mrrcId', name: 'mrrcId', index: 'mrrc_id', key: true, hidden: true},
-			{label: '商户编号', name: 'merchSn', index: 'merch_sn', align:'center', width: 80},
-			{label: '商户名称', name: 'merchName', index: 'merchName', align:'center', width: 80},
-			{label: '提醒类别', name: 'reminderCategory', index: 'reminder_category',align:'center', width: 80,formatter:function(value){
+			{label: '商户编号', name: 'merchSn', index: 'merch_sn', align:'center', width: 380},
+			{label: '商户名称', name: 'merchName', index: 'merchName', align:'center', width: 200},
+			{label: '提醒类别', name: 'reminderCategory', index: 'reminder_category',align:'center', width: 120,formatter:function(value){
 				if(value === '0'){
 					return '出货提醒';
 				}else if(value === '1'){
@@ -15,7 +15,7 @@ $(function () {
 					return '-';
 				}
 				}},
-			{label: '提醒类型', name: 'reminderType', index: 'reminder_type',align:'center', width: 80,formatter:function(value){
+			{label: '提醒类型', name: 'reminderType', index: 'reminder_type',align:'center', width: 120,formatter:function(value){
 				if(value === '00'){
 					return '固定值';
 				}else if(value === '10'){
@@ -24,7 +24,7 @@ $(function () {
 					return '-';
 				}
 			}},
-			{label: '提醒值', name: 'reminderValue', index: 'reminder_value',align:'center', width: 80}],
+			{label: '提醒值', name: 'reminderValue', index: 'reminder_value',align:'right', width: 120}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -32,6 +32,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -50,7 +53,7 @@ $(function () {
 			return(true);
 		},
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 	var myGrid = $("#jqGrid");

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

@@ -4,12 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'msraId', name: 'msraId', index: 'msra_id',  key: true, hidden: true},
-			{label: '门店id', name: 'storeId', index: 'store_id',align:"center", width: 80},
-			{label: '门店名称', name: 'storeName', index: 'store_name',align:"center", width: 80},
-			{label: '门店商品sku', name: 'sku', index: 'sku',align:"center", width: 80},
-			{label: '商品名称', name: 'goodsName', index: 'goods_name',align:"center", width: 100},
-			{label: '剩余库存数', name: 'stockNum', index: 'stock_num',align:"center", width: 80},
-			{label: '平均销量', name: 'averageSales', index: 'average_sales',align:"center", width: 80,formatter:function(value){
+			{label: '门店id', name: 'storeId', index: 'store_id',align:"center", width: 120},
+			{label: '门店名称', name: 'storeName', index: 'store_name',align:"center", width: 180},
+			{label: '门店商品sku', name: 'sku', index: 'sku',align:"center", width: 120},
+			{label: '商品名称', name: 'goodsName', index: 'goods_name',align:"center", width: 280},
+			{label: '剩余库存数', name: 'stockNum', index: 'stock_num',align:"right", width: 120},
+			{label: '平均销量', name: 'averageSales', index: 'average_sales',align:"right", width: 120,formatter:function(value){
 				if(value === '0'){
 					return '-';
 				}
@@ -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/cashier/cashierLoginRecord.js

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mclrId', name: 'mclrId', index: 'mclr_id', key: true, hidden: true},
-			{label: '店员用户名', name: 'sallerId', index: 'saller_id',align: 'center', width: 80},
-			{label: '收银机id', name: 'cashierId', index: 'cashier_id',align: 'center', width: 80},
-			{label: '门店名称', name: 'shopName', index: 'shopName',align: 'center', width: 80},
-			{label: '登录时间', name: 'loginTime', index: 'login_time',align: 'center', width: 80,formatter:function(value){
+			{label: '店员用户名', name: 'sallerId', index: 'saller_id',align: 'center', width: 120},
+			{label: '收银机id', name: 'cashierId', index: 'cashier_id',align: 'center', width: 120},
+			{label: '门店名称', name: 'shopName', index: 'shopName', width: 220},
+			{label: '登录时间', name: 'loginTime', index: 'login_time',align: 'center', width: 160,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}
 			],
@@ -18,6 +18,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -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/cashier/cashierManager.js

@@ -4,14 +4,22 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mcId', name: 'mcId', index: 'mc_id', key: true, hidden: true},
-			{label: '机器码类型', name: 'machineCodeType', index: 'machine_code_type',align:'center', width: 80},
-			{label: '机器码', name: 'machineCode', index: 'machine_code',align:'center', width: 80},
-			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align:'center', width: 80},
+			{label: '机器码类型', name: 'machineCodeType', index: 'machine_code_type',align:'center', width: 160,formatter:function(value){
+                    if(value === '0'){
+                        return '机器码001';
+                    }else if(value === '1'){
+                        return '机器码002';
+                    }else{
+                        return '-';
+                    }
+                }},
+			{label: '机器码', name: 'machineCode', index: 'machine_code',align:'center', width: 180},
+			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align:'center', width: 120},
 			/*{label: '站点编码', name: 'stationCode', index: 'station_code', width: 80},*/
-			{label: '门店编号', name: 'shopSn', index: 'shop_sn',align:'center', width: 80},
-			{label: '门店名称', name: 'shopName', index: 'shopName',align:'center', width: 80},
-			{label: '商户编号', name: 'merchSn', index: 'merch_sn',align:'center', width: 80},
-			{label: '商户名称', name: 'merchName', index: 'merchName',align:'center', width: 80}
+			{label: '门店编号', name: 'shopSn', index: 'shop_sn',align:'center', width: 120},
+			{label: '门店名称', name: 'shopName', index: 'shopName',align:'center', width: 160},
+			{label: '商户编号', name: 'merchSn', index: 'merch_sn',align:'center', width: 180},
+			{label: '商户名称', name: 'merchName', index: 'merchName', width: 280}
 			/*{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80}*/
 			],
 		viewrecords: true,
@@ -21,6 +29,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -39,7 +50,7 @@ $(function () {
             return(true);
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
     var myGrid = $("#jqGrid");
@@ -52,6 +63,7 @@ let vm = new Vue({
         showList: true,
         title: null,
 		cashier: {},
+        machineCodeTypes:[],
         merchList:[],
         storeList:[],
 		ruleValidate: {
@@ -179,5 +191,10 @@ let vm = new Vue({
                 vm.storeList = r.list;
             });
         }
-	}
+	},
+    mounted() {
+        $.get("../sys/macro/queryMacrosByValue?value=machineCodeType", function (r) {
+            vm.machineCodeTypes = r.list;
+        });
+    }
 });

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

@@ -4,18 +4,18 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'msrId', name: 'msrId', index: 'msr_id', key: true, hidden: true},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn',align: 'center', width: 80},
-			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align: 'center', width: 80},
-			{label: '店员id', name: 'sallerId', index: 'saller_id',align: 'center', width: 80},
-			{label: '活动id', name: 'discountId', index: 'discount_id', align: 'center', width: 80,formatter:function(value){
+			{label: '订单编号', name: 'orderSn', index: 'order_sn',align: 'center', width: 200},
+			{label: '收银机编号', name: 'cashierSn', index: 'cashier_sn',align: 'center', width: 120},
+			{label: '店员id', name: 'sallerId', index: 'saller_id',align: 'center', width: 120},
+			{label: '活动id', name: 'discountId', index: 'discount_id', align: 'center', width: 120,formatter:function(value){
 				console.log(typeof value);
 				if(value === '0'){
 					return '-';
 				}
 				return value;
 				}},
-			{label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 80,},
-			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 80,formatter:function(value){
+			{label: '活动id', name: 'discountName', index: 'discountName', align: 'center', width: 120,},
+			{label: '销售时间', name: 'salesTime', index: 'sales_time',align: 'center', width: 160,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}
 			],
@@ -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/mk/mk2goodstopichistoryprice.js

@@ -5,10 +5,10 @@ $(function () {
         colModel: [
 			{label: 'mgthpId', name: 'mgthpId', index: 'mgthp_id', key: true, hidden: true},
 			{label: '活动id', name: 'topicId', index: 'topic_id', align: 'center',width: 80},
-			{label: '活动类别', name: 'topicType', index: 'topic_type', align: 'center',width: 80},
-			{label: '活动价格', name: 'topicPrice', index: 'topic_price', align: 'center',width: 80},
-			{label: '活动名称', name: 'topicName', index: 'topic_name',align: 'center', width: 80},
-			{label: '活动内容', name: 'topicContent', index: 'topic_content', align: 'center',width: 80}],
+			{label: '活动类别', name: 'topicType', index: 'topic_type', align: 'center',width: 180},
+			{label: '活动价格', name: 'topicPrice', index: 'topic_price', align: 'right',width: 120},
+			{label: '活动名称', name: 'topicName', index: 'topic_name',align: 'center', width: 180},
+			{label: '活动内容', name: 'topicContent', index: 'topic_content', width: 280}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -16,6 +16,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -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/mk/mk2goodstopicprice.js

@@ -4,17 +4,17 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mgthpId', name: 'mgthpId', index: 'mgthp_id', key: true, hidden: true},
-			{label: '活动id', name: 'topicId', index: 'topic_id', align: 'center',width: 80},
-			{label: '活动类别', name: 'topicType', index: 'topic_type', align: 'center',width: 80},
-			{label: '活动价格', name: 'topicPrice', index: 'topic_price',align: 'center', width: 80},
-			{label: '活动名称', name: 'topicName', index: 'topic_name' ,align: 'center',width: 80},
-			{label: '活动内容', name: 'topicContent', index: 'topic_content', align: 'center',width: 80},
-			{label: '活动产品', name: 'goodsName', index: 'goodsName', align: 'center',width: 80},
-			{label: '活动开始时间', name: 'topicBeginTime', index: 'topic_begin_time', width: 80,align: 'center',
+			{label: '活动id', name: 'topicId', index: 'topic_id', align: 'center',width: 120},
+			{label: '活动类别', name: 'topicType', index: 'topic_type', align: 'center',width: 120},
+			{label: '活动价格', name: 'topicPrice', index: 'topic_price',align: 'right', width: 80},
+			{label: '活动名称', name: 'topicName', index: 'topic_name' ,align: 'center',width: 280},
+			{label: '活动内容', name: 'topicContent', index: 'topic_content', align: 'center',width: 280},
+			{label: '活动产品', name: 'goodsName', index: 'goodsName', width: 380},
+			{label: '活动开始时间', name: 'topicBeginTime', index: 'topic_begin_time', width: 160,align: 'center',
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
-			{label: '活动结束时间', name: 'topicEndTime', index: 'topic_end_time', width: 80,align: 'center',
+			{label: '活动结束时间', name: 'topicEndTime', index: 'topic_end_time', width: 160,align: 'center',
 				formatter: function (value) {
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}}
@@ -27,6 +27,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -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/mk/storetopic.js

@@ -48,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/sale/realtimeSalesDetection.js

@@ -182,7 +182,7 @@ let vm = new Vue({
             // currentDate = currentDate.getFullYear()+'-'+(currentDate.getMonth()+1)+'-'+currentDate.getDate();
             postParam={};
             if(vm.type=="store"){
-                vm.storeId = '10'; //测试
+                // vm.storeId = '10'; //测试
                 if(vm.storeId==''||vm.storeId==null){
                     alert("请在输入框中输入门店编号！");
                     return false;

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

@@ -4,19 +4,27 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'transId', name: 'transId', index: 'trans_id', key: true, hidden: true},
-			{label: '传输类型', name: 'transportType', index: 'transport_type', width: 80},
-			{label: '运输工具', name: 'transportTool', index: 'transport_tool', width: 80},
-			{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 80},
-			{label: '是否在途', name: 'wayStatus', index: 'way_status', width: 80},
-			{label: '始发地', name: 'origin', index: 'origin', width: 80},
-			{label: '目的地', name: 'destination', index: 'destination', width: 80},
-			{label: '始发时间', name: 'startTime', index: 'start_time', width: 80},
-			{label: '到达时间', name: 'arrivalTime', index: 'arrival_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 80},
-			{label: '时间戳', name: 'tstm', index: 'tstm', width: 80}],
+			{label: '传输类型', name: 'transportType', index: 'transport_type', width: 180},
+			{label: '运输工具', name: 'transportTool', index: 'transport_tool', width: 280},
+			{label: '第三方商户编号', name: 'thirdMerchSn', index: 'third_merch_sn', width: 320},
+			{label: '是否在途', name: 'wayStatus', index: 'way_status',align: 'center', width: 120},
+			{label: '始发地', name: 'origin', index: 'origin', align: 'center',width: 220},
+			{label: '目的地', name: 'destination', index: 'destination', align: 'center',width: 220},
+			{label: '始发时间', name: 'startTime', index: 'start_time', width: 180,formatter: function (value) {
+                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
+                }},
+			{label: '到达时间', name: 'arrivalTime', index: 'arrival_time', width: 180,formatter: function (value) {
+                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
+                }},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 120},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 180,formatter: function (value) {
+                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
+                }},
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 120},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 180,formatter: function (value) {
+                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
+                }}
+			],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -24,6 +32,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -38,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/goodstransportinfodetail.js

@@ -4,26 +4,26 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'transItemId', name: 'transItemId', index: 'trans_item_id', key: true, hidden: true},
-			{label: '是否在途', name: 'wayStatus', index: 'way_status', width: 80,formatter: function (value) {
+			{label: '是否在途', name: 'wayStatus', index: 'way_status', width: 100,align: 'center',formatter: function (value) {
                     if (value == '0') {
                         return '是（0）';
                     } else if(value == '1'){
                         return '否（1）';
                     }
                 }},
-			{label: '商品sku', name: 'sku', index: 'sku', width: 80},
-			{label: '供应商id', name: 'supplierId', index: 'supplier_id', width: 80},
-			{label: '原产地', name: 'originCountry', index: 'origin_country', width: 80},
-			{label: '数量', name: 'num', index: 'num', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',width: 280,formatter: function (value) {
+			{label: '商品sku', name: 'sku', index: 'sku', width: 180},
+			{label: '供应商id', name: 'supplierId', index: 'supplier_id', width: 120},
+			{label: '原产地', name: 'originCountry', index: 'origin_country', align: 'center',width: 120},
+			{label: '数量', name: 'num', index: 'num', align: 'right',width: 120},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn',align: 'center', width: 180},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 180, 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, align: 'center',width: 280,formatter: function (value) {
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', align: 'center',width: 180},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 180, align: 'center',formatter: function (value) {
                     return transDate(value,'yyyy-MM-dd hh:mm:ss');
-                }},
-			{label: '时间戳', name: 'tstm', index: 'tstm', width: 80}],
+                }
+			}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -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/sys/generator.js

@@ -3,11 +3,11 @@ $(function () {
         url: '../sys/generator/list',
         datatype: "json",
         colModel: [
-            {label: '表名', name: 'tableName', width: 100, key: true},
-            {label: 'Engine', name: 'engine', width: 70},
-            {label: '表备注', name: 'tableComment', width: 100},
+            {label: '表名', name: 'tableName', width: 280, key: true},
+            {label: 'Engine', name: 'engine', align: 'center',width: 170},
+            {label: '表备注', name: 'tableComment', width: 180},
             {
-                label: '创建时间', name: 'createTime', width: 100, formatter: function (value) {
+                label: '创建时间', name: 'createTime', align: 'center',width: 180, formatter: function (value) {
                 return transDate(value);
             }
             }
@@ -19,6 +19,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -33,8 +36,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/vip/mall2memberconsumptionrecords.js

@@ -4,15 +4,22 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mmcrId', name: 'mmcrId', index: 'mmcr_id', key: true, hidden: true},
-			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
-			{label: '用户名称', name: 'userName', index: 'userName',align:'center', width: 80},
-			{label: '订单编号', name: 'orderSn', index: 'order_sn',align:'center', width: 80},
-			{label: '消费时间', name: 'consumptionTime', index: 'consumption_time',align:'center', width: 80,formatter:function(value){
+			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 140},
+			{label: '用户名称', name: 'userName', index: 'userName',align:'center', width: 180},
+			{label: '订单编号', name: 'orderSn', index: 'order_sn',align:'center', width: 180},
+			{label: '消费时间', name: 'consumptionTime', index: 'consumption_time',align:'center', width: 160,formatter:function(value){
 					return transDate(value, 'yyyy-MM-dd hh:mm:ss');
 				}},
-			{label: '消费门店id', name: 'shopSn', index: 'shop_sn',align:'center', width: 80},
-			{label: '消费门店', name: 'shopName', index: 'shopName',align:'center', width: 80},
-			{label: '是否使用生日优惠', name: 'isUseBirthdayOffer', index: 'is_use_birthday_offer',align:'center', width: 80},
+			{label: '消费门店id', name: 'shopSn', index: 'shop_sn',align:'center', width: 180},
+			{label: '消费门店', name: 'shopName', index: 'shopName',align:'center', width: 220},
+			{label: '是否使用生日优惠', name: 'isUseBirthdayOffer', index: 'is_use_birthday_offer',align:'center', width: 180
+                // ,formatter: function (value) {
+                //                     if (value == '0') {
+                //                         return '是（0）';
+                //                     } else if(value == '1'){
+                //                         return '否（1）';
+                //                     }
+                },
 			],
 		viewrecords: true,
         height: 550,
@@ -21,6 +28,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -35,7 +45,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/vip/mall2memberpoints.js

@@ -4,10 +4,10 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mmpId', name: 'mmpId', index: 'mmp_id',align:'center', key: true, hidden: true},
-			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 80},
-			{label: '用户名', name: 'userName', index: 'userName',align:'center', width: 80},
-			{label: '积分数', name: 'points', index: 'points',align:'center', width: 80},
-			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date',align:'center', width: 80,formatter:function(value){
+			{label: '用户id', name: 'userId', index: 'user_id',align:'center', width: 140},
+			{label: '用户名', name: 'userName', index: 'userName' ,width: 280},
+			{label: '积分数', name: 'points', index: 'points',align:'center', width: 140},
+			{label: '积分到期时间', name: 'pointsExpireDate', index: 'points_expire_date',align:'center', width: 180,formatter:function(value){
 				return '-';
 				}},
 			],
@@ -18,6 +18,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -32,7 +35,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });