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

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,18 +1,18 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-var ip = '192.168.2.6'
+// var ip = '192.168.2.21'
 // var ip = '192.168.2.12'// 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/workReport/daily.vue

@@ -319,12 +319,12 @@
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                             <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
                         </el-select>
-                        <span  v-if="domain.subProjectList != null && domain.subProjectList.length> 0"
+                        <span v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                             style="margin-left:45px;">子项目</span>
 
                         <!--子项目 -->
                         <el-select v-model="domain.subProjectId" placeholder="请选择子项目" style="width:200px;margin-left:10px;" clearable="true"
-                            v-if="domain.subProjectList != null && domain.subProjectList.length> 0"
+                            v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="updateSubProject">
                             <el-option v-for="item in domain.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
@@ -413,11 +413,11 @@
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                 <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
                             </el-select>
-                            <span  v-if="domain.subProjectList != null && domain.subProjectList.length> 0"
+                            <span  v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                                 style="margin-left:45px;">子项目</span>
                             <!--子项目 -->
                             <el-select v-model="domain.subProjectId" placeholder="请选择子项目" style="width:200px;margin-left:10px;" clearable="true"
-                             v-if="domain.subProjectList != null && domain.subProjectList.length> 0"
+                            v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="updateSubProject">
                                 <el-option v-for="item in domain.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                             </el-select>
@@ -2381,7 +2381,9 @@
             },
             //项目选中了， 加载子项目
             selectProject(domain, index) {
-                // console.log(domain, index, '加载')
+                if(domain.projectId == ""){
+                    return
+                }
                 this.http.post('/sub-project/list',{
                     projectId: domain.projectId
                 },