界面查询修改

kmall-admin/src/main/resources/mybatis/mapper/shop/AddressInfoDao.xml

@@ -105,6 +105,12 @@
 		<if test="storeId != null and storeId.trim() != ''">
 			AND adi.store_id LIKE concat('%',#{storeId},'%')
 		</if>
+		<if test="expressName != null and expressName.trim() != ''">
+			AND ecs.express_name LIKE concat('%',#{expressName},'%')
+		</if>
+		<if test="storeName != null and storeName.trim() != ''">
+			AND ms.store_name LIKE concat('%',#{storeName},'%')
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}

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

@@ -12,6 +12,12 @@
                 <i-col span="4">
                     <i-input v-model="q.storeId" @on-enter="query" placeholder="门店id"/>
                 </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>
+                </i-col>
+                <i-col span="4">
+                    <i-input v-model="q.expressName" @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/addressinfo.js

@@ -70,7 +70,9 @@ let vm = new Vue({
 			],*/
 		},
 		q: {
-			storeId: ''
+			storeId: '',
+			expressName: '',
+			storeName: ''
 		}
 	},
 	methods: {
@@ -222,7 +224,9 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-				storeId: ''
+				storeId: '',
+				expressName: '',
+				storeName: ''
             }
             vm.reload();
 		},
@@ -231,7 +235,7 @@ let vm = new Vue({
 			vm.status='';
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'storeId': vm.q.storeId},
+                postData: {'storeId': vm.q.storeId, 'expressName': vm.q.expressName, 'storeName': vm.q.storeName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');