|
@@ -115,8 +115,8 @@ export default {
|
|
|
title : '技术部周会',
|
|
title : '技术部周会',
|
|
|
size: '',
|
|
size: '',
|
|
|
tableData:[],
|
|
tableData:[],
|
|
|
- meetingId:30,
|
|
|
|
|
- weeks:46,
|
|
|
|
|
|
|
+ meetingId:null,
|
|
|
|
|
+ weeks:null,
|
|
|
m:{
|
|
m:{
|
|
|
id:null,
|
|
id:null,
|
|
|
meetingName: '',
|
|
meetingName: '',
|
|
@@ -143,27 +143,42 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ },
|
|
|
|
|
+ created() {
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
mounted() {
|
|
mounted() {
|
|
|
|
|
+ this.meetingId=this.$route.query.meetingId;
|
|
|
|
|
+ this.weeks=this.$route.query.weeks;
|
|
|
this.getData()
|
|
this.getData()
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
getData() {
|
|
getData() {
|
|
|
- //获取当前周会会议id与所属周数
|
|
|
|
|
- getMeetingByWeekss().then(res =>{
|
|
|
|
|
- let data=res.data;
|
|
|
|
|
- if(data!=null){
|
|
|
|
|
- this.meetingId=data.id
|
|
|
|
|
- this.weeks=data.weeks
|
|
|
|
|
- getWeeksRecordsByWeeks(this.meetingId,this.weeks).then(res => {
|
|
|
|
|
- this.tableData=res.data.workContent
|
|
|
|
|
- this.getSpanArr(this.tableData);
|
|
|
|
|
- this.m=res.data.meeting
|
|
|
|
|
- })
|
|
|
|
|
- }else{
|
|
|
|
|
- this.tableData=[]
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ let meetingId=this.meetingId
|
|
|
|
|
+ let weeks=this.weeks
|
|
|
|
|
+ if(meetingId!=null && weeks!=null){
|
|
|
|
|
+ getWeeksRecordsByWeeks(meetingId,weeks).then(res => {
|
|
|
|
|
+ this.tableData=res.data.workContent
|
|
|
|
|
+ this.getSpanArr(this.tableData);
|
|
|
|
|
+ this.m=res.data.meeting
|
|
|
|
|
+ })
|
|
|
|
|
+ }else {
|
|
|
|
|
+ //获取当前周会会议id与所属周数
|
|
|
|
|
+ getMeetingByWeekss().then(res => {
|
|
|
|
|
+ let data = res.data;
|
|
|
|
|
+ if (data != null) {
|
|
|
|
|
+ this.meetingId = data.id
|
|
|
|
|
+ this.weeks = data.weeks
|
|
|
|
|
+ getWeeksRecordsByWeeks(this.meetingId, this.weeks).then(res => {
|
|
|
|
|
+ this.tableData = res.data.workContent
|
|
|
|
|
+ this.getSpanArr(this.tableData);
|
|
|
|
|
+ this.m = res.data.meeting
|
|
|
|
|
+ })
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.tableData = []
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|