From 3d504f0aec167f15e7298776d1573a42f9eb3c8c Mon Sep 17 00:00:00 2001
From: Ly <503441659@qq.com>
Date: Wed, 2 Apr 2025 16:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=BE=85=E5=A1=AB=E8=A1=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/stuDialog.vue                  | 14 ++++++++++--
 .../registrationGroup/components/stuList.vue  | 22 ++++++++-----------
 .../components/teaDialog.vue                  | 13 ++++++++---
 .../registrationGroup/components/teaList.vue  |  8 ++++++-
 4 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/views/registrationGroup/components/stuDialog.vue b/src/views/registrationGroup/components/stuDialog.vue
index e9176f1..7fff1b6 100644
--- a/src/views/registrationGroup/components/stuDialog.vue
+++ b/src/views/registrationGroup/components/stuDialog.vue
@@ -56,7 +56,10 @@
         />
       </div>
       <div class="dialog-footer">
-        <el-button @click="$emit('update:modelValue', false)">关闭</el-button>
+        <!-- <el-button @click="$emit('update:modelValue', false)">关闭</el-button> -->
+        <el-button 
+        @click="closeDialog"
+          >关闭</el-button>
         <el-button
           type="primary"
           @click="
@@ -64,8 +67,9 @@
               $emit('update:modelValue', false)
               $emit(
                 'selected',
-                tableData.find((o) => o.id === selectedRowId) || {},
+                tableData.find((o) => o.id === selectedRowId),
               )
+              selectedRowId = null
             }
           "
         >
@@ -95,6 +99,12 @@ watch(
 const tableData = reactive<any[]>([])
 const selectedRowId = ref()
 
+//取消
+const closeDialog = ()=>{
+  $emit('update:modelValue', false)
+  $emit('selected', {});
+  selectedRowId.value = null
+}
 // 分页
 const total = ref(0)
 
diff --git a/src/views/registrationGroup/components/stuList.vue b/src/views/registrationGroup/components/stuList.vue
index c8111a3..a6a3eaa 100644
--- a/src/views/registrationGroup/components/stuList.vue
+++ b/src/views/registrationGroup/components/stuList.vue
@@ -126,6 +126,7 @@ import { getTeamList } from '@/api/oldRace'
 import { useRoute } from 'vue-router'
 const route = useRoute()
 const userModel = userStore()
+const visible = ref(false)
 // 是否禁用控件
 const isDisable = ref(false)
 isDisable.value = route.query.info as any
@@ -167,15 +168,7 @@ onMounted(() => {
     })
   }, 500)
 })
-// watch(()=>userModel.userInfo,()=>{
-//   if(tableData.length === 1) return
-//   tableData.push({
-//       userId: userModel.userInfo.id,
-//       realname: userModel.userInfo.realname,
-//       captain: '1',
-//       teamSeq: 1,
-//     })
-// })
+
 const add = () => {
   const length = tableData.push({
     realname: '', // 用户
@@ -193,18 +186,21 @@ const add = () => {
 const target = ref<any>()
 const openDialog = (row: any) => {
   // console.log(row,'row');
-
   visible.value = true
   target.value = row
 }
 
-const visible = ref(false)
-
 // 像数据源中添加数据
 const handleSelected = (row: any = {}) => {
+  // 如果是空对象，删除 tableData 中最后新增的对象
+  if (Object.keys(row).length === 0) {
+    if (tableData.length > 0) {
+      tableData.pop(); // 删除最后一个元素
+    }
+  }
   if (tableData.some((o) => o.userId === row.id)) {
     ElMessage({
-      message: '用户不能多选!',
+      message: '已有该用户，不能重复选择用户!',
       type: 'error',
     })
     return
diff --git a/src/views/registrationGroup/components/teaDialog.vue b/src/views/registrationGroup/components/teaDialog.vue
index 8bf7818..7078ad1 100644
--- a/src/views/registrationGroup/components/teaDialog.vue
+++ b/src/views/registrationGroup/components/teaDialog.vue
@@ -53,7 +53,7 @@
 
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="$emit('update:modelValue', false)">关闭</el-button>
+        <el-button @click="closeDialog">关闭</el-button>
         <el-button
           type="primary"
           @click="
@@ -61,8 +61,9 @@
               $emit('update:modelValue', false)
               $emit(
                 'selected',
-                tableData.find((o) => o.user_id === selectedRowId) || {},
-              )
+                tableData.find((o) => o.id === selectedRowId) || {},
+              );
+              selectedRowId = null; // 清空 selectedRowId 的值
             }
           "
         >
@@ -91,6 +92,12 @@ watch(
 // 数据
 const tableData = reactive<any[]>([])
 const selectedRowId = ref()
+//取消
+const closeDialog = ()=>{
+  $emit('update:modelValue', false)
+  $emit('selected', {});
+  selectedRowId.value = null
+}
 
 // 分页
 const total = ref(0)
diff --git a/src/views/registrationGroup/components/teaList.vue b/src/views/registrationGroup/components/teaList.vue
index a7cde6c..49c147f 100644
--- a/src/views/registrationGroup/components/teaList.vue
+++ b/src/views/registrationGroup/components/teaList.vue
@@ -187,9 +187,15 @@ const visible = ref(false)
 
 // 像数据源中添加数据
 const handleSelected = (row: any = {}) => {
+  // 如果是空对象，删除 tableData 中最后新增的对象
+  if (Object.keys(row).length === 0) {
+    if (tableData.length > 0) {
+      tableData.pop(); // 删除最后一个元素
+    }
+  }
   if (tableData.some((o) => o.teacherid === row.user_id)) {
     ElMessage({
-      message: '用户不能多选!',
+      message: '已有该用户，不能重复选择用户!',
       type: 'error',
     })
     return