2022.5.27 10:40

fhKeeper/formulahousekeeper/timesheet/src/views/project/CostBaseline.vue

@@ -21,7 +21,7 @@
                     </div>
                 </el-col>
                 <el-col :span="12">
-                    <div class="box" :style="nowBaseHeight">
+                    <div class="box" ref="nowBox" :style="'height:' + nowBaseHeight + 'px;'">
                         <label class="lableTxt">当前成本基线</label>
                             <div class="lableCon" v-for="item in nowBaseList" :key="item.id">
                                 <div><span class="gray_label">{{item.baseName}}:</span></div>
@@ -342,9 +342,10 @@
                     if(res.code == 'ok'){
                         this.nowBaseList = res.data
                         // if(res.data.length == 0){
-                            let allboxh = this.$refs.allBox.scrollHeight - 20
+                        this.getBoxHeight()
+                            // let allboxh = this.$refs.allBox.scrollHeight - 20
                             // console.log('getnowbase',allboxh);
-                            this.nowBaseHeight = 'height:' + allboxh + 'px;'
+                            // this.nowBaseHeight =  allboxh
                         // }
                     }else {
                         this.$message({
@@ -414,6 +415,10 @@
             this.getAddList()
             this.getNowBase()
             this.getProjectInfo()
+            },
+            getBoxHeight(){
+                let allboxh = this.$refs.allBox.scrollHeight - 20
+                this.nowBaseHeight =  allboxh
             }
         },
         created() {

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -270,7 +270,7 @@
                     </el-input>
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id"
                     ref="chooseMembTree2" @check-change="onTreeItemChange" :default-checked-keys="alreadyPartArray"
-                    highlight-current  :filter-node-method="filterNode" default-expand-all></el-tree>
+                    highlight-current  :filter-node-method="filterNode"></el-tree>
                 </el-scrollbar>
             </div>
             <div>已选中&nbsp;{{chosenMembCount}}&nbsp;人</div>
@@ -1934,6 +1934,9 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
             handleClick(tab, event) {
                 let pathModel = tab.name;
                 this.$router.push('/'+pathModel+'/'+this.curProjectId);
+                if(tab.name == 'costbaseline'){
+                    this.$refs.costbaseline.refreshPage();
+                }
             },
             showSubTaskList(task) {
                 this.subTaskVisible = true;