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

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -103,7 +103,7 @@
           </el-select>
 
           <!-- 待审核筛选切换 -->
-          <el-radio-group v-model="stateKey" size="small" v-if="ins == 10 && user.timeType.reportWorkflow == 1" style="margin-left:10px;margin-top:-3.33px" @change="getAuditRateList">
+          <el-radio-group v-model="stateKey" size="small" v-if="ins == 10 && user.timeType.reportWorkflow == 1" style="margin-left:10px;margin-top:-3.33px" @change="stateKeySel">
             <el-radio-button :label="1">项目待审核</el-radio-button>
             <el-radio-button :label="0">部门待审核</el-radio-button>
           </el-radio-group>
@@ -1203,6 +1203,10 @@ export default {
       this.selUserList = this.userList
       this.getList();
     },
+    stateKeySel(){
+      this.page = 1
+      this.getAuditRateList()
+    },
     // 获取人员工时统计表
     getPersonnelList() {
       let parameter = {

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

@@ -191,8 +191,7 @@ export default {
     gantt.ext.tooltips.attach({
       selector: '.gantt_grid [' + gantt.config.task_attribute + ']',
       onmouseenter: (event,node) => {
-        if(node.innerText.lenght > 19){
-          console.log('onmouseenter',event,node);
+        if(node.textContent.length > 19){
           let sdom = document.createElement('span')
           sdom.innerText = node.innerText
           sdom.className = 'tooltiptext'

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

@@ -444,7 +444,7 @@
             },
             // 获取项目
             getPeoject() {
-                this.$axios.post("/project/getProjectList", {})
+                this.$axios.post("/project/getProjectList", {forReport: 1})
                 .then(res => {
                     if(res.code == "ok") {
                         for(var i in res.data) {