|
|
@@ -138,7 +138,7 @@
|
|
|
</el-button>
|
|
|
<el-button v-if="scope.row.status===0 && scope.row.recorderOpFlag==='true' " size="mini" type="success" @click="startMeeting(scope.row)">开始会议
|
|
|
</el-button>
|
|
|
- <el-button v-if="scope.row.status===1 && scope.row.recorderOpFlag==='true' " v-show="true" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
|
|
|
+ <el-button v-if="scope.row.status===1 && scope.row.recorderOpFlag==='true' " 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>
|
|
|
@@ -310,6 +310,8 @@
|
|
|
<div style="font-size: 24px">{{ pro.meetingName }}</div>
|
|
|
<div>
|
|
|
<el-button @click="projectMeetingDetailVisble = false" size="small">返回</el-button>
|
|
|
+ <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endMeetingClick(pro)">结束会议
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-descriptions title="" border :column="3">
|
|
|
@@ -436,6 +438,10 @@
|
|
|
<div style="font-size: 24px">{{ pro.meetingName }}</div>
|
|
|
<div>
|
|
|
<el-button @click="otherMeetingDetailVisble = false" size="small">返回</el-button>
|
|
|
+
|
|
|
+ <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true' " size="mini" type="primary" @click="endMeetingClick(pro)">结束会议
|
|
|
+ </el-button>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-descriptions title="" border :column="3">
|
|
|
@@ -602,6 +608,7 @@ export default {
|
|
|
endTime: null,
|
|
|
meetingConfirmStatus: 0,
|
|
|
remarks: null,
|
|
|
+ recorderOpFlag:'false',
|
|
|
meetingContents: [{
|
|
|
id: null,
|
|
|
meetingId: null,
|
|
|
@@ -882,6 +889,7 @@ export default {
|
|
|
this.pro.innerAttendees = innerPeople
|
|
|
this.pro.remark = row.remark
|
|
|
this.pro.status = row.status
|
|
|
+ this.pro.recorderOpFlag=row.recorderOpFlag
|
|
|
let meetingId = row.id
|
|
|
this.pro.id = row.id
|
|
|
getMeetingDetailsById(meetingId).then(res => {
|
|
|
@@ -934,6 +942,7 @@ export default {
|
|
|
message: '操作成功!',
|
|
|
type: 'success'
|
|
|
});
|
|
|
+ this.pro.status=2
|
|
|
this.getData(this.formInline);
|
|
|
})
|
|
|
}
|
humingbo