Merge branch 'develop' into 'test'

src/containers/system/wxAuth/wxAuth.vue

@@ -29,7 +29,7 @@
       </el-pagination>
     </div>
     <drag-dialog class="wxAuthDialog" title="修改" :visible.sync="dialogEditVisible" :before-close="resetEditDialog" width="70%">
-      <el-transfer v-loading="loading" v-model="selected.userId" :props="{ key: 'userId', label: 'name'}" :titles="['未被选中列', '已被选中列']" :data="authUserList">
+      <el-transfer v-loading="loading" v-model="selected.userId" filterable :filter-method="filterMethod" filter-placeholder="请输入姓名" :props="{ key: 'userId', label: 'name'}" :titles="['未被选中列', '已被选中列']" :data="authUserList">
         <div slot-scope="{ option }">
           <span class="auth-name">{{ option.name }}</span>
           <span class="auth-department">{{ option.department }}</span>
@@ -102,7 +102,9 @@ export default {
           this.$message.error(err.msg || '查询失败！');
         });
     },
-    filterMethod() {},
+    filterMethod(query, list) {
+      return list.name.indexOf(query) > -1;
+    },
     updateAuth() {
       const entity = {
         menuId: this.selected.id,