2022.5.26

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,7 +2,7 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.15'
-var ip = '192.168.2.39'
+var ip = '192.168.2.15'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

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

@@ -407,7 +407,7 @@
                         </span>
                     </el-form-item>
                     <!--项目管理专业版模式下，项目下的近期执行的任务 -->
-                    <el-form-item label="相关任务" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
+                    <el-form-item label="任务/里程碑" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
                         <el-select v-model="domain.taskId" placeholder="请选择" style="width:75%;margin-right:7%" filterable="true" 
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                             <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>
@@ -507,7 +507,7 @@
                             <el-input :disabled="!canEdit" v-model="domain.customText" style="width:500px;" maxlength="25" show-word-limit></el-input>
                         </el-form-item>
                         <!--项目管理专业版模式下，项目下的近期执行的任务 -->
-                        <el-form-item label="相关任务" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
+                        <el-form-item label="任务/里程碑" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
                             <el-select v-model="domain.taskId" placeholder="请选择" style="width:75%;margin-right:7%" filterable="true" 
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                 <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>