|
|
@@ -356,20 +356,25 @@
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="周期时间" width="300">
|
|
|
+ <el-table-column label="开始日期" width="180" prop="beginTime">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker size="mini"
|
|
|
- v-model="scope.row.times"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- format="yyyy-MM-dd"
|
|
|
- type="daterange"
|
|
|
- style="width: 100%"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期" @change="editMeetingContents(scope.row)">
|
|
|
+ v-model="scope.row.beginTime" format="yyyy-MM-dd"
|
|
|
+ type="date" style="width: 150px"
|
|
|
+ placeholder="选择开始日期" @change="editMeetingContents(scope.row)">
|
|
|
</el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="结束日期" width="180" prop="endTime">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-date-picker size="mini"
|
|
|
+ v-model="scope.row.endTime" format="yyyy-MM-dd"
|
|
|
+ type="date" style="width: 150px"
|
|
|
+ placeholder="选择结束日期" @change="editMeetingContents(scope.row)">
|
|
|
+ </el-date-picker>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button v-if="pro.status!==0 && pro.meetingConfirmStatus===0" type="success" size="mini"
|
|
|
@@ -1012,17 +1017,22 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
let data = this.pro.meetingContents;
|
|
|
+ let datas=[]
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
|
let t = data[i];
|
|
|
- if (t.question === '' || t.optionss === '' || t.executorName === '' || t.times === null || t.times.length === 0) {
|
|
|
+ if (t.question === '' || t.optionss === '' || t.executorName === '' || t.beginTime === null || t.endTime === null) {
|
|
|
this.$message({
|
|
|
message: '请将信息填写完整!',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
+ t.beginTime=new Date(t.beginTime).getTime()
|
|
|
+ t.endTime=new Date(t.endTime).getTime()
|
|
|
+ t.times=[]
|
|
|
+ datas.push(t)
|
|
|
}
|
|
|
- saveMeetingOptionss(data).then(res => {
|
|
|
+ saveMeetingOptionss(datas).then(res => {
|
|
|
this.$message({
|
|
|
message: '操作成功!',
|
|
|
type: 'success'
|
|
|
@@ -1102,6 +1112,13 @@ export default {
|
|
|
},
|
|
|
editMeetingContents(row) {
|
|
|
let data = row;
|
|
|
+ if(row.beginTime!==undefined && row.beginTime!=null){
|
|
|
+ data.beginTime=new Date(row.beginTime).getTime();
|
|
|
+ }
|
|
|
+ if(row.endTime!==undefined && row.endTime!=null){
|
|
|
+ data.endTime=new Date(row.endTime).getTime()
|
|
|
+ }
|
|
|
+ data.times=[]
|
|
|
editMeetingContent(data).then(res => {
|
|
|
// this.$message.success("操作成功!")
|
|
|
});
|