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

src/views/meeting/meeting.vue

@@ -115,7 +115,7 @@
       </el-table-column>
       <el-table-column prop="status" label="确认状态" width="80">
         <template slot-scope="scope">
-          <div style="color: red" v-if="scope.row.meetingConfirmStatus===0 && (scope.row.meetingType===1 || scope.row.meetingType===2)">
+          <div style="color: red" v-if="scope.row.status!==0 && scope.row.meetingConfirmStatus===0 && (scope.row.meetingType===1 || scope.row.meetingType===2)">
             未确认
           </div>
           <div style="color: green"
@@ -132,13 +132,13 @@
             </el-table-column>-->
       <el-table-column label="操作" prop="op" width="300">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.status!==2" size="mini" type="primary" @click="handleEdit(scope.row)">编辑
+          <el-button v-if="scope.row.status!==2 && scope.row.recorderOpFlag==='true'"  size="mini" type="primary" @click="handleEdit(scope.row)">编辑
           </el-button>
-          <el-button v-if="scope.row.status===0" size="mini" type="danger" @click="deleteMeeting(scope.row)">删除
+          <el-button v-if="scope.row.status===0 && scope.row.recorderOpFlag==='true' " size="mini" type="danger" @click="deleteMeeting(scope.row)">删除
           </el-button>
-          <el-button v-if="scope.row.status===0" size="mini" type="success" @click="startMeeting(scope.row)">开始会议
+          <el-button v-if="scope.row.status===0 && scope.row.recorderOpFlag==='true' " size="mini" type="success" @click="startMeeting(scope.row)">开始会议
           </el-button>
-          <el-button v-if="scope.row.status===1" v-show="true" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
+          <el-button v-if="scope.row.status===1 && scope.row.recorderOpFlag==='true' " v-show="true" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
           </el-button>
           <el-button v-if="scope.row.status!==0 " type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
           </el-button>
@@ -306,44 +306,52 @@
 
     <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen
                :close-on-click-modal="false">
-      <el-descriptions title="会议记录详情" border :column="2">
+      <el-descriptions title="会议记录详情" border :column="3">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议类别">
+        <el-descriptions-item label="会议类别" v-if="false">
           {{ pro.external }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议类型">
-          {{ pro.meetingType }}
+        <el-descriptions-item label="会议时间">
+          {{ pro.times }}
         </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 label="会议类型">
+          {{ pro.meetingType }}
         </el-descriptions-item>
-        <el-descriptions-item label="记录人员" :span="2">
-          {{ pro.recorder }}
+        <el-descriptions-item label="项目名称" :span="2">
+          <el-tag type="success">  {{ pro.projectName }}</el-tag>
+
         </el-descriptions-item>
         <el-descriptions-item label="内部参会人员">
           <span v-if="pro.innerAttendeesNew!==''" v-for="(item,index) in pro.innerAttendeesNew">
-            <el-badge is-dot v-if="pro.meetingConfirmStatus===1">
+            <el-badge is-dot  type="success" v-if="pro.meetingConfirmStatus===1">
           &nbsp;&nbsp;&nbsp; {{ item.name }}
             </el-badge>
-             <el-badge is-dot v-else type="info">
+             <el-badge is-dot v-else type="danger">
             &nbsp;&nbsp;&nbsp; {{ item.name }}
             </el-badge>
           </span>
         </el-descriptions-item>
-        <el-descriptions-item label="参会情况">
-          {{ pro.remark }}
+        <el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
+          {{ pro.outAttendees }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议备注">
+        <el-descriptions-item label="主持人" >
+          {{ pro.emcee }}
+        </el-descriptions-item>
+        <el-descriptions-item label="记录人员" >
+          {{ pro.recorder }}
+        </el-descriptions-item>
+        <el-descriptions-item label="会议备注" :span="3">
           <div v-html="pro.remarks"></div>
         </el-descriptions-item>
+        <el-descriptions-item label="参会情况" :span="3">
+            <el-input size="mini" v-model="pro.remark" type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 10}" @input=""></el-input>
+        </el-descriptions-item>
       </el-descriptions>
 
       <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
@@ -406,10 +414,10 @@
 
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="pro.status!==0 && pro.meetingConfirmStatus===0" type="success" size="mini"
+        <el-button v-if="pro.status===2 && pro.meetingConfirmStatus===0" type="success" size="mini"
                    @click="confirmMeeting(pro)">会议结果确认
         </el-button>
-        <el-button size="mini" @click="closeProjectMeetingDailog">取消</el-button>
+        <el-button size="mini" @click="closeProjectMeetingDailog" v-show="false">取消</el-button>
         <el-button size="mini" v-if="pro.meetingConfirmStatus===0" type="primary" class="title"
                    @click="submitMeetingOptionsForm(pro,'editForm')">保存
         </el-button>
@@ -821,6 +829,7 @@ export default {
         this.pro.outAttendees = row.outAttendees
         this.pro.innerAttendees = row.innerAttendees
         this.pro.recorder = row.recorder
+        this.pro.emcee=row.emcee
         this.pro.times = row.beginTime + '至' + row.endTime
         this.pro.beginTime = row.beginTime
         this.pro.endTime = row.endTime
@@ -866,6 +875,7 @@ export default {
           }
           this.pro.innerAttendeesNew = temp
           this.pro.meetingContents = data
+          this.pro.projectName=res.data.projectName
           if (row.meetingType === 2) {
             this.projectMeetingDetailVisble = true
           }