[lsp]1.新增活动形式查询等

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -99,6 +99,9 @@
 		<if test="mkCode != null and mkCode.trim() != ''">
 			AND mk_code LIKE concat('%',#{mkCode},'%')
 		</if>
+        <if test="topic != null and topic.trim() != ''">
+            AND mka_topic LIKE concat('%',#{topic},'%')
+        </if>
 	</select>
 
 	<select id="queryMkactivitiesList" resultType="com.kmall.admin.entity.mk.MkActivitiesEntity">
@@ -133,6 +136,9 @@
 		<if test="mkCode != null and mkCode.trim() != ''">
 			AND a2.mk_code LIKE concat('%',#{mkCode},'%')
 		</if>
+        <if test="topic != null and topic.trim() != ''">
+            AND mka_topic LIKE concat('%',#{topic},'%')
+        </if>
 		<choose>
 			<when test="sidx != null and sidx.trim() != ''">
 				order by ${sidx} ${order}

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

@@ -31,7 +31,6 @@
         <table id="jqGrid"></table>
         <div id="jqGridPager"></div>
     </Card>
-
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivityForm" :rules="ruleValidate" :label-width="80">
@@ -49,15 +48,16 @@
         </i-form>
 	</Card>
 
+    <!--营销方式-->
     <Card v-show="!showMkactivitiesViewList">
         <p slot="title">{{title}}</p>
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.topic" @on-enter="queryMkactivities" placeholder="名称"/>
                 </i-col>
-                <i-button @click="query">查询</i-button>
-                <i-button @click="reloadSearch">重置</i-button>
+                <i-button @click="queryMkactivities">查询</i-button>
+                <i-button @click="reloadMkactivitiesSearch">重置</i-button>
             </div>
             <div class="buttons-group">
                 <!--#if($shiro.hasPermission("mkactivities:save"))
@@ -78,7 +78,6 @@
         <table id="jqGridOrder"></table>
         <div id="jqGridPagerOrder"></div>
     </Card>
-
     <Card v-show="!showMkactivitiesList">
         <p slot="title">{{title}}</p>
         <i-form ref="formMkactivitiesValidate" :model="mkActivities" :rules="ruleValidate" :label-width="80">

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

@@ -45,6 +45,7 @@ $(function () {
         }
     });
 
+    //营销方式
     $("#jqGridOrder").jqGrid({
         url: '../mkactivityform/queryMkactivitiesList',
         datatype: "json",
@@ -76,19 +77,8 @@ $(function () {
                     return '';
                 }
             },
-            {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', 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: '修改时间', name: 'updateTime', index: 'update_time', width: 80, align: 'center',
-                formatter: function (value) {
-                    return transDate(value, 'yyyy-MM-dd hh:mm:ss');
-                }
-            },
-            {label: '修改人', name: 'moderName', width: 80, align: 'center'}],
+            {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 80, align: 'center'}
+        ],
         viewrecords: true,
         height: 550,
         width:1680,
@@ -132,7 +122,8 @@ let vm = new Vue({
             ]
         },
         q: {
-            name: ''
+            name: '',
+            topic: ''
         },
 
         showMkactivitiesViewList: true,//管理营销方式
@@ -218,9 +209,7 @@ let vm = new Vue({
             });
 		},
         reloadSearch: function() {
-            vm.q = {
-                name: ''
-            }
+            vm.q.name = '';
             vm.reload();
 		},
 		reload: function (event) {
@@ -245,6 +234,9 @@ let vm = new Vue({
 
 
 		/*===营销方式===*/
+        queryMkactivities: function(){
+            vm.reloadMkactivities();
+        },
         showMkactivities: function (mkCode) {
             if(null == mkCode){
                 return;
@@ -257,6 +249,7 @@ let vm = new Vue({
             vm.reloadMkactivitiesSearch();
         },
         reloadMkactivitiesSearch: function() {
+            vm.q.topic = '';
             vm.reloadMkactivities();
         },
         reloadMkactivities: function () {
@@ -266,7 +259,7 @@ let vm = new Vue({
 
             let page = $("#jqGridOrder").jqGrid('getGridParam', 'page');
             $("#jqGridOrder").jqGrid('setGridParam', {
-                postData: {'mkCode': vm.mkCode},
+                postData: {'mkCode': vm.mkCode, 'topic': vm.q.topic},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formMkactivitiesValidate');