Merge remote-tracking branch 'origin/master' into master

src/views/meeting/meeting.vue

@@ -305,8 +305,14 @@
     </el-dialog>
 
     <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen
-               :close-on-click-modal="false">
-      <el-descriptions title="会议记录详情" border :column="3">
+               :close-on-click-modal="false" >
+      <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
+        <div style="font-size: 24px">{{ pro.meetingName }}</div>
+        <div>
+          <el-button @click="projectMeetingDetailVisble = false"  size="small">返回</el-button>
+        </div>
+      </div>
+      <el-descriptions title="" border :column="3">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
         </el-descriptions-item>
@@ -426,7 +432,13 @@
 
     <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog" fullscreen
                :close-on-click-modal="false">
-      <el-descriptions title="会议记录详情" border :column="3">
+      <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
+        <div style="font-size: 24px">{{ pro.meetingName }}</div>
+        <div>
+          <el-button @click="otherMeetingDetailVisble = false"  size="small">返回</el-button>
+        </div>
+      </div>
+      <el-descriptions title="" border :column="3">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
         </el-descriptions-item>
@@ -476,7 +488,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="closeotherMeetingDailog">取消</el-button>
+        <el-button size="mini" @click="closeotherMeetingDailog" v-if="false">取消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/meeting/weeklyRecords.vue

@@ -3,6 +3,7 @@
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
       <div style="font-size: 24px">{{ m.meetingName }}</div>
       <div>
+        <el-button @click="jumpPage"  size="mini">返回</el-button>
         <el-button v-if="m.status===1" size="mini" type="primary" @click="endMeetingClick(m)">结束会议
         </el-button>
         <el-button size="mini" @click="meetingResultConfirm"  v-if="meetingResultConfirmVisible" type="primary"  style="margin-right: 20px">会议结果确认</el-button>
@@ -674,6 +675,9 @@ export default {
         }
       })
     },
+    jumpPage(){
+      this.$router.go(-1);
+    }
   }
 }
 </script>