材料采集相关问题修改

common/common.js

@@ -289,21 +289,21 @@ export const getDeptTreeData = (list) => {
 
     const arr = []
 
-    list.forEach(one => {
+    list.forEach((one,oneIndex) => {
         const { name, id, groupVOS } = one
         const objectOne = {
             label: name,
-            id: id,
+            id: `${id}_${oneIndex}`,
             children: []
         }
         arr.push(objectOne)
 
         if (groupVOS && groupVOS.length) {
-            groupVOS.forEach(two => {
+            groupVOS.forEach((two,twoIndex) => {
                 const { groupId, groupName, groupUserVOS } = two
                 const objectTwo = {
                     label: groupName,
-                    id: groupId,
+                    id: `${groupId}_${oneIndex}_${twoIndex}`,
                     children: []
                 }
                 objectOne.children.push(objectTwo)

pages/materialCollection/taskOverview/selectObjectNoDedup.vue

@@ -23,7 +23,7 @@
 				ref="treeRef"
 				theme-color="#2E64FA"
 				v-model="state.defaultCheckedKeys"
-				:default-expand-all="true"
+				:default-expand-all="false"
 				:expand-on-click-node="true"
 				:checked-disabled="true"
 				:filter-value="state.searchWord"
@@ -33,9 +33,7 @@
 			>
 			<template #append="{ data,node }">
 			    <!-- data 是你传入的原始数据项，可读任意业务字段 -->
-			    <text v-if="data?.children?.length" style="color:#87918b; font-size:17rpx;">
-				  <uni-icons :type="node.expanded?'down':'right'" style="font-size: 28rpx;color: #999999;"></uni-icons>
-			    </text>
+			    <uni-icons v-if="data?.children?.length" :type="node.expanded?'down':'right'" style="font-size: 28rpx;color: #999999;"></uni-icons>
 			  </template>
 			</uni-tree-view>
 		</view>

reqApi/notification.js

@@ -90,7 +90,7 @@ export const ChangeReviewStatus = (data) => {
 }
 // 查询本学校下的当前学年的所有部门及部门下的人
 export const findDepartContainUser = (schoolYearId) => {
-  return request.get(`/api/v1/teaching_plan/collect/target_loading/find_depart_contain_user?schoolYearId=${schoolYearId}`)
+  return request.get(`/api/v1/teaching_plan/collect/target_loading/find_depart_contain_user_all?schoolYearId=${schoolYearId}`)
 }
 //查询本学校下的当前学年的所有学科、年级、权限数据及下的人
 export const findCollectPersonalInfo = (schoolYearId) => {