会员生日优惠配置去除权限，修改样式

kmall-admin/src/main/java/com/kmall/admin/controller/mk/Mk2MemberBirthdayController.java

@@ -31,7 +31,7 @@ public class Mk2MemberBirthdayController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mk2memberbirthday:list")
+//    @RequiresPermissions("mk2memberbirthday:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class Mk2MemberBirthdayController {
      * 查看信息
      */
     @RequestMapping("/info/{mmbId}")
-    @RequiresPermissions("mk2memberbirthday:info")
+//    @RequiresPermissions("mk2memberbirthday:info")
     @ResponseBody
     public R info(@PathVariable("mmbId") Integer mmbId) {
         Mk2MemberBirthdayEntity mk2MemberBirthday = mk2MemberBirthdayService.queryObject(mmbId);
@@ -61,7 +61,7 @@ public class Mk2MemberBirthdayController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mk2memberbirthday:save")
+//    @RequiresPermissions("mk2memberbirthday:save")
     @ResponseBody
     public R save(@RequestBody Mk2MemberBirthdayEntity mk2MemberBirthday) {
         mk2MemberBirthdayService.save(mk2MemberBirthday);
@@ -73,7 +73,7 @@ public class Mk2MemberBirthdayController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mk2memberbirthday:update")
+//    @RequiresPermissions("mk2memberbirthday:update")
     @ResponseBody
     public R update(@RequestBody Mk2MemberBirthdayEntity mk2MemberBirthday) {
         mk2MemberBirthdayService.update(mk2MemberBirthday);
@@ -85,7 +85,7 @@ public class Mk2MemberBirthdayController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mk2memberbirthday:delete")
+//    @RequiresPermissions("mk2memberbirthday:delete")
     @ResponseBody
     public R delete(@RequestBody Integer[]mmbIds) {
         mk2MemberBirthdayService.deleteBatch(mmbIds);

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

@@ -16,15 +16,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mk2memberbirthday:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mk2memberbirthday:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mk2memberbirthday:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -49,21 +43,21 @@
             <Form-item label="是否有效" prop="isValid">
                 <i-input v-model="mk2MemberBirthday.isValid" placeholder="是否有效"/>
             </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mk2MemberBirthday.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mk2MemberBirthday.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mk2MemberBirthday.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="modTime">
-                <i-input v-model="mk2MemberBirthday.modTime" placeholder="修改时间"/>
-            </Form-item>
-            <Form-item label="时间戳" prop="tstm">
-                <i-input v-model="mk2MemberBirthday.tstm" placeholder="时间戳"/>
-            </Form-item>
+            <!--<Form-item label="创建人编号" prop="createrSn">-->
+                <!--<i-input v-model="mk2MemberBirthday.createrSn" placeholder="创建人编号"/>-->
+            <!--</Form-item>-->
+            <!--<Form-item label="创建时间" prop="createTime">-->
+                <!--<i-input v-model="mk2MemberBirthday.createTime" placeholder="创建时间"/>-->
+            <!--</Form-item>-->
+            <!--<Form-item label="修改人编号" prop="moderSn">-->
+                <!--<i-input v-model="mk2MemberBirthday.moderSn" placeholder="修改人编号"/>-->
+            <!--</Form-item>-->
+            <!--<Form-item label="修改时间" prop="modTime">-->
+                <!--<i-input v-model="mk2MemberBirthday.modTime" placeholder="修改时间"/>-->
+            <!--</Form-item>-->
+            <!--<Form-item label="时间戳" prop="tstm">-->
+                <!--<i-input v-model="mk2MemberBirthday.tstm" placeholder="时间戳"/>-->
+            <!--</Form-item>-->
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -4,16 +4,33 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'mmbId', name: 'mmbId', index: 'mmb_id', key: true, hidden: true},
-			{label: '活动名称', name: 'topicName', index: 'topic_name', width: 80},
-			{label: '优惠类型 00.按比例  10.按金额', name: 'topicType', index: 'topic_type', width: 80},
-			{label: '优惠金额', name: 'topicPrice', index: 'topic_price', width: 80},
-			{label: '优惠比例', name: 'topicProportion', index: 'topic_proportion', width: 80},
-			{label: '是否有效', name: 'isValid', index: 'is_valid', 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: 'topicName', index: 'topic_name', width: 280},
+			{label: '优惠类型 00.按比例  10.按金额', name: 'topicType', index: 'topic_type', width: 180,align: 'center',
+                formatter: function (value) {
+                    if (value == '00') {
+                        return '按比例';
+                    } else if (value == '10') {
+                        return '按金额';
+                    }
+                    return '-';
+                }},
+			{label: '优惠金额', name: 'topicPrice', index: 'topic_price', align: 'right',width: 180},
+			{label: '优惠比例', name: 'topicProportion', index: 'topic_proportion',align: 'right', width: 180},
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 120,align: 'center',
+                formatter: function (value) {
+                    if (value == '是') {
+                        return '<span class="label label-success">是</span>';
+                    }
+                    return '<span class="label label-danger">否</span>';
+                }},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', 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: 180},
+			{label: '修改时间', name: 'modTime', index: 'mod_time', width: 180,align: 'center',formatter: function (value) {
+                    return transDate(value,'yyyy-MM-dd hh:mm:ss');
+                }}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -21,6 +38,9 @@ $(function () {
         rownumbers: true,
         rownumWidth: 25,
         autowidth: true,
+        shrinkToFit: false,
+        autoScroll: true,   //开启水平滚动条
+        width: 1500,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -35,7 +55,7 @@ $(function () {
             order: "order"
         },
         gridComplete: function () {
-            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
         }
     });
 });