xiaoxin 1 rok pred
rodič
commit
8f8a74b9bc

+ 1 - 1
src/api/activityManagement/index.js

@@ -57,7 +57,7 @@ export function exportActivityExcel(data) {
 /** 设置活动管理员 */
 /** 设置活动管理员 */
 export function setImageAdmin(data) {
 export function setImageAdmin(data) {
   return request({
   return request({
-    url: "/alumniAdminApply/setImageAdmin",
+    url: "/alumniAdminApply/setActivityAdmin",
     method: "post",
     method: "post",
     data
     data
   })
   })

+ 22 - 14
src/views/alumni-organization/index.vue

@@ -107,6 +107,7 @@ const handleCreateOrUpdate = () => {
         }
         }
       })
       })
     })
     })
+
     formData.value.admins = newArr
     formData.value.admins = newArr
 
 
     const api = formData.value.id === undefined ? insertClubDataApi : updateClubDataApi
     const api = formData.value.id === undefined ? insertClubDataApi : updateClubDataApi
@@ -174,6 +175,7 @@ const handleUpdate = (row) => {
   isEdit.value = true
   isEdit.value = true
   formData.value.admins = row.admins
   formData.value.admins = row.admins
   formData.value.admin = row.admins.map((item) => item.id)
   formData.value.admin = row.admins.map((item) => item.id)
+  allData.value = row.admins
   userData.value = transformData(row.admins)
   userData.value = transformData(row.admins)
   // 默认勾选
   // 默认勾选
   checkUserList.value = row.admins.map((item) => item.id)
   checkUserList.value = row.admins.map((item) => item.id)
@@ -334,23 +336,29 @@ const handleNodeClick = (e) => {
     departmentId: e.id
     departmentId: e.id
   })
   })
     .then(({ data }) => {
     .then(({ data }) => {
-      formData.value.admins = data.list.map((item) => ({
-        id: item.id,
-        name: item.name,
-        cardNumber: item.cardNumber
-      }))
+      // formData.value.admins = data.list.map((item) => ({
+      //   id: item.id,
+      //   name: item.name,
+      //   cardNumber: item.cardNumber
+      // }))
+      formData.value.admins = data.list
+
       userData.value = transformData(data.list)
       userData.value = transformData(data.list)
 
 
       // 数组去重
       // 数组去重
-      if (allData.value.length) {
-        const flag = allData.value.some((item) => item.id == formData.value.admins[0].id)
+      const map = new Map()
+      const uniqueArray = []
+
+      const newArr = [...allData.value, ...formData.value.admins]
 
 
-        if (!flag) {
-          allData.value.push(formData.value.admins[0])
+      newArr.forEach((item) => {
+        if (!map.has(item.id)) {
+          map.set(item.id, true)
+          uniqueArray.push(item)
         }
         }
-      } else {
-        allData.value.push(formData.value.admins[0])
-      }
+      })
+
+      allData.value = uniqueArray
     })
     })
     .catch(() => {
     .catch(() => {
       userData.value = []
       userData.value = []
@@ -499,9 +507,9 @@ onBeforeMount(() => {
       <template #footer>
       <template #footer>
         <el-button @click="dialogVisible = false">取消</el-button>
         <el-button @click="dialogVisible = false">取消</el-button>
         <el-button v-if="formData.id === undefined" type="primary" @click="handleCreateOrUpdate" :loading="loading"
         <el-button v-if="formData.id === undefined" type="primary" @click="handleCreateOrUpdate" :loading="loading"
-          >立即创建</el-button
+          >创建</el-button
         >
         >
-        <el-button v-else type="primary" @click="handleCreateOrUpdate" :loading="loading">立即修改</el-button>
+        <el-button v-else type="primary" @click="handleCreateOrUpdate" :loading="loading">编辑</el-button>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
     <!-- 选择管理员 -->
     <!-- 选择管理员 -->