里程碑增加完成时间，项目概览里程碑调整

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,8 +1,8 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.15'
 var ip = '192.168.2.15'
+// var ip = '192.168.2.39'
 // 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/project/info.vue

@@ -162,7 +162,7 @@
                         :key="index"
                         :color="task.taskStatus==0?'#ddd':'#830BE2'"
                         size="large"
-                        :timestamp="task.endDate">
+                        :timestamp="task.taskTex">
                         {{task.name}}
                         </el-timeline-item>
                     </el-timeline>
@@ -1317,6 +1317,14 @@
                 },
                 res => {
                     if (res.code == "ok") {
+                        console.log(res.data, '里程碑数据')
+                        for(var i in res.data) {
+                            if(res.data[i].taskStatus == 1) {
+                                res.data[i].taskTex = '完成于 ' + res.data[i].finishDate
+                            } else {
+                                res.data[i].taskTex = '截止于 ' + res.data[i].endDate
+                            }
+                        }
                         this.mileStoneList = res.data;
                         this.mileStoneList.unshift( {id:-1, name:'开始', taskStatus:1});
                         

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

@@ -311,7 +311,10 @@
                     <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" @change="DateChange()" v-if="!timelabel"></el-date-picker>
                     <span style="margin-left:30px;margin-right:10px;" v-if="!timelabel">截止时间</span>
-                    <el-date-picker v-model="addForm.endDate" type="date" value-format="yyyy-MM-dd"  
+                    <el-date-picker style="width:40%;" v-model="addForm.endDate" type="date" value-format="yyyy-MM-dd"  
+                    placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" @change="DateChange()"></el-date-picker>
+                    <span style="margin-left:30px;margin-right:10px;" v-if="timelabel && mileageCup">完成时间</span>
+                    <el-date-picker style="width:40%;" v-if="timelabel && mileageCup" v-model="addForm.finishDate" type="date" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" @change="DateChange()"></el-date-picker>
                     </el-form-item>
                 <div style="border: 1px solid #ddd;margin:5px 0;padding:5px 0;">
@@ -869,6 +872,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
         
         data() {
             return {
+                mileageCup: false,
                 loadingExport : false,
                 saveTemplateLoading: false,
                 joinMembList:[],
@@ -2091,6 +2095,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
             },
             // 点击卡片事件
             editTask(task) {
+                this.mileageCup = true
                 // console.log('editTask',task)
                 if(task.taskType == 1){
                     this.timelabel = true
@@ -2228,6 +2233,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 });
             },
             addTask(stage) {
+                this.mileageCup = false
                 this.addFormVisible = true;
                 this.addForm = {projectId: stage.projectId, groupId: stage.groupId, stagesId: stage.id, taskLevel:0, planHours: 8, taskType: 0};
                 this.addForm.executorListFront = [{executorId:null, planHours:this.user.timeType.allday}];