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

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;

fhKeeper/formulahousekeeper/timesheet_h5/src/views/review/index.vue

@@ -6,8 +6,8 @@
             <div class="formBatch">
                 <van-checkbox v-model="isAllChecked" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
                 <div style="padding:1vh 2vw">
-                <van-button @click="batchAgree(true)" type="info" size="small">批量通过</van-button>
-                <van-button @click="batchAgree(false)" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
+                <van-button @click="batchAgree(true)" :disabled="!isCanAgree" type="info" size="small">批量通过</van-button>
+                <van-button @click="batchAgree(false)" :disabled="!isCanAgree" type="danger" size="small" style="margin-left:2vw">批量驳回</van-button>
                 </div>
             </div>
             <van-skeleton  v-for="(item,index) in report" :key="index" title avatar :row="3" :loading="false">
@@ -130,7 +130,8 @@
                 nowTime: this.format(new Date(new Date()),"yyyy-MM-dd"),
                 showPicker: false,
                 report: [],
-                flg: false
+                flg: false,
+                isCanAgree: false
             };
         },
         created() {
@@ -142,20 +143,26 @@
                     for(let i in this.report){
                         this.report[i].checked = true
                     }
+                    this.isCanAgree = true
                 }else{
                     for(let i in this.report){
                         this.report[i].checked = false
                     }
+                    this.isCanAgree = false
                 }
             },
             itemChecked(){
                 let isall = true
+                let iscan = false
                 for(let i in this.report){
                     if(!this.report[i].checked){
                         isall = false
+                    }else {
+                        iscan = true
                     }
                 }
                 this.isAllChecked = isall
+                this.isCanAgree = iscan
             },
             batchAgree(bol){
                 const toast = this.$toast.loading({