|
|
@@ -154,7 +154,20 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="completionTime" label="截止时间" width="150">
|
|
|
+
|
|
|
+ <el-table-column prop="completionTime" label="开始日期" width="150">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="scope.row.beginDate"
|
|
|
+ type="date"
|
|
|
+ size="mini"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期" style="width: 140px">
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="completionTime" label="截止日期" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.completionTime"
|
|
|
@@ -168,12 +181,11 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="op" label="操作" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="primary" v-if="scope.row.id!==null" size="mini" @click="updateWorkPlan(scope.row)">修改</el-button>
|
|
|
- <el-button type="primary" v-if="scope.row.id===null" size="mini" @click="addWorkPlanData(scope.row)">新增</el-button>
|
|
|
- <el-button type="danger" v-if="scope.row.id!==null" size="mini" @click="deleteWorkPlanByIds(scope.row)">删除</el-button>
|
|
|
- <el-button type="danger" v-if="scope.row.id===null" size="mini" @click="deleteRow(scope.$index, scope.row)">移除</el-button>
|
|
|
+ <el-button type="primary" v-if="(scope.row.taskId===undefined || scope.row.taskId===null) && scope.row.id!==null" size="mini" @click="updateWorkPlan(scope.row)">修改</el-button>
|
|
|
+ <el-button type="primary" v-if="(scope.row.taskId===undefined || scope.row.taskId===null) && scope.row.id===null" size="mini" @click="addWorkPlanData(scope.row)">新增</el-button>
|
|
|
+ <el-button type="danger" v-if="(scope.row.taskId===undefined || scope.row.taskId===null) && scope.row.id!==null" size="mini" @click="deleteWorkPlanByIds(scope.row)">删除</el-button>
|
|
|
+ <el-button type="danger" v-if="(scope.row.taskId===undefined || scope.row.taskId===null) && scope.row.id===null" size="mini" @click="deleteRow(scope.$index, scope.row)">移除</el-button>
|
|
|
</template>
|
|
|
-
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-dialog>
|
|
|
@@ -494,7 +506,9 @@ export default {
|
|
|
completionTimes: null,
|
|
|
completionTime: null,
|
|
|
projectId: null,
|
|
|
- userId:null
|
|
|
+ userId:null,
|
|
|
+ taskId:null,
|
|
|
+ beginDate:null
|
|
|
}
|
|
|
this.workPlanDatas.push(row)
|
|
|
},
|
|
|
@@ -507,9 +521,14 @@ export default {
|
|
|
this.$message.warning("请输入工作内容!")
|
|
|
return
|
|
|
}
|
|
|
+ let beginDate=row.beginDate
|
|
|
+ if(beginDate===null || beginDate===''){
|
|
|
+ this.$message.warning("请选择开始日期!")
|
|
|
+ return
|
|
|
+ }
|
|
|
let completionTime=row.completionTime
|
|
|
if(completionTime===null || completionTime===''){
|
|
|
- this.$message.warning("请选择截止时间!")
|
|
|
+ this.$message.warning("请选择截止日期!")
|
|
|
return
|
|
|
}
|
|
|
let userId=this.row.executor
|
|
|
@@ -520,7 +539,8 @@ export default {
|
|
|
completionTime:new Date(completionTime).getTime(),
|
|
|
meetingId:this.meetingId,
|
|
|
userId:userId,
|
|
|
- weeks:weeks
|
|
|
+ weeks:weeks,
|
|
|
+ beginDate:new Date(beginDate).getTime()
|
|
|
}
|
|
|
addWorkPlan(data).then(res=>{
|
|
|
this.$message.success("操作成功!")
|
|
|
@@ -531,6 +551,11 @@ export default {
|
|
|
},
|
|
|
updateWorkPlan(row){
|
|
|
let id=row.id;
|
|
|
+ let beginDate=row.beginDate
|
|
|
+ if(beginDate===null || beginDate===''){
|
|
|
+ this.$message.warning("请选择开始日期!")
|
|
|
+ return
|
|
|
+ }
|
|
|
let completionTime=row.completionTime
|
|
|
if(completionTime===null || completionTime===''){
|
|
|
this.$message.warning("请选择截止时间!")
|
|
|
@@ -540,7 +565,8 @@ export default {
|
|
|
id:id,
|
|
|
planContent:row.planContent,
|
|
|
projectId:row.projectId,
|
|
|
- completionTime:new Date(completionTime).getTime()
|
|
|
+ completionTime:new Date(completionTime).getTime(),
|
|
|
+ beginDate:new Date(beginDate).getTime()
|
|
|
}
|
|
|
updateWorkPlan(data).then(res=>{
|
|
|
this.$message.success("操作成功!")
|