|
@@ -167,7 +167,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="会议时间:" prop="time">
|
|
<el-form-item label="会议时间:" prop="time">
|
|
|
<el-date-picker
|
|
<el-date-picker
|
|
|
- v-model="editForm.startTime"
|
|
|
|
|
|
|
+ v-model="editForm.beginTime"
|
|
|
type="datetime"
|
|
type="datetime"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
format="yyyy-MM-dd HH:mm:ss" default-time="12:00:00"
|
|
format="yyyy-MM-dd HH:mm:ss" default-time="12:00:00"
|
|
@@ -462,6 +462,7 @@ export default {
|
|
|
projectId: null,
|
|
projectId: null,
|
|
|
meetingPlace: '',
|
|
meetingPlace: '',
|
|
|
time: null,
|
|
time: null,
|
|
|
|
|
+ beginTime:null,
|
|
|
startTime:null,
|
|
startTime:null,
|
|
|
endTime:null,
|
|
endTime:null,
|
|
|
outAttendees: '',
|
|
outAttendees: '',
|
|
@@ -629,7 +630,7 @@ export default {
|
|
|
return
|
|
return
|
|
|
}else{
|
|
}else{
|
|
|
let times=[]
|
|
let times=[]
|
|
|
- times.push(this.editForm.startTime)
|
|
|
|
|
|
|
+ times.push(this.editForm.beginTime)
|
|
|
times.push(this.editForm.endTime)
|
|
times.push(this.editForm.endTime)
|
|
|
this.editForm.time=times
|
|
this.editForm.time=times
|
|
|
addMeeting(data).then(response => {
|
|
addMeeting(data).then(response => {
|
|
@@ -1015,7 +1016,7 @@ export default {
|
|
|
return newDate;
|
|
return newDate;
|
|
|
},
|
|
},
|
|
|
chooseMeetingStartTime(){
|
|
chooseMeetingStartTime(){
|
|
|
- let startTime=this.editForm.startTime
|
|
|
|
|
|
|
+ let startTime=this.editForm.beginTime
|
|
|
if(startTime===undefined || startTime===null){
|
|
if(startTime===undefined || startTime===null){
|
|
|
this.$message.error("请选择会议开始时间!")
|
|
this.$message.error("请选择会议开始时间!")
|
|
|
return
|
|
return
|
|
@@ -1028,7 +1029,7 @@ export default {
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
chooseMeetingEndTime(){
|
|
chooseMeetingEndTime(){
|
|
|
- let startTime=this.editForm.startTime
|
|
|
|
|
|
|
+ let startTime=this.editForm.beginTime
|
|
|
let endTime=this.editForm.endTime
|
|
let endTime=this.editForm.endTime
|
|
|
if(startTime===undefined || startTime===null){
|
|
if(startTime===undefined || startTime===null){
|
|
|
this.$message.error("请选择会议开始时间!")
|
|
this.$message.error("请选择会议开始时间!")
|