From a199afe1ff7ec281cacd63c3b53c61fb9b6d5cca Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 4 Aug 2023 15:29:29 +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                   | 31 +++++++++++--------
 .../safetySupervision/components/orderAdd.vue | 30 ++++++++++--------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/views/goverment/qualitySupervision/components/orderAdd.vue b/src/views/goverment/qualitySupervision/components/orderAdd.vue
index 24c5931..48a16f0 100644
--- a/src/views/goverment/qualitySupervision/components/orderAdd.vue
+++ b/src/views/goverment/qualitySupervision/components/orderAdd.vue
@@ -498,6 +498,7 @@ const basicData = ref({
 const dialogStyle = ref({
 	"min-width": "824px"
 });
+const noConfirmMemberList = ref([]); // 未确认时的选中的检查人员列表
 const selectedMemberList = ref([]); // 选中的检查人员列表
 const selectedSmallList = ref([]); // 选中的小项列表
 // 设置日期的禁用状态
@@ -574,14 +575,19 @@ const addDangerRecord = () => {
 };
 const confirmMemberSelected = () => {
 	let selectedtext = "";
-	for (let i = 0; i < selectedMemberList.value.length; i++) {
-		if (i == selectedMemberList.value.length - 1) {
-			selectedtext += selectedMemberList.value[i].realName;
-		} else {
-			selectedtext += selectedMemberList.value[i].realName + ",";
+	selectedMemberList.value = noConfirmMemberList.value;
+	if (selectedMemberList.value.length > 0) {
+		for (let i = 0; i < selectedMemberList.value.length; i++) {
+			if (i == selectedMemberList.value.length - 1) {
+				selectedtext += selectedMemberList.value[i].realName;
+			} else {
+				selectedtext += selectedMemberList.value[i].realName + ",";
+			}
 		}
+		basicData.value.selectedMember = selectedtext;
+	} else {
+		basicData.value.selectedMember = "";
 	}
-	basicData.value.selectedMember = selectedtext;
 	memberVisible.value = false;
 };
 const projectRowClick = row => {
@@ -643,8 +649,6 @@ const getMemberList = async () => {
 	membertableData.value = res.result;
 };
 const selectMember = async () => {
-	console.log(membertableData.value);
-	console.log(selectedMemberList.value);
 	selectedMemberList.value.forEach(key => {
 		membertableData.value.forEach(row => {
 			if (row.userId == key.userId) {
@@ -684,7 +688,8 @@ const uploadSuccess = (response: any, index: number) => {
 // 	console.log(selectedMemberList.value);
 // };
 const handleSelectionChange = val => {
-	selectedMemberList.value = val;
+	noConfirmMemberList.value = val;
+	// selectedMemberList.value = val;
 	console.log(val);
 };
 // const handleSelectionAllChange = val => {
@@ -744,10 +749,10 @@ const allSubmit = async () => {
 		ElMessage.error("请选择工程/项目");
 		return;
 	}
-	// if (!basicData.value.selectedMember) {
-	// 	ElMessage.error("请选择检查人员");
-	// 	return;
-	// }
+	if (!basicData.value.selectedMember) {
+		ElMessage.error("请选择检查人员");
+		return;
+	}
 	if (!basicData.value.deadline) {
 		ElMessage.error("请选择整改期限");
 		return;
diff --git a/src/views/goverment/safetySupervision/components/orderAdd.vue b/src/views/goverment/safetySupervision/components/orderAdd.vue
index b94ed5a..1d59d04 100644
--- a/src/views/goverment/safetySupervision/components/orderAdd.vue
+++ b/src/views/goverment/safetySupervision/components/orderAdd.vue
@@ -496,6 +496,7 @@ const basicData = ref({
 const dialogStyle = ref({
 	"min-width": "824px"
 });
+const noConfirmMemberList = ref([]); // 未确认时的选中的检查人员列表
 const selectedMemberList = ref([]); // 选中的检查人员列表
 const selectedSmallList = ref([]); // 选中的小项列表
 // 设置日期的禁用状态
@@ -572,14 +573,19 @@ const addDangerRecord = () => {
 };
 const confirmMemberSelected = () => {
 	let selectedtext = "";
-	for (let i = 0; i < selectedMemberList.value.length; i++) {
-		if (i == selectedMemberList.value.length - 1) {
-			selectedtext += selectedMemberList.value[i].realName;
-		} else {
-			selectedtext += selectedMemberList.value[i].realName + ",";
+	selectedMemberList.value = noConfirmMemberList.value;
+	if (selectedMemberList.value.length > 0) {
+		for (let i = 0; i < selectedMemberList.value.length; i++) {
+			if (i == selectedMemberList.value.length - 1) {
+				selectedtext += selectedMemberList.value[i].realName;
+			} else {
+				selectedtext += selectedMemberList.value[i].realName + ",";
+			}
 		}
+		basicData.value.selectedMember = selectedtext;
+	} else {
+		basicData.value.selectedMember = "";
 	}
-	basicData.value.selectedMember = selectedtext;
 	memberVisible.value = false;
 };
 const projectRowClick = row => {
@@ -641,8 +647,6 @@ const getMemberList = async () => {
 	membertableData.value = res.result;
 };
 const selectMember = async () => {
-	console.log(membertableData.value);
-	console.log(selectedMemberList.value);
 	selectedMemberList.value.forEach(key => {
 		membertableData.value.forEach(row => {
 			if (row.userId == key.userId) {
@@ -671,7 +675,7 @@ const uploadSuccess = (response: any, index: number) => {
 	}
 };
 const handleSelectionChange = val => {
-	selectedMemberList.value = val;
+	noConfirmMemberList.value = val;
 	console.log(val);
 };
 const handleSmallSelectionChange = val => {
@@ -727,10 +731,10 @@ const allSubmit = async () => {
 		ElMessage.error("请选择工程/项目");
 		return;
 	}
-	// if (!basicData.value.selectedMember) {
-	// 	ElMessage.error("请选择检查人员");
-	// 	return;
-	// }
+	if (!basicData.value.selectedMember) {
+		ElMessage.error("请选择检查人员");
+		return;
+	}
 	if (!basicData.value.deadline) {
 		ElMessage.error("请选择整改期限");
 		return;