From 934045afe60fff29ad312b13da3685cc04d6f06c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 11 Sep 2023 17:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86-=E7=8F=AD?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/team.js          | 18 ++++++++
 src/views/wms/team/index.vue | 79 +++++++++++++++++++++++-------------
 2 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/src/api/wms/team.js b/src/api/wms/team.js
index 45de22a..8a57917 100644
--- a/src/api/wms/team.js
+++ b/src/api/wms/team.js
@@ -9,6 +9,24 @@ export function listTeam(query) {
 	});
 }
 
+// 查询班组列表
+export function listTeamMembers(query) {
+  return request({
+    url: '/wms/teamUser/listTeamMembers',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询班组列表
+export function getRightList(query) {
+  return request({
+    url: '/wms/teamUser/getRightList',
+    method: 'get',
+    params: query
+  });
+}
+
 // 查询班组详细
 export function getTeam(teamId) {
 	return request({
diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue
index a55e237..c2dd005 100644
--- a/src/views/wms/team/index.vue
+++ b/src/views/wms/team/index.vue
@@ -216,7 +216,7 @@
           </el-col>
           </el-row>
 			</el-form>
-			<!-- <el-divider></el-divider>
+			<el-divider></el-divider>
 			<el-card>
         <div style="text-align: center">
          <template>
@@ -224,6 +224,7 @@
               filterable
               filter-placeholder="请输入班组人员名称"
               :titles="['可选班组人员', '当前班组人员']"
+              :button-texts="['解除添加', '添加']"
               :data="leftList"
               v-model="rightList"
               style="text-align: left"
@@ -231,7 +232,7 @@
             </el-transfer>
           </template>
         </div>
-       </el-card> -->
+       </el-card>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -241,7 +242,7 @@
 </template>
 
 <script>
-import { listTeam, getTeam, delTeam, addTeam, updateTeam ,listTeamMembers} from "@/api/wms/team";
+import { listTeam, getTeam, delTeam, addTeam, updateTeam ,listTeamMembers,getRightList} from "@/api/wms/team";
 
 export default {
 	name: "Team",
@@ -263,10 +264,10 @@ export default {
 			// 班组表格数据
 			teamList: [],
 			teamMembersList:[],
-	// 		// 可选（左边）
-    //   leftList: [],
-    //   // 已选（右边，只需要key）
-    //   rightList: [],
+			// 可选（左边）
+      leftList: [],
+      // 已选（右边，只需要key）
+      rightList: [],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -330,24 +331,24 @@ export default {
     indexMethod(index) {
       return index + 1;
     },
-    // getTeamMembers() {
-    //   // 调用查询课程列表接口
-    //   listTeamMembers(this.queryParams).then(response => {
-    //     for(let i in response.rows){
-    //     // 将返回的列表赋值于穿梭框左边列表
-    //       this.leftList.push({
-    //       key: response.rows[i].userId,
-    //       label: response.rows[i].userName
-    //     })
-    //     }
-    //     for(let i in response.selected){
-    //     // 将返回的列表赋值于穿梭框左边列表
-    //     this.rightList.push(response.selected[i].key);
-    //     this.form.rightData = this.rightList;
-    //     }
-    //     this.loading = false;
-    //   });
-    // },
+    getTeamMembers() {
+      // 调用列表接口
+      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
+        })
+        }
+        for(let i in response.selected){
+        this.rightList.push(response.selected[i].key);
+        this.form.rightData = this.rightList;
+        }
+        this.loading = false;
+      });
+    },
 		/** 查询班组列表 */
 		getList() {
 			this.loading = true;
@@ -388,7 +389,6 @@ export default {
 				teamProperties: null,
 				attendanceQuantity: null,
 				assignedQuantity: null
-				// rightData: null
 			};
 			this.resetForm("form");
 		},
@@ -411,18 +411,39 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.rightList = [];
 			this.open = true;
 			this.title = "添加班组";
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
+		  this.rightList = [];
 			this.reset();
 			const teamId = row.teamId || this.ids
+	// 		listTeamMembers(this.queryParams).then(response => {
+    //     console.log(response.rows);
+    //     for(let i in response.rows){
+    //       // 将返回的列表赋值于穿梭框左边列表
+    //       this.leftList.push({
+    //       id:response.rows[i].userId,
+    //       key: response.rows[i].userId,
+    //       label: response.rows[i].userName
+    //       })
+    //     }
+    //   });
+      console.log('this.leftList',this.leftList);
 			getTeam(teamId).then(response => {
 				this.form = response.data;
-				this.open = true;
-				this.title = "修改班组";
-			});
+				for(let i in response.data.selectedData){
+          // 将返回的列表赋值于穿梭框右边列表
+          this.rightList.push(
+            response.data.selectedData[i].userId
+          )
+        };
+        console.log('response.data.selectedData',response.data.selectedData);
+			})
+			this.open = true;
+      this.title = "修改班组";
 		},
 		/** 提交按钮 */
 		submitForm() {