任务增加开始时间

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,19 +1,19 @@
 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 os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+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
-//         }
-//     } 
-// }
+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/projectInside.vue

@@ -212,6 +212,13 @@
                                 </template>
                             </el-table-column>
                             <!-- <el-table-column prop="endDate" label="截止时间" width="100" ></el-table-column> -->
+                            <el-table-column prop="startDate" label="开始时间" width="100" >
+                                <template slot-scope="scope">
+                                    <!-- <p v-if="scope.row.startDate >= times || scope.row.taskStatus != 0">{{scope.row.startDate}}</p>
+                                    <p style="border-radius: 3px; text-align: center;background: #e62412; color: #fff;" v-else><span>{{scope.row.startDate}}</span></p> -->
+                                    <p>{{scope.row.startDate}}</p>
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="endDate" label="截止时间" width="100" >
                                 <template slot-scope="scope">
                                     <p v-if="scope.row.endDate >= times || scope.row.taskStatus != 0">{{scope.row.endDate}}</p>
@@ -263,12 +270,16 @@
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="截止时间" prop="endDate">
-                    <el-date-picker v-model="addForm.endDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
+                <el-form-item label="开始时间" prop="startDate">
+                    <el-date-picker v-model="addForm.startDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id"></el-date-picker>
                     <span style="margin-left:30px;margin-right:10px;">计划工时</span>
                     <el-input-number :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" v-model="addForm.planHours" style="width:30%;" :min="1" :max="100"  placeholder="请输入计划工作时长，单位小时" ></el-input-number ><span style="margin-left:10px;">小时</span>
                 </el-form-item>
+                <el-form-item label="截止时间" prop="endDate">
+                    <el-date-picker v-model="addForm.endDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
+                    placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id"></el-date-picker>
+                </el-form-item>
                 
                 <el-form-item label="优先级">
                     <el-select v-model="addForm.taskLevel" style="width:100%;" >

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

@@ -191,10 +191,14 @@
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="开始时间" prop="startDate">
+                    <el-date-picker v-model="addForm.startDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
+                    placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id"></el-date-picker>
+                    <span style="margin-left:30px;margin-right:10px;">计划工时</span><el-input-number :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" v-model="addForm.planHours" style="width:30%;" :min="1" :max="100"  placeholder="请输入计划工作时长，单位小时" ></el-input-number ><span style="margin-left:10px;">小时</span>
+                </el-form-item>
                 <el-form-item label="截止时间" prop="endDate">
                     <el-date-picker v-model="addForm.endDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id"></el-date-picker>
-                    <span style="margin-left:30px;margin-right:10px;">计划工时</span><el-input-number :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" v-model="addForm.planHours" style="width:30%;" :min="1" :max="100"  placeholder="请输入计划工作时长，单位小时" ></el-input-number ><span style="margin-left:10px;">小时</span>
                 </el-form-item>
                 
                 <el-form-item label="优先级">