增加门店管理查询条件

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -170,6 +170,12 @@
 		<if test="id != null">
 			AND s.id = #{id}
 		</if>
+		<if test="merchName != null and merchName.trim() != ''">
+			AND s.merch_name like concat(#{merchName},'%')
+		</if>
+		<if test="provinceName != null and provinceName.trim() != ''">
+			AND s.province_name like concat(#{provinceName},'%')
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -204,6 +210,12 @@
 		<if test="id != null">
 			AND s.id = #{id}
 		</if>
+		<if test="merchName != null and merchName.trim() != ''">
+			AND s.merch_name like concat(#{merchName},'%')
+		</if>
+		<if test="provinceName != null and provinceName.trim() != ''">
+			AND s.province_name like concat(#{provinceName},'%')
+		</if>
 	</select>
 
 	<insert id="save" parameterType="com.kmall.admin.entity.StoreEntity" useGeneratedKeys="true" keyProperty="id">

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

@@ -15,6 +15,12 @@
                 <i-col span="4">
                     <i-input v-model="q.storeNumber" @on-enter="query" placeholder="门店编号"/>
                 </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.merchName" @on-enter="query" placeholder="商户名称"/>
+                </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.provinceName" @on-enter="query" placeholder="省份"/>
+                </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>
             </div>

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

@@ -103,7 +103,9 @@ let vm = new Vue({
         },
         q: {
             storeName: '',
-            storeNumber: ''
+            storeNumber: '',
+            merchName: '',
+            provinceName: ''
         },
         merchList: [],
         thirdMerchantBizList: [],
@@ -229,7 +231,9 @@ let vm = new Vue({
         reloadSearch: function () {
             vm.q = {
                 storeName: '',
-                storeNumber: ''
+                storeNumber: '',
+                merchName: '',
+                provinceName: ''
             }
             vm.reload();
         },
@@ -237,7 +241,7 @@ let vm = new Vue({
             vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'storeName': vm.q.storeName, 'storeNumber': vm.q.storeNumber},
+                postData: {'storeName': vm.q.storeName, 'storeNumber': vm.q.storeNumber, 'merchName': vm.q.merchName, 'provinceName': vm.q.provinceName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
@@ -302,7 +306,10 @@ let vm = new Vue({
         },
         exportStore: function() {
             var params = {};
-            params.storeName = vm.q.storeName, params.storeNumber = vm.q.storeNumber;
+            params.storeName = vm.q.storeName;
+            params.storeNumber = vm.q.storeNumber;
+            params.merchName = vm.q.merchName;
+            params.provinceName = vm.q.provinceName;
             exportFile('#rrapp', '../store/export', params);
         },
     }