|
@@ -304,14 +304,12 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen
|
|
|
- :close-on-click-modal="false" >
|
|
|
+ <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen :close-on-click-modal="false" >
|
|
|
<div style="display: flex;justify-content: space-between;margin-bottom: 8px">
|
|
|
<div style="font-size: 24px">{{ pro.meetingName }}</div>
|
|
|
<div>
|
|
|
<el-button @click="backBtnClick" size="small">返回</el-button>
|
|
|
- <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endProMeetingClick(pro)">结束会议
|
|
|
- </el-button>
|
|
|
+ <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endProMeetingClick(pro)">结束会议</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-descriptions title="" border :column="3">
|
|
@@ -574,7 +572,8 @@ export default {
|
|
|
meetingType: null,
|
|
|
status: null,
|
|
|
searchAuthFlag: false,
|
|
|
- chooseType:'0'
|
|
|
+ chooseType:'0',
|
|
|
+ toDoMeeting:null,
|
|
|
|
|
|
},
|
|
|
editFormVisible: false,
|
|
@@ -655,6 +654,7 @@ export default {
|
|
|
mounted() {
|
|
|
this.getData(this.formInline);
|
|
|
this.getDeptUserTrees();
|
|
|
+ this.formInline.status = this.$route.query.status;
|
|
|
},
|
|
|
methods: {
|
|
|
getDeptUserTrees() {
|