From 2a625a5a4fae64b56c79e3a948b4b8b278208523 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 4 Aug 2023 15:55:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/orderAdd.vue                   | 23 ++++++++++++-------
 .../safetySupervision/components/orderAdd.vue | 23 ++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/views/goverment/qualitySupervision/components/orderAdd.vue b/src/views/goverment/qualitySupervision/components/orderAdd.vue
index 48a16f0..def634c 100644
--- a/src/views/goverment/qualitySupervision/components/orderAdd.vue
+++ b/src/views/goverment/qualitySupervision/components/orderAdd.vue
@@ -428,7 +428,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, reactive } from "vue";
+import { onMounted, ref, watch, reactive, nextTick } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import {
@@ -612,6 +612,7 @@ const getRowDetails = async () => {
 		inspectSignature: [],
 		otherSignature: []
 	};
+	selectedMemberList.value = [];
 	// 工程/项目详细信息
 	if (projectTreeData.value.id == 1) {
 		const res = await getEngineerInfo({ id: projectSelectedData.value.id });
@@ -649,14 +650,20 @@ const getMemberList = async () => {
 	membertableData.value = res.result;
 };
 const selectMember = async () => {
-	selectedMemberList.value.forEach(key => {
-		membertableData.value.forEach(row => {
-			if (row.userId == key.userId) {
-				multipleMemberTable.value.toggleRowSelection(row, true);
-			}
-		});
-	});
 	memberVisible.value = true;
+	if (selectedMemberList.value.length > 0) {
+		selectedMemberList.value.forEach(key => {
+			membertableData.value.forEach(row => {
+				if (row.userId == key.userId) {
+					multipleMemberTable.value.toggleRowSelection(row, true);
+				}
+			});
+		});
+	} else {
+		nextTick(() => {
+			multipleMemberTable.value.clearSelection();
+		});
+	}
 };
 // 删除用户信息
 const handleDeleteItem = async index => {
diff --git a/src/views/goverment/safetySupervision/components/orderAdd.vue b/src/views/goverment/safetySupervision/components/orderAdd.vue
index 1d59d04..9bd2db9 100644
--- a/src/views/goverment/safetySupervision/components/orderAdd.vue
+++ b/src/views/goverment/safetySupervision/components/orderAdd.vue
@@ -427,7 +427,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, reactive } from "vue";
+import { onMounted, ref, watch, reactive, nextTick } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import {
@@ -610,6 +610,7 @@ const getRowDetails = async () => {
 		inspectSignature: [],
 		otherSignature: []
 	};
+	selectedMemberList.value = [];
 	// 工程/项目详细信息
 	if (projectTreeData.value.id == 1) {
 		const res = await getEngineerInfo({ id: projectSelectedData.value.id });
@@ -647,14 +648,20 @@ const getMemberList = async () => {
 	membertableData.value = res.result;
 };
 const selectMember = async () => {
-	selectedMemberList.value.forEach(key => {
-		membertableData.value.forEach(row => {
-			if (row.userId == key.userId) {
-				multipleMemberTable.value.toggleRowSelection(row, true);
-			}
-		});
-	});
 	memberVisible.value = true;
+	if (selectedMemberList.value.length > 0) {
+		selectedMemberList.value.forEach(key => {
+			membertableData.value.forEach(row => {
+				if (row.userId == key.userId) {
+					multipleMemberTable.value.toggleRowSelection(row, true);
+				}
+			});
+		});
+	} else {
+		nextTick(() => {
+			multipleMemberTable.value.clearSelection();
+		});
+	}
 };
 // 删除用户信息
 const handleDeleteItem = async index => {