|
|
@@ -31,15 +31,12 @@
|
|
|
<el-button icon="el-icon-refresh" @click="resetSearch()">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
-
|
|
|
<el-row :gutter="10" style="margin-bottom:8px">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="success" icon="el-icon-plus" @click="createMeeting">创建会议</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
</div>
|
|
|
-
|
|
|
<el-table
|
|
|
:data="tableData"
|
|
|
border
|
|
|
@@ -51,7 +48,6 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="会议主题" prop="meetingName">
|
|
|
</el-table-column>
|
|
|
-
|
|
|
<el-table-column label="会议地点" prop="meetingPlace" width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="address" label="参会人员" :show-overflow-tooltip="true">
|
|
|
@@ -113,7 +109,7 @@
|
|
|
</el-button>
|
|
|
<el-button v-if="scope.row.status===0" size="mini" type="success" @click="startMeeting(scope.row)">开始会议
|
|
|
</el-button>
|
|
|
- <el-button v-if="scope.row.status===1" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
|
|
|
+ <el-button v-if="scope.row.status===1" v-show="false" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
|
|
|
</el-button>
|
|
|
<el-button v-if="scope.row.status!==0 " type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
|
|
|
</el-button>
|
|
|
@@ -166,17 +162,6 @@
|
|
|
<el-form-item label="会议地点:" prop="meetingPlace" :rules="[{required:true,message: '请输入会议地点', trigger: 'blur'}]">
|
|
|
<el-input size="mini" v-model="editForm.meetingPlace"></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item v-show="false" label="会议时间:">-->
|
|
|
- <!-- <el-date-picker-->
|
|
|
- <!-- v-model="editForm.time"-->
|
|
|
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
- <!-- format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
- <!-- type="datetimerange"-->
|
|
|
- <!-- range-separator="至"-->
|
|
|
- <!-- start-placeholder="开始日期"-->
|
|
|
- <!-- end-placeholder="结束日期">-->
|
|
|
- <!-- </el-date-picker>-->
|
|
|
- <!-- </el-form-item>-->
|
|
|
<el-form-item label="会议时间:" prop="time">
|
|
|
<el-date-picker
|
|
|
v-model="editForm.beginTime"
|
|
|
@@ -445,7 +430,7 @@ import {
|
|
|
startMeetingById,
|
|
|
meetingAuthById,
|
|
|
meetingDeleteAuth,
|
|
|
- endMeeting, editMeetingContent
|
|
|
+ endMeeting, editMeetingContent, getMeetingContentsByMeetingId
|
|
|
} from '@/api/meeting/meeting'
|
|
|
import {getDeptUserTree} from '@/api/system/user'
|
|
|
import {getProjectList} from "@/api/task/project";
|
|
|
@@ -1115,6 +1100,11 @@ export default {
|
|
|
}
|
|
|
return data.name.indexOf(value) !== -1;
|
|
|
},
|
|
|
+ getMeetingContentsByMeetingIds(id){
|
|
|
+ getMeetingContentsByMeetingId(id).then(res => {
|
|
|
+ console.log(JSON.stringify(res.data))
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|