修改自适应表单

修改操作列为冻结列
修复部分查询条件混乱

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

@@ -30,26 +30,6 @@
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
-            </div>
-        </Row>
-            <Row :gutter="16">
-            <div class="buttons-group">
-                <i-button type="info" @click="sendSelectProductByAdd"><i class="fa fa-plus"></i>&nbsp;选中发送(新增)</i-button>
-                <i-button type="info" @click="sendAllProductByAdd"><i class="fa fa-plus"></i>&nbsp;全部发送(新增)</i-button>
-                <i-button type="info" @click="sendSelectProductByUpdate"><i class="fa fa-plus"></i>&nbsp;选中发送(修改)</i-button>
-                <i-button type="info" @click="sendAllProductByUpdate"><i class="fa fa-plus"></i>&nbsp;全部发送(修改)</i-button>
-
-                #if($shiro.hasPermission("goodsproduct:save"))
-                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("goodsproduct:update"))
-                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("goodsproduct:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
-                <i-button type="info" @click="pull"><i class="fa fa-plus"></i>&nbsp;拉取</i-button>
-
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
                             :on-progress="uploadExcelProgress"
@@ -79,6 +59,25 @@
                 <a href="../statics/file/goods_product_import_yyyy_mm_dd_v1.0.0.xlsx">产品备案excel导入模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
         </Row>
+        <Row :gutter="16">
+            <div class="buttons-group">
+                <i-button type="info" @click="sendSelectProductByAdd"><i class="fa fa-plus"></i>&nbsp;选中发送(新增)</i-button>
+                <i-button type="info" @click="sendAllProductByAdd"><i class="fa fa-plus"></i>&nbsp;全部发送(新增)</i-button>
+                <i-button type="info" @click="sendSelectProductByUpdate"><i class="fa fa-plus"></i>&nbsp;选中发送(修改)</i-button>
+                <i-button type="info" @click="sendAllProductByUpdate"><i class="fa fa-plus"></i>&nbsp;全部发送(修改)</i-button>
+
+                #if($shiro.hasPermission("goodsproduct:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("goodsproduct:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("goodsproduct:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+                <i-button type="info" @click="pull"><i class="fa fa-plus"></i>&nbsp;拉取</i-button>
+            </div>
+        </Row>
 	    <table id="jqGrid"></table>
 	    <div id="jqGridPager"><div class="ui-jqgrid-bdiv frozen-div"></div></div>
     </div>

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

@@ -42,18 +42,18 @@
                         <i-option value="2">团购订单</i-option>
                     </i-select>
                 </i-col>-->
+                <i-col span="3">
+                    <Date-picker v-model="q.billDate" placeholder="账单时间"/>
+                </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div>
                 <i-button type="info" @click="checkOrderRestore"></i>&nbsp;查验单恢复库存</i-button>
                 #if($shiro.hasPermission("order:exportOffilineOrder"))
                 <i-button type="primary" @click="exportOffilineOrder"><i class="fa fa-cloud-download"></i>&nbsp;导出</i-button>
                 #end
                 <i-button type="primary" @click="exportSystemFormat"><i class="fa fa-cloud-download"></i>&nbsp;Daily sales report 导出</i-button>
-            </div>
-            <div>
-                <i-col span="3">
-                    <Date-picker v-model="q.billDate" placeholder="账单时间"/>
-                </i-col>
                 <i-button type="primary" @click="exportSaleReportExcel"><i class="fa fa-cloud-download"></i>&nbsp;销售报表导出</i-button>
             </div>
            <!-- TODO req_hidden_20200610 #if($shiro.hasPermission("order:wxMicropayPay"))

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

@@ -101,7 +101,7 @@
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
-            <div class="buttons-group" style="float: left">
+            <div class="buttons-group" style="width: 100%;margin-top: 8px; padding-left: 10px;">
                 <!--#if($shiro.hasPermission("productstorerela:upload"))
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError"

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

@@ -24,7 +24,7 @@
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
 <div id="mainApp" v-cloak>
     <!--左侧导航开始-->
-    <nav class="navbar-default navbar-static-side" role="navigation">
+    <nav id="leftNavbar" class="navbar-default navbar-static-side" role="navigation">
         <div class="nav-close"><i class="fa fa-times-circle"></i>
         </div>
         <div class="sidebar-collapse">
@@ -46,7 +46,7 @@
     <!--左侧导航结束-->
     <!--右侧部分开始-->
     <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="border-bottom">
+        <div id="rightToolbar" class="border-bottom">
             <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
                 <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i
                         class="fa fa-bars"></i> </a>
@@ -65,7 +65,7 @@
                 </ul>
             </nav>
         </div>
-        <div class="content-tabs">
+        <div id="rightTabs" class="content-tabs">
             <button class="roll-nav roll-left J_tabLeft"><i class="fa fa-backward"></i>
             </button>
             <nav class="page-tabs J_menuTabs">
@@ -92,11 +92,11 @@
             <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="sys/main.html" frameborder="0"
                     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"><a href="#" target="_blank">跨境电商收银系统</a>
-            </div>
-        </div>
+<!--        <div class="footer">-->
+<!--            &lt;!&ndash;<div class="pull-right">&copy; 2018-2028 <a href="#" target="_blank">中网科技（深圳）有限公司</a>&ndash;&gt;-->
+<!--                <div class="pull-right"><a href="#" target="_blank">跨境电商收银系统</a>-->
+<!--            </div>-->
+<!--        </div>-->
     </div>
     <!--右侧部分结束-->
     <!--右侧边栏开始-->
@@ -261,9 +261,9 @@
 <script src="statics/plugins/slimscroll/jquery.slimscroll.min.js"></script>
 <script src="js/common.js"></script>
 <script>
-    $(function () {
-        vm.getUser();
-    });
+    // $(function () {
+    //     vm.getUser();
+    // });
     //生成菜单
     var menuItem = Vue.extend({
         name: 'menu-item',
@@ -475,6 +475,37 @@
             }
         }
     });
