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

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,11 +1,8 @@
 var path = require('path')
 
- var ip = '127.0.0.1'
+//  var ip = '127.0.0.1'
 // var ip = '192.168.2.36'
-
- 
-// var ip = '47.100.37.243' 
-// var ip = '192.168.2.178'
+var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
@@ -15,7 +12,7 @@ var path = require('path')
 //         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
 //             ip = val.address
 //         }
-//     }
+//     } 
 // }
 
 module.exports = {

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

@@ -73,7 +73,7 @@
             </el-table-column> -->
             <el-table-column prop="totalCost" label="总成本" ></el-table-column>
         </el-table>
-        
+         
         <el-form :inline="true" >
             <el-form-item >
                 <!-- <el-checkbox style="margin-left:10px;" v-model="assignNoProUser" @click="assignToProject">均摊无项目人员成本</el-checkbox> -->

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

@@ -423,9 +423,13 @@
             <!-- <el-input style="width:100%" v-model="filterName" placeholder="请输入姓名搜索" @change="findUserInTree"></el-input> -->
             <div class="tree" style="height:400px">
                 <el-scrollbar style="height:100%">
+                    <el-input
+                    placeholder="输入关键字进行过滤"
+                    v-model="filterText">
+                    </el-input>
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id"
                     ref="chooseMembTree" @check-change="onTreeItemChange" :default-checked-keys="addForm.userId"
-                    highlight-current ></el-tree>
+                    highlight-current  :filter-node-method="filterNode" default-expand-all></el-tree>
                 </el-scrollbar>
             </div>
             <div>已选中&nbsp;{{chosenMembCount}}&nbsp;人</div>
@@ -598,7 +602,8 @@ a {
                 },
                 ause: [],
                 auseList: [],
-                yonghuUser: []
+                yonghuUser: [],
+                filterText: ''
             };
         },
         // 过滤器
@@ -620,9 +625,18 @@ a {
                 return intPartFormat + '.' + floatPart
                 }
                 return intPartFormat + floatPart
+            },
+        },
+        watch: {
+            filterText(val) {
+                this.$refs.chooseMembTree.filter(val);
             }
         },
         methods: {
+            filterNode(value, data) {
+                if (!value) return true;
+                return data.label.indexOf(value) !== -1;
+            },
             //重启项目
             restartPro(row) {
                 this.http.post('/project/start',{id: row.id},