Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1382,8 +1382,8 @@
             <div class="tree" style="height:400px">
                 <el-scrollbar style="height:100%">
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id" v-loading="deptMembDataLoading"
-                    ref="chooseMembTree" @check-change="onTreeItemChange" :default-checked-keys="workForm.userId"
-                    highlight-current :filter-node-method="filterNode">
+                    ref="chooseMembTreePersonnel" @check-change="onTreeItemChange" :default-checked-keys="workForm.userId"
+                    highlight-current :filter-node-method="filterNode" :default-expand-all="expandAlltree">
                     <span class="custom-tree-node" slot-scope="{ node }">
                         <span v-if="user.userNameNeedTranslate == '1'">
                             <span v-if="node.data.children">
@@ -8757,6 +8757,9 @@
                         this.deptMembDataLoading = false
                         const userListName = res.data.records.map(item => item.name)
                         this.handleThreeData(userListName)
+                        setTimeout(() => {
+                            this.changeTreeNodeStatus(this.$refs.chooseMembTreePersonnel.store.root)
+                        }, 200)
                     }else{
                         this.deptMembDataLoading = false
                         this.$message({
@@ -8772,6 +8775,17 @@
                     })
                 })
             },
+            changeTreeNodeStatus(node) {
+                console.log(node)
+                let allZt = true
+                node.expanded = allZt
+                for (let i = 0; i < node.childNodes.length; i++) {
+                    node.childNodes[i].expanded = allZt
+                    if (node.childNodes[i].childNodes.length > 0) {
+                        this.changeTreeNodeStatus(node.childNodes[i])
+                    }
+                }
+            },
             // 按周填报获取相关任务
             async getWeeklyTaskList(item) {
                 console.log(item, '<=== 数据')