+
+    /**
+     * 主体 mainContent
+     * iframe内部页面与iframe自适应
+     * @private
+     */
+    var _mainContent = function() {
+        var wh = $(window).height();
+        var rtool = $("#rightToolbar").height();
+        var rtab = $("#rightTabs").height();
+        // console.log('rtool height:' + rtool)
+        // console.log('rtab height:' + rtab)
+
+        $mainContent = $("#content-main");
+
+        var mc = wh - rtool - rtab;
+
+        $mainContent.height(mc);
+    }
+
+    $(function () {
+        vm.getUser();
+
+        _mainContent();
+    });
+
+
+    //浏览器窗口变化时, 调整Tab
+    $(window).resize(function() {
+        _mainContent();
+    });
 </script>
 </body>
 </html>

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

@@ -3,32 +3,34 @@ $(function () {
         url: '../mkactivityform/list',
         datatype: "json",
         colModel: [
-            {label: 'mmId', name: 'mmId', index: 'mm_id', key: true, hidden: true},
-            {label: '活动形式名称', name: 'mkName', index: 'mk_name', width: 80, align: 'center'},
-            {label: '活动形式代码', name: 'mkCode', index: 'mk_code', width: 80, align: 'center'},
-            {label: '创建时间', name: 'createTime', index: 'create_time', width: 80, align: 'center',
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }
-            },
-            {label: '创建人', name: 'createrName', width: 80, align: 'center'},
-            {label: '操作', width: 80, align: 'center',
+            {label: '操作', width: 200, align: 'center', frozen: true,
                 formatter: function (value, col, row) {
                     htmlStr = "<button class='btn btn-outline btn-primary' " +
                         "onclick='vm.showMkactivities(\""+row.mkCode+"\")'>管理营销方式</button>";
                     return htmlStr;
                 }
-            }
+            },
+            {label: 'mmId', name: 'mmId', index: 'mm_id', key: true, hidden: true},
+            {label: '活动形式名称', name: 'mkName', index: 'mk_name', width: 200, align: 'center'},
+            {label: '活动形式代码', name: 'mkCode', index: 'mk_code', width: 200, align: 'center'},
+            {label: '创建时间', name: 'createTime', index: 'create_time', width: 200, align: 'center',
+                formatter: function (value) {
+                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
+                }
+            },
+            {label: '创建人', name: 'createrName', width: 200, align: 'center'}
         ],
         viewrecords: true,
-        height: 550,
-        width:1680,
+        height: '100%',
+        width: 1600,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
-        autowidth: false,
+        autowidth: true,
         multiselect: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
         pager: "#jqGridPager",
         jsonReader: {
             root: "page.list",
@@ -46,6 +48,9 @@ $(function () {
         }
     });
 
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
+
     var marketing =
         {'lscx': '临时促销',/*'yhq': '优惠券',*/'rchd': '日常活动','mysy': '买N送一',/*'mj': '满减', 'mz': '满赠','dz': '打折','zhjsp': '组合价商品',*/'drjbj':'第二件半价'};
 

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

@@ -3,6 +3,16 @@ $(function () {
         url: '../mkcentermenu/list',
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 260, align: 'center', sortable: false, frozen: true, formatter: function (value, col, row) {
+                    let htmlStr = "";
+                    htmlStr = "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.updateMenuStoreReal(" + row.menuStoreRealId + ")'><i class='fa fa-qrcode'></i>修改门店营销菜单</button>"
+                    ;
+
+                    return htmlStr;
+                }
+            },
 			{label: 'menuStoreRealId', name: 'menuStoreRealId', index: 'menuStoreRealId', key: true, hidden: true},
 			{label: '菜单名称', name: 'menuName', index: 'menu_name', width: 180, align: 'center'},
 			{label: '菜单描述', name: 'menuDetail', index: 'menu_detail', width: 280, align: 'center'},
@@ -29,17 +39,7 @@ $(function () {
             {label: '修改时间', name: 'modTime', index: 'mod_time', width: 160, align: 'center',
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }},
-            {
-                label: '操作', width: 260, align: 'center', sortable: false, formatter: function (value, col, row) {
-                let htmlStr = "";
-                    htmlStr = "<button class='btn btn-outline btn-primary' " +
-                        "onclick='vm.updateMenuStoreReal(" + row.menuStoreRealId + ")'><i class='fa fa-qrcode'></i>修改门店营销菜单</button>"
-                        ;
-
-                return htmlStr;
-            }}
-
+                }}
             ],
 		viewrecords: true,
         height: 550,
