解决bug

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,18 +2,18 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.20'
-// var ip = '192.168.2.12'
+var ip = '192.168.2.6'
 // var ip = '47.100.37.243' 
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

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

@@ -217,7 +217,7 @@
                 </el-form-item>
 
                 <!-- 研究中心 -->
-                <el-form-item :label="yonghuUser.customDegreeName">
+                <el-form-item :label="yonghuUser.customDegreeName" v-if="user.timeType.customDegreeActive != 0">
                     <el-select v-model="auseList" multiple placeholder="请选择" filterable="true" style="width: 100%">
                         <span v-for="(item, index) in ause" :key="index">
                         <el-option :label="item.name" :value="item.id"></el-option>

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

@@ -756,12 +756,12 @@
         
         <!-- 按部门选择人员 -->
         <el-dialog title="选择需要代填报的人员"  v-if="chooseParticipVisible" :visible.sync="chooseParticipVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
-            <!-- <el-input style="width:100%" v-model="filterName" placeholder="请输入姓名搜索" @change="findUserInTree"></el-input> -->
+            <el-input style="width:100%" v-model="deptMembDataText" placeholder="请输入姓名搜索"></el-input>
             <div class="tree" style="height:400px">
                 <el-scrollbar style="height:100%">
                 <el-tree :data="deptMembData" show-checkbox :props="defaultProps" node-key="id"
                     ref="chooseMembTree" @check-change="onTreeItemChange" :default-checked-keys="workForm.userId"
-                    highlight-current ></el-tree>
+                    highlight-current :filter-node-method="filterNode"></el-tree>
                 </el-scrollbar>
             </div>
             <div>已选中&nbsp;{{chosenMembCount}}&nbsp;人</div>
@@ -1337,9 +1337,15 @@
                 monthnotTotal: 0,
                 monthnotTotalPage: 0,
                 monthnotTotalLages: 20,
-                monthnotworkDateS1: []
+                monthnotworkDateS1: [],
+                deptMembDataText: ''
             };
         },
+        watch: {
+            deptMembDataText(val) {
+                this.$refs.chooseMembTree.filter(val);
+            }
+        },
         filters: {
             // 过滤
             amounts(value) {
@@ -1365,6 +1371,11 @@
             
         },
         methods: {
+            filterNode(value, data) {
+                // console.log(value, data, '搜索')
+                if (!value) return true;
+                return data.label.indexOf(value) !== -1;
+            },
             triggerCalculateOT(index) {
                 var str = this.workForm.domains[index].overtimeHours + ''
                 if(str.indexOf('.') != '-1') {