修改bug

src/views/meeting/meeting.vue

@@ -85,7 +85,7 @@
           </el-button>
           <el-button v-if="scope.row.status===0" size="mini" type="danger" @click="deleteMeeting( scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status!==0 && (scope.row.meetingType===2 || scope.row.meetingType===1)" type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
+          <el-button v-if="scope.row.status!==0 " type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
           </el-button>
         </template>
       </el-table-column>
@@ -291,6 +291,48 @@
       </div>
     </el-dialog>
 
+    <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog">
+      <el-descriptions title="会议记录详情" border :column="2">
+        <el-descriptions-item label="会议主题">
+          {{ pro.meetingName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="会议类别">
+          {{ pro.external }}
+        </el-descriptions-item>
+        <el-descriptions-item label="会议类型">
+          {{ pro.meetingType }}
+        </el-descriptions-item>
+        <el-descriptions-item label="会议地点">
+          {{ pro.meetingPlace }}
+        </el-descriptions-item>
+        <el-descriptions-item label="会议时间">
+          {{ pro.times }}
+        </el-descriptions-item>
+        <el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
+          {{ pro.outAttendees }}
+        </el-descriptions-item>
+        <el-descriptions-item label="记录人员" :span="2">
+          {{ pro.recorder }}
+        </el-descriptions-item>
+        <el-descriptions-item label="内部参会人员">
+          {{ pro.innerAttendees }}
+        </el-descriptions-item>
+        <el-descriptions-item label="参会情况" >
+          {{ pro.remark }}
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
+        <el-table-column label="序号" width="60" type="index"></el-table-column>
+        <el-table-column label="会议内容" prop="content"></el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="closeotherMeetingDailog">取消</el-button>
+      </div>
+    </el-dialog>
+
+
+
   </div>
 </template>
 
@@ -311,6 +353,7 @@ export default {
   data() {
     return {
       projectMeetingDetailVisble: false,
+      otherMeetingDetailVisble:false,
       tableData: [],
       pageparm: {
         current: 1,
@@ -504,8 +547,14 @@ export default {
     },
     meetingDetail(row) {
       let meetingType = row.meetingType
-      if (meetingType === 2) {
-        this.projectMeetingDetailVisble = true
+
+      if (meetingType !== 1) {
+        if(row.meetingType==2){
+          this.projectMeetingDetailVisble = true
+        }else{
+          this.otherMeetingDetailVisble = true
+        }
+
         this.pro.meetingName = row.meetingName
         this.pro.outAttendees = row.outAttendees
         this.pro.innerAttendees = row.innerAttendees
@@ -680,8 +729,12 @@ export default {
         });
         this.closeProjectMeetingDailog();
       });
+    },
+    closeotherMeetingDailog(){
+      this.otherMeetingDetailVisble=false;
     }
   }
+
 }
 </script>