Browse Source

调整代码

humingbo 1 year ago
parent
commit
59da8f3882
2 changed files with 13 additions and 3 deletions
  1. 5 2
      src/views/meeting/weekly.vue
  2. 8 1
      src/views/meeting/weeklyRecordsConfirm.vue

+ 5 - 2
src/views/meeting/weekly.vue

@@ -161,7 +161,11 @@ export default {
         if (weekss !== currentWeek) {
           this.workPlans = response.data.workPlan
         }
-        this.meetingId = response.data.meetingId
+        let obj = {};
+        obj = this.meetingData.find(item => {
+          return item.weeks === currentWeek;
+        });
+        this.meetingId =obj.id
       })
     },
     getYearWeek(a, b, c) {
@@ -215,7 +219,6 @@ export default {
           type: 'success'
         });
         this.getData()
-
       });
     },
     addRow() {

+ 8 - 1
src/views/meeting/weeklyRecordsConfirm.vue

@@ -2,7 +2,11 @@
   <div class="app-container">
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
       <div style="font-size: 24px">{{ m.meetingName }}</div>
-      <el-button size="mini" @click="exportPdf" icon="el-icon-download" style="margin-right: 20px">导出</el-button>
+      <div>
+        <el-button size="mini" type="primary" @click="meetingResultConfirm">会议结果确认</el-button>
+        <el-button size="mini" @click="exportPdf"  >导出</el-button>
+      </div>
+
     </div>
     <el-descriptions title="" :column="2" :size="size" border>
       <el-descriptions-item>
@@ -309,6 +313,9 @@ export default {
     exportPdf() {
       downloadPdf(this.meetingId, this.weeks)
     },
+    meetingResultConfirm(){
+      alert('你点击了会议结果确认!')
+    }
   }
 
 }