Merge remote-tracking branch 'origin/master'

src/views/wms/team/index.vue

@@ -218,7 +218,7 @@
 			</el-form>
 			<el-divider></el-divider>
 			<el-card>
-        <div style="text-align: center">
+        <div style="text-align: center" >
          <template>
             <el-transfer
               filterable
@@ -335,13 +335,15 @@ export default {
     },
     getTeamMembers() {
       // 调用列表接口
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 2000;
       listTeamMembers(this.queryParams).then(response => {
         console.log(response.rows);
         for(let i in response.rows){
         // 将返回的列表赋值于穿梭框左边列表
           this.leftList.push({
           key: response.rows[i].userId,
-          label: response.rows[i].userName
+          label: response.rows[i].teamUserName
         })
         }
         for(let i in response.selected){
@@ -499,3 +501,13 @@ export default {
 	}
 };
 </script>
+
+<style>
+    .el-transfer-panel{
+        width: 320px;
+        height: 400px;
+    }
+    .el-transfer-panel__list.is-filterable{
+        height: 300px;
+    }
+</style>