Merge branch 'test' into 'master'

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" filterable :filter-method="filterMethod" filter-placeholder="请输入姓名" :props="{ key: 'userId', label: 'name'}" :titles="['未被选中列', '已被选中列']" :data="authUserList">
+      <el-transfer :key="transferId" v-loading="loading" v-model="selected.userId" filterable :filter-method="filterMethod" filter-placeholder="请输入姓名/科室/电话" :props="{ key: 'userId', label: 'name'}" :titles="['未被选中列', '已被选中列']" :data="allAuthList">
         <div slot-scope="{ option }">
           <span class="auth-name">{{ option.name }}</span>
           <span class="auth-department">{{ option.department }}</span>
@@ -61,6 +61,7 @@ export default {
       filters: {
         name: '',
       },
+      transferId: '',
     };
   },
   computed: {
@@ -68,9 +69,8 @@ export default {
     ...mapGetters('system/wxAuth', ['list', 'pagination']),
     allAuthList() {
       return this.authUserList.map(item => ({
-        key: item.userId,
-        label: item.name,
-        disabled: false,
+        ...item,
+        query: item.name + item.department + item.cellphone,
       }));
     },
   },
@@ -87,6 +87,7 @@ export default {
       };
     },
     showUserAuth(data) {
+      this.transferId = data.row.id;
       fetchAuthUserList({
         id: data.row.id,
       })
@@ -103,7 +104,7 @@ export default {
         });
     },
     filterMethod(query, list) {
-      return list.name.indexOf(query) > -1;
+      return list.query.indexOf(query) > -1;
     },
     updateAuth() {
       const entity = {