src/pages/chooseByDeps/index.vue

@@ -104,12 +104,8 @@
                 "
                 class="flex items-center mr-[32rpx]"
               >
+                <div class="vDivider mr-[32rpx]"></div>
                 <div
-                  class="vDivider mr-[32rpx]"
-                  v-if="state.chooseMode === 1"
-                ></div>
-                <div
-                  v-if="state.chooseMode === 1"
                   @click.stop="checkCurrentItem(item)"
                   class="flex items-center mr-[32rpx]"
                   :class="{
@@ -574,53 +570,19 @@ const allCheckStatus = computed(() => {
   if (currentCrumbs?.value?.sons?.length === 0) {
     return 'noChecked'
   }
-
-  if (state.chooseMode === 2) {
-    // 检查部门选择状态
-    const allDepsChecked = currentCrumbs?.value?.sons?.every(
-      (son) => son.checkStatus === 'checked',
-    )
-    const someDepsChecked = currentCrumbs?.value?.sons?.some(
-      (son) =>
-        son.checkStatus === 'checked' || son.checkStatus === 'halfChecked',
-    )
-
-    // 检查人员选择状态
-    const currentMemberIds = new Set(
-      currentMembers.value.map((member) => member.ID),
-    )
-    const allMembersChecked =
-      currentMembers.value.length > 0 &&
-      currentMembers.value.every((member) =>
-        membersCheckedKeys.value.some((checked) => checked.ID === member.ID),
-      )
-    const someMembersChecked = currentMembers.value.some((member) =>
-      membersCheckedKeys.value.some((checked) => checked.ID === member.ID),
-    )
-
-    // 综合判断全选状态
-    if (allDepsChecked && allMembersChecked) {
-      return 'checked'
-    } else if (someDepsChecked || someMembersChecked) {
-      return 'halfChecked'
-    }
-    return 'noChecked'
-  }
-
-  // 部门选择模式的原有逻辑
   const allChecked = currentCrumbs?.value?.sons?.every(
     (son) => son.checkStatus === 'checked',
   )
   const someChecked = currentCrumbs?.value?.sons?.some(
     (son) => son.checkStatus === 'checked' || son.checkStatus === 'halfChecked',
   )
-
   if (allChecked) {
     return 'checked'
   } else if (someChecked) {
     return 'halfChecked'
-  }
+  } else {
     return 'noChecked'
+  }
 })
 
 const findNodeById = (node, targetId) => {
@@ -768,46 +730,39 @@ const allCheck = (status) => {
   } else {
     statusT = 'checked'
   }
-
-  // 处理部门选择
   currentCrumbs?.value?.sons?.forEach((item) => {
     const itemT = findNodeById(depTreeMyList.value[0], item.ID)
     if (!itemT) return
-
+    // 更新选中状态
-    if (state.chooseMode === 1) {
-      // 部门选择模式的逻辑保持不变
     checkItemChange(itemT, statusT)
+
+    // 如果是选中状态，同时选中当前按钮
     if (statusT === 'checked') {
       itemT.currentChecked = true
     } else {
+      // 取消选中时，清除当前按钮状态
       itemT.currentChecked = false
     }
-    } else if (state.chooseMode === 2) {
-      // 人员选择模式下的部门处理
-      checkItemChange(itemT, statusT)
-      itemT.showInPopup = true
-    }
   })
 
-  // 人员选择模式下处理成员
   if (state.chooseMode === 2) {
-    if (statusT === 'checked') {
+    const map = new Map()
-      // 全选时，添加所有当前显示的成员
+    if (status === 'noChecked' || status === 'halfChecked') {
-      const newMembers = currentMembers.value.filter(
+      ;[currentMembers.value, membersCheckedKeys.value]
-        (member) =>
+        .flat()
-          !membersCheckedKeys.value.some(
+        .forEach((item) => {
-            (existing) => existing.ID === member.ID,
+          map.set(item.ID, item)
-          ),
+        })
-      )
+      const mergedArray = Array.from(map.values())
-      membersCheckedKeys.value = [...membersCheckedKeys.value, ...newMembers]
+      membersCheckedKeys.value = mergedArray
-    } else {
+    } else if (status === 'checked') {
-      // 取消全选时，移除当前显示的所有成员
+      const filteredArray = computed(() => {
-      const currentMemberIds = new Set(
+        const unSelectArr = new Set(currentMembers.value.map((item) => item.ID))
-        currentMembers.value.map((member) => member.ID),
+        return membersCheckedKeys.value.filter(
-      )
+          (item) => !unSelectArr.has(item.ID),
-      membersCheckedKeys.value = membersCheckedKeys.value.filter(
-        (member) => !currentMemberIds.has(member.ID),
         )
+      })
+      membersCheckedKeys.value = filteredArray.value
     }
   }
 }
@@ -860,46 +815,22 @@ const initCheckedKeys = () => {
 
 const init = async () => {
   crumbsIndex.value = 0
-  // 先清空之前的数据
-  depTreeMyList.value = []
-  crumbs.value = []
-
   await getDepsTreeMy()
   if (depTreeMyList.value.length) {
-    if (state.chooseMode === 1) {
+    // 创建全部节点
-      // 部门选择模式才创建 all 节点
     const allNode = {
       ID: 'all',
       name: t('choose.deps.all'),
-        sons: [...depTreeMyList.value], // 使用浅拷贝避免引用问题
+      sons: depTreeMyList.value,
       staffNum: calculateTotalStaffNum({ sons: depTreeMyList.value }),
     }
     depTreeMyList.value = [allNode]
     crumbs.value = [allNode]
   } else {
-      // 其他模式直接使用原始数据
+    crumbs.value = []
-      crumbs.value = [depTreeMyList.value[0]]
   }
-  }
-
-  if (state.chooseMode === 2) {
-    // 恢复部门选中状态，但只显示父部门
-    depCheckedKeys.value.forEach((item) => {
-      const node = findNodeById(depTreeMyList.value[0], item.ID)
-      if (node) {
-        node.checkStatus = 'checked'
-        // 只有当该节点没有父节点被选中时，才显示在列表中
-        const parentNode = findParentNode(depTreeMyList.value[0], item.ID)
-        if (!parentNode || parentNode.checkStatus !== 'checked') {
-          node.showInPopup = true
-        }
-        updateParentStatus(node)
-      }
-    })
-  } else {
   initCheckedKeys()
 }
-}
 
 const checkCurrentItem = (item) => {
   // 如果节点已经被完全选中，则不允许点击当前按钮