@@ -68,6 +68,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 //菜单树

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

@@ -3,6 +3,16 @@ $(function () {
         url: '../ad/list',
         datatype: "json",
         colModel: [
+            {label: '操作', width: 180, align: 'center', sortable: false, frozen: true,
+                formatter: function (value, col, row) {
+                    if(hasPermission('ad:saveCopyAd')) {
+                        return "&nbsp;&nbsp;&nbsp;&nbsp;<button class='btn btn-primary' " +
+                            "onclick='vm.copyAd(" + row.id + ")'>复制广告</button>";
+                    }else{
+                        return '-';
+                    }
+                }
+            },
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '所属商户', name: 'merchName', index: 'merchName', width: 140, align: 'center'},
             {label: '所属门店', name: 'storeName', index: 'storeName', width: 180},
@@ -27,16 +37,6 @@ $(function () {
                         '<span class="label label-danger">禁用</span>' :
                         '<span class="label label-success">正常</span>';
                 }
-            },
-            {label: '操作', width: 180, align: 'center', sortable: false,
-                formatter: function (value, col, row) {
-                    if(hasPermission('ad:saveCopyAd')) {
-                        return "&nbsp;&nbsp;&nbsp;&nbsp;<button class='btn btn-primary' " +
-                            "onclick='vm.copyAd(" + row.id + ")'>复制广告</button>";
-                    }else{
-                        return '-';
-                    }
-                }
             }],
         viewrecords: true,
         height: 550,
@@ -66,6 +66,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 var vm = new Vue({

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

@@ -4,6 +4,18 @@ $(function () {
         url: '../mallpaymentorderdata/list',
         datatype: "json",
         colModel: [
+			{
+				label: '操作', width: 180, sortable: false,align: 'center', frozen: true,
+				formatter: function (value, col, row) {
+					let htmlStr = '';
+					if (row.payFlag == 'weixin') {
+						htmlStr='<button class="btn btn-outline btn-info" onclick="vm.lookDetailwx(' + row.payOrderId + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
+					}else {
+						htmlStr='<button class="btn btn-outline btn-info" onclick="vm.lookDetailali(' + row.payOrderId + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
+					}
+					return htmlStr;
+				}
+			},
 			{label: '编号', name: 'payOrderId', index: 'pay_order_id', key: true, hidden: true},
 			{label: '商品名称', name: 'merchantName', index: 'merchant_name', width: 80},
 			{label: '商户订单号', name: 'outTradeNo', index: 'out_trade_no', width: 80},
@@ -23,19 +35,7 @@ $(function () {
 			{label: '添加人', name: 'createrSn', index: 'creater_sn', width: 80},
 			{label: '上传时间', name: 'createTime', index: 'create_time', width: 80, formatter: function (value) {
 					return transDate(value,'yyyy-MM-dd hh:mm:ss');
-				}},
-			{
-				label: '操作', width: 180, sortable: false,align: 'center',
-				formatter: function (value, col, row) {
-					let htmlStr = '';
-					if (row.payFlag == 'weixin') {
-						htmlStr='<button class="btn btn-outline btn-info" onclick="vm.lookDetailwx(' + row.payOrderId + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-					}else {
-						htmlStr='<button class="btn btn-outline btn-info" onclick="vm.lookDetailali(' + row.payOrderId + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-					}
-					return htmlStr;
-				}
-			}
+				}}
 			],
 		viewrecords: true,
         height: 550,
@@ -61,6 +61,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
         }
     });
+
+	// 启动冻结列
+	$("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 let vm = new Vue({

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

@@ -20,6 +20,23 @@ $(function () {
         url: url,
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 180, sortable: false,align: 'center', frozen: true,
+                formatter: function (value, col, row) {
+                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
+                    if (row.orderStatus == 201 && (row.orderBizType == '11')) {
+                        htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
+                    }
+                    if (row.orderStatus == 0) {
+                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
+                    }
+                    if (row.orderStatus == 201) {
+                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
+                    }
+
+                    return htmlStr;
+                }
+            },
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 120},
             {label: '门店名称', name: 'storeName', index: 'store_name', align: 'center',width: 120},
@@ -131,30 +148,14 @@ $(function () {
                 formatter: function (value) {
                     return transDate(value, 'yyyy-MM-dd hh:mm:ss');
                 }
-            },
+            }
             // {label: '快递公司', name: 'shippingName', index: 'shipping_name', width: 80},
             // {label: '配送单号', name: 'shippingNo', index: 'shipping_No', width: 80},
             // {label: '快递费用', name: 'shippingFee', index: 'shipping_fee', width: 80},
-            {
-                label: '操作', width: 180, sortable: false,align: 'center',
-                formatter: function (value, col, row) {
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-                    if (row.orderStatus == 201 && (row.orderBizType == '11')) {
-                        htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 0) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
-                    }
-                    if (row.orderStatus == 201) {
-                        htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
-                    }
 
-                    return htmlStr;
-                }
-            }
         ],
         viewrecords: true,
-        height: 575,
+        height: '100%',
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
@@ -180,6 +181,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 let vm = new Vue({

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

@@ -40,6 +40,29 @@ $(function () {
         url: url,
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 180, sortable: false,align: 'center', frozen: true,
+                formatter: function (value, col, row) {
+                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
+                    //订单状态： 0订单创建成功等待付款，　101订单已取消，　102订单已删除，201订单已付款，等待发货，300订单已发货， 301用户确认收货，401 没有发货，退款　402 已收货，退款退货
+                    if(hasPermission('order:printMsg')){
+                        // if (row.orderStatus == 300 && (row.orderBizType == '10' || row.orderBizType == '02')) {
+                        htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
+                        // }
+                    }
+                    if (hasPermission('order:refund')) {
+                        if (row.orderStatus == 0) {
+                            htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
+                        }
+                        if (row.orderStatus == 201) {
+                            if (row.isPaymentSend == 0 || row.isEleOrderSend == 0 || row.isCustomsSend == 0) {
+                                htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
+                            }
+                        }
+                    }
+                    return htmlStr;
+                }
+            },
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             {label: '所属门店', name: 'storeName', index: 'storeName',align: 'center', width: 180},
             {label: '订单号', name: 'orderSn', index: 'order_sn', align: 'center',width: 180},
@@ -156,30 +179,7 @@ $(function () {
                     return value;
                 }
             },
-            {label: '修改人', name: 'moderSn', index: 'moderSn', align: 'center',width: 80},
-            {
-                label: '操作', width: 180, sortable: false,align: 'center',
-                formatter: function (value, col, row) {
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-                    //订单状态： 0订单创建成功等待付款，　101订单已取消，　102订单已删除，201订单已付款，等待发货，300订单已发货， 301用户确认收货，401 没有发货，退款　402 已收货，退款退货
-                    if(hasPermission('order:printMsg')){
-                        // if (row.orderStatus == 300 && (row.orderBizType == '10' || row.orderBizType == '02')) {
-                            htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.printDetail(' + row.id + ')"><i class="fa fa-print"></i>打印</button>&nbsp;';
-                        // }
-                    }
-                    if (hasPermission('order:refund')) {
-                        if (row.orderStatus == 0) {
-                            htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.cancelUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;取消</button>&nbsp;';
-                        }
-                        if (row.orderStatus == 201) {
-                            if (row.isPaymentSend == 0 || row.isEleOrderSend == 0 || row.isCustomsSend == 0) {
-                                htmlStr += '<button class="btn btn-outline btn-danger" onclick="vm.refundUpdate(' + row.id + ')"><i class="fa fa-times-circle-o"></i>&nbsp;退款</button>&nbsp;';
-                            }
-                        }
-                    }
-                    return htmlStr;
-                }
-            }
+            {label: '修改人', name: 'moderSn', index: 'moderSn', align: 'center',width: 80}
         ],
         viewrecords: true,
         height: 550,
@@ -208,6 +208,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 let vm = new Vue({

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

@@ -12,6 +12,23 @@ $(function () {
         url: url,
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 130, sortable: false, align: 'center' , frozen: true,
+                formatter: function (value, col, row) {
+                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
+                    if (hasPermission('order:refund')) {
+                        if (row.refundStatus == 1) {
+                            if (hasPermission('order:refund')) {
+                                htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ', ' + row.id + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;';
+                            }
+                            if(hasPermission('orderrefund:info')){
+                                htmlStr +='<button class="btn btn-outline btn-danger" onclick="vm.approval(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
+                            }
+                        }
+                    }
+                    return htmlStr;
+                }
+            },
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '订单编号', name: 'orderSn', index: 'order_sn',width: 220, align: 'center'},
 			{label: '用户名称', name: 'userName', index: 'username', align: 'center' , width: 80},
@@ -51,23 +68,6 @@ $(function () {
                     }
                     return value;
                 }
-            },
-            {
-                label: '操作', width: 130, sortable: false, align: 'center' ,
-                formatter: function (value, col, row) {
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail(' + row.id + ')"><i class="fa fa-info-circle"></i>详情</button>&nbsp;';
-                    if (hasPermission('order:refund')) {
-                        if (row.refundStatus == 1) {
-                            if (hasPermission('order:refund')) {
-                                htmlStr += '<button class="btn btn-outline btn-primary" onclick="vm.refundUpdate(' + row.orderId + ', ' + row.id + ')"><i class="fa fa-check-circle"></i>&nbsp;退款</button>&nbsp;';
-                            }
-                            if(hasPermission('orderrefund:info')){
-                                htmlStr +='<button class="btn btn-outline btn-danger" onclick="vm.approval(' + row.id + ')"><i class="fa fa-times-circle-o"></i>审核</button>&nbsp;';
-                            }
-                        }
-                    }
-                    return htmlStr;
-                }
             }],
 		viewrecords: true,
         height: '100%',
@@ -96,6 +96,8 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 var vm = new Vue({

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

@@ -4,6 +4,27 @@ $(function () {
         url: url,
         datatype: "json",
         colModel: [
+            {label: '操作', width: 230, sortable: false,align: 'center', frozen: true,
+                formatter: function (value, col, row) {
+                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail('+row.wxOrderId+')"><i class="fa fa-info-circle"></i>失败原因</button>&nbsp;';
+
+                    if (hasPermission('order:resendWxOrder')) {
+                        if (row.clecOrderStatus == 3) {
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发电子订单</button>&nbsp;';
+                        }
+                        if (row.wayOrderStatus == 3) {
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发运单</button>&nbsp;';
+                        }
+                        if (row.playOrderStatus == 3) {
+                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
+                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发支付单</button>&nbsp;';
+                        }
+                    }
+                    return htmlStr;
+                }
+            },
 			{label: 'wxOrderId', name: 'wxOrderId', index: 'id', key: true, hidden: true},
 			// {label: '订单编号', name: 'wxOrderId', index: 'wxOrderId', width: 40},
 			{label: '商户订单编号', name: 'merchOrderId', index: 'merchOrderId',width: 180},
@@ -81,28 +102,8 @@ $(function () {
                     return '-';
                 }
             },
-            {label: '失败原因', name: 'failMsg', index: 'failMsg',width: 450},
-            {label: '操作', width: 230, sortable: false,align: 'center',
-                formatter: function (value, col, row) {
-                    let htmlStr = '<button class="btn btn-outline btn-info" onclick="vm.lookDetail('+row.wxOrderId+')"><i class="fa fa-info-circle"></i>失败原因</button>&nbsp;';
-
-                    if (hasPermission('order:resendWxOrder')) {
-                        if (row.clecOrderStatus == 3) {
-                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
-                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发电子订单</button>&nbsp;';
-                        }
-                        if (row.wayOrderStatus == 3) {
-                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
-                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发运单</button>&nbsp;';
-                        }
-                        if (row.playOrderStatus == 3) {
-                            htmlStr += '<button class="btn btn-outline btn-primary" ' +
-                                'onclick="vm.resendWxOrder(' + row.wxOrderId + ')"><i class="fa fa-check-circle"></i>&nbsp;重发支付单</button>&nbsp;';
-                        }
-                    }
-                    return htmlStr;
-                }
-            }],
+            {label: '失败原因', name: 'failMsg', index: 'failMsg',width: 450}
+            ],
 		viewrecords: true,
         height: 645,
         rowNum: 999,
@@ -130,6 +131,9 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
+
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 });
 
 var vm = new Vue({

kmall-admin/src/main/webapp/js/statis/mkstorepromstat.js

@@ -3,6 +3,15 @@ $(function () {
         url: '../mkstorepromstat/list',
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 160, align: 'center', sortable: false, frozen: true, formatter: function (value, col, row) {
+                    let htmlStr = "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.getOrderInfo(" + row.promId + ")'><i class='fa fa-qrcode'></i>订单明细</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
+                        "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.updateById(" + row.promStatId + ")'><i class='fa fa-qrcode'></i>明细</button>";
+                    return htmlStr;
+                }
+            },
 			{label: 'promStatId', name: 'promStatId', index: 'prom_stat_id', key: true, hidden: true},
 			{label: '推广名称', name: 'promName', index: 'promName', width: 180, align: 'center'},
 			{label: '门店名称', name: 'storeName', index: 'storeName', width: 180, align: 'center'},
@@ -26,15 +35,7 @@ $(function () {
 			// {label: '连带支付件数', name: 'relaPayCaseNum', index: 'rela_pay_case_num', width: 80},
 			{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: 100, align: 'right'},
-            {
-                label: '操作', width: 160, align: 'center', sortable: false, formatter: function (value, col, row) {
-                let htmlStr = "<button class='btn btn-outline btn-primary' " +
-                    "onclick='vm.getOrderInfo(" + row.promId + ")'><i class='fa fa-qrcode'></i>订单明细</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
-                    "<button class='btn btn-outline btn-primary' " +
-                    "onclick='vm.updateById(" + row.promStatId + ")'><i class='fa fa-qrcode'></i>明细</button>";
-                return htmlStr;
-            }}
+			{label: '实收金额', name: 'actMoney', index: 'act_money', width: 100, align: 'right'}
 			// {label: '连带实收金额', name: 'relaActMoney', index: 'rela_act_money', width: 80},
 			// {label: '备注', name: 'note', index: 'note', width: 80},
 			// {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
@@ -71,6 +72,9 @@ $(function () {
         }
     });
 
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
+
     $("#jqGridOrder").jqGrid({
         url: '../mkstorepromstat/promOrderList',
         datatype: "json",

kmall-admin/src/main/webapp/js/statis/mkstoretopicstat.js

@@ -3,6 +3,15 @@ $(function () {
         url: '../mkstoretopicstat/list',
         datatype: "json",
         colModel: [
+            {
+                label: '操作', width: 160, align: 'center', sortable: false, frozen: true, formatter: function (value, col, row) {
+                    let htmlStr = "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.getOrderInfo(" + row.storeTopicId + ")'><i class='fa fa-qrcode'></i>订单明细</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
+                        "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.updateById(" + row.storeTopicStatId + ")'><i class='fa fa-qrcode'></i>明细</button>";
+                    return htmlStr;
+                }
+            },
 			{label: 'storeTopicStatId', name: 'storeTopicStatId', index: 'store_topic_stat_id', key: true, hidden: true},
 			{label: '活动名称', name: 'storeTopicName', index: 'storeTopicName', width: 180, align: 'center'},
             {label: '活动类型', name: 'storeTopicType', index: 'storeTopicType', width: 180, align: 'center'},
@@ -30,7 +39,7 @@ $(function () {
 			// {label: '连带支付件数', name: 'relaPayCaseNum', index: 'rela_pay_case_num', width: 80},
 			{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: 100, align: 'right'},
+			{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'},
@@ -39,15 +48,6 @@ $(function () {
 			// {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
 			// {label: '修改时间', name: 'modTime', index: 'mod_time', width: 80},
 			// {label: '时间戳', name: 'tstm', index: 'tstm', width: 80}
-            {
-                label: '操作', width: 160, align: 'center', sortable: false, formatter: function (value, col, row) {
-                let htmlStr = "<button class='btn btn-outline btn-primary' " +
-                    "onclick='vm.getOrderInfo(" + row.storeTopicId + ")'><i class='fa fa-qrcode'></i>订单明细</button>&nbsp;&nbsp;&nbsp;&nbsp;" +
-                    "<button class='btn btn-outline btn-primary' " +
-                    "onclick='vm.updateById(" + row.storeTopicStatId + ")'><i class='fa fa-qrcode'></i>明细</button>";
-                return htmlStr;
-                }
-            }
 			],
 		viewrecords: true,
         height: 670,
@@ -77,6 +77,8 @@ $(function () {
         }
     });
 
+    // 启动冻结列
+    $("#jqGrid").jqGrid("setFrozenColumns");
 
     $("#jqGridOrder").jqGrid({
         url: '../mkstoretopicstat/storeTopicOrderList',