浏览代码

修改bug

humingbo 2 年之前
父节点
当前提交
cbd2eafa84
共有 2 个文件被更改,包括 37 次插入18 次删除
  1. 5 1
      src/views/meeting/meeting.vue
  2. 32 17
      src/views/meeting/weeklyRecords.vue

+ 5 - 1
src/views/meeting/meeting.vue

@@ -548,7 +548,11 @@ export default {
         });
       }
       if(meetingType===1){
-        alert("Please select 点击了周会详情")
+        let params={
+          meetingId: row.id,
+          weeks:row.weeks
+        }
+        this.$router.push({ path: '/meeting/weeklyRecords',query:params });
       }
     },
     openUsers() {

+ 32 - 17
src/views/meeting/weeklyRecords.vue

@@ -115,8 +115,8 @@ export default {
       title : '技术部周会',
       size: '',
       tableData:[],
-      meetingId:30,
-      weeks:46,
+      meetingId:null,
+      weeks:null,
       m:{
         id:null,
         meetingName: '',
@@ -143,27 +143,42 @@ export default {
 
 
     }
+  },
+  created() {
+
   },
   mounted() {
+    this.meetingId=this.$route.query.meetingId;
+    this.weeks=this.$route.query.weeks;
     this.getData()
   },
   methods: {
     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 = []
+          }
+        })
+      }
 
     },