|
@@ -50,6 +50,21 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="会议地点" prop="meetingPlace" width="120">
|
|
<el-table-column label="会议地点" prop="meetingPlace" width="120">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="会议内容" prop="meetingContent" width="80">
|
|
|
|
|
+ <scope slot-scope="scope">
|
|
|
|
|
+ <el-popover
|
|
|
|
|
+ placement="bottom"
|
|
|
|
|
+ :title="meetingTitle"
|
|
|
|
|
+ width="600"
|
|
|
|
|
+ trigger="click">
|
|
|
|
|
+ <el-table :data="meetingContents" border stripe>
|
|
|
|
|
+ <el-table-column width="60" type="index" label="序号"></el-table-column>
|
|
|
|
|
+ <el-table-column min-width="300" property="content" label="内容"></el-table-column>
|
|
|
|
|
+ </el-table>
|
|
|
|
|
+ <span style="color: blue" slot="reference" @click="searchMeetingContent(scope.row)">会议内容</span>
|
|
|
|
|
+ </el-popover>
|
|
|
|
|
+ </scope>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="address" label="参会人员" :show-overflow-tooltip="true">
|
|
<el-table-column prop="address" label="参会人员" :show-overflow-tooltip="true">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.outAttendees }}</span>
|
|
<span>{{ scope.row.outAttendees }}</span>
|
|
@@ -531,8 +546,10 @@ export default {
|
|
|
endTime: null,
|
|
endTime: null,
|
|
|
times: []
|
|
times: []
|
|
|
}],
|
|
}],
|
|
|
- row: null,
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ row: null
|
|
|
|
|
+ },
|
|
|
|
|
+ meetingContents:[],
|
|
|
|
|
+ meetingTitle:''
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// 注册组件
|
|
// 注册组件
|
|
@@ -1100,9 +1117,12 @@ export default {
|
|
|
}
|
|
}
|
|
|
return data.name.indexOf(value) !== -1;
|
|
return data.name.indexOf(value) !== -1;
|
|
|
},
|
|
},
|
|
|
- getMeetingContentsByMeetingIds(id){
|
|
|
|
|
|
|
+ searchMeetingContent(row){
|
|
|
|
|
+ let id=row.id
|
|
|
|
|
+ this.meetingTitle=row.meetingName
|
|
|
getMeetingContentsByMeetingId(id).then(res => {
|
|
getMeetingContentsByMeetingId(id).then(res => {
|
|
|
- console.log(JSON.stringify(res.data))
|
|
|
|
|
|
|
+ let contents=res.data
|
|
|
|
|
+ this.meetingContents=contents
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|