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

src/views/meeting/meeting.vue

@@ -138,7 +138,7 @@
           </el-button>
           <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 && scope.row.recorderOpFlag==='true' " 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="false" 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>
@@ -310,6 +310,8 @@
         <div style="font-size: 24px">{{ pro.meetingName }}</div>
         <div>
           <el-button @click="projectMeetingDetailVisble = false"  size="small">返回</el-button>
+          <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endMeetingClick(pro)">结束会议
+          </el-button>
         </div>
       </div>
       <el-descriptions title="" border :column="3">
@@ -436,6 +438,10 @@
         <div style="font-size: 24px">{{ pro.meetingName }}</div>
         <div>
           <el-button @click="otherMeetingDetailVisble = false"  size="small">返回</el-button>
+
+          <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true' " size="mini" type="primary" @click="endMeetingClick(pro)">结束会议
+          </el-button>
+
         </div>
       </div>
       <el-descriptions title="" border :column="3">
@@ -602,6 +608,7 @@ export default {
         endTime: null,
         meetingConfirmStatus: 0,
         remarks: null,
+        recorderOpFlag:'false',
         meetingContents: [{
           id: null,
           meetingId: null,
@@ -882,6 +889,7 @@ export default {
         this.pro.innerAttendees = innerPeople
         this.pro.remark = row.remark
         this.pro.status = row.status
+        this.pro.recorderOpFlag=row.recorderOpFlag
         let meetingId = row.id
         this.pro.id = row.id
         getMeetingDetailsById(meetingId).then(res => {
@@ -934,6 +942,7 @@ export default {
               message: '操作成功!',
               type: 'success'
             });
+            this.pro.status=2
             this.getData(this.formInline);
           })
         }

src/views/meeting/weeklyRecords.vue

@@ -6,8 +6,8 @@
         <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>
-        <el-button size="mini" @click="exportPdf"  style="margin-right: 20px" v-if="workScoreVisible">导出</el-button>
+        <el-button size="mini" @click="meetingResultConfirm"  v-if="meetingResultConfirmVisible" type="primary">会议结果确认</el-button>
+        <el-button size="mini" @click="exportPdf" type="success" style="margin-right: 20px" v-if="workScoreVisible">导出</el-button>
       </div>
     </div>
     <el-descriptions title="" :column="2" :size="size" border>
@@ -112,7 +112,7 @@
 <!--      </el-table-column>-->
       <el-table-column prop="remarks" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)">
+          <el-input v-model="scope.row.remark" :readonly="workRemarkReadOnly" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)">
           </el-input>
         </template>
       </el-table-column>
@@ -276,7 +276,8 @@ export default {
       row:null,
       workScoreVisible:false,
       meetingConfirms:[],
-      permissions:null
+      permissions:null,
+      workRemarkReadOnly:true,
     }
   },
   created() {
@@ -321,6 +322,10 @@ export default {
           }
         }
       }
+      let userName=this.$store.getters.name
+      if((userName===meeting.recorder || userName===meeting.emcee) && meeting.status!==2 ){
+        this.workRemarkReadOnly=false
+      }
     },
     getData() {
       let loginUserId=this.$store.getters.userId
@@ -486,6 +491,7 @@ export default {
             message: '操作成功!',
             type: 'success'
           });
+          this.meetingResultConfirmVisible=false;
           this.getData()
         }else{
           this.$message({
@@ -669,6 +675,8 @@ export default {
                 message: '操作成功!',
                 type: 'success'
               });
+              this.m.status=2
+              this.setPermissions()
               this.getData();
             })
           }