屏蔽会议确认结果按钮

src/views/meeting/meeting.vue

@@ -184,7 +184,7 @@
             <el-option label="15分钟" :value="15" key="15分钟">15分钟</el-option>
             <el-option label="30分钟" :value="30" key="30分钟">30分钟</el-option>
             <el-option label="45分钟" :value="45" key="45分钟">45分钟</el-option>
-            <el-option label="1小时" :value="60" key="15分钟">1小时</el-option>
+            <el-option label="1小时" :value="60" key="1小时">1小时</el-option>
             <el-option label="2小时" :value="120" key="2小时">2小时</el-option>
             <el-option label="3小时" :value="180" key="3小时">3小时</el-option>
             <el-option label="其他" :value="0" key="其他">其他</el-option>
@@ -195,17 +195,17 @@
         </el-form-item>
         <el-form-item label="内部参会人员:" prop="innerAttendUsers"
                       :rules="[{required:true,message: '请选择参会人员', trigger: 'change'}]">
-          <el-input size="mini" v-model="editForm.innerAttendUsers" readonly="true" @keyup.enter.native="openUsers()">
+          <el-input size="mini" v-model="editForm.innerAttendUsers" :readonly="true" @keyup.enter.native="openUsers()">
             <el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="主持人:" prop="emcee" :rules="[{required:true,message: '请选择会议主持人', trigger: 'change'}]">
-          <el-input size="mini" v-model="editForm.emcee" readonly="true" @keyup.enter.native="openUsers1('emcee')">
+          <el-input size="mini" v-model="editForm.emcee" :readonly="true" @keyup.enter.native="openUsers1('emcee')">
             <el-button @click="openUsers1('emcee')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="记录人:" prop="recorder" :rules="[{required:true,message: '请选择会议记录人', trigger: 'change'}]">
-          <el-input size="mini" v-model="editForm.recorder" readonly="true"
+          <el-input size="mini" v-model="editForm.recorder" :readonly="true"
                     @keyup.enter.native="openUsers1('recorder')">
             <el-button @click="openUsers1('recorder')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
@@ -247,7 +247,7 @@
         :data="userList"
         node-key="id"
         show-checkbox
-        :props="{label:'name'}" default-expand-all="true">
+        :props="{label:'name'}" :default-expand-all="true">
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUserDialog">取消</el-button>
@@ -261,7 +261,7 @@
         ref="dept1"
         :data="userList"
         node-key="id"
-        :props="{label:'name'}" default-expand-all="true">
+        :props="{label:'name'}" :default-expand-all="true">
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUser1Dialog">取消</el-button>
@@ -294,11 +294,21 @@
           {{ pro.recorder }}
         </el-descriptions-item>
         <el-descriptions-item label="内部参会人员">
-          {{ pro.innerAttendees }}
+          <span v-if="pro.innerAttendeesNew!==''" v-for="(item,index) in pro.innerAttendeesNew">
+            <el-badge is-dot v-if="item.confirmFlag==='1'">
+          &nbsp;&nbsp;&nbsp; {{ item.name }}
+            </el-badge>
+             <el-badge is-dot v-else type="info">
+            &nbsp;&nbsp;&nbsp; {{ item.name }}
+            </el-badge>
+          </span>
         </el-descriptions-item>
         <el-descriptions-item label="参会情况">
           {{ pro.remark }}
         </el-descriptions-item>
+        <el-descriptions-item label="会议备注">
+          <div v-html="pro.remarks"></div>
+        </el-descriptions-item>
       </el-descriptions>
 
       <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
@@ -319,7 +329,7 @@
         </el-table-column>
         <el-table-column label="执行人" width="180">
           <template slot-scope="scope">
-            <el-input size="mini" v-model="scope.row.executorName" readonly
+            <el-input size="mini" v-model="scope.row.executorName" :readonly="true"
                       @keyup.enter.native="openUsers1('executorName',scope.row)">
               <el-button @click="openUsers1('executorName',scope.row)" icon="el-icon-search" slot="append" ></el-button>
             </el-input>
@@ -341,10 +351,10 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="pro.status!==0" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
+        <el-button v-if="pro.status!==0 && pro.meetingConfirmStatus==='0'" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
         </el-button>
         <el-button size="mini" @click="closeProjectMeetingDailog" v-show="false">取消</el-button>
-        <el-button size="mini" type="primary" class="title" @click="submitMeetingOptionsForm(pro,'editForm')">保存</el-button>
+        <el-button size="mini" v-if="pro.meetingConfirmStatus==='0'" type="primary" class="title" @click="submitMeetingOptionsForm(pro,'editForm')">保存</el-button>
       </div>
     </el-dialog>
 
@@ -472,6 +482,7 @@ export default {
         times: '',
         outAttendees: '',
         innerAttendees: '',
+        innerAttendeesNew: [],
         emcee: '',
         recorder: '',
         remark: '',
@@ -696,7 +707,7 @@ export default {
       let meetingType = row.meetingType
       if (meetingType !== 1) {
         if (row.meetingType == 2) {
-          this.projectMeetingDetailVisble = true
+          //this.projectMeetingDetailVisble = true
         } else {
           this.otherMeetingDetailVisble = true
         }
@@ -743,8 +754,16 @@ export default {
         this.pro.id = row.id
         getMeetingDetailsById(meetingId).then(res => {
           let data = res.data.meetingContents
-
+          let innerAttendess=JSON.parse(res.data.innerAttendees)
+          let temp=[];
+          for(let i = 0; i < innerAttendess.length; i++) {
+            temp.push(innerAttendess[i])
+          }
+          this.pro.innerAttendeesNew=temp
           this.pro.meetingContents = data
+          if (row.meetingType === 2) {
+            this.projectMeetingDetailVisble = true
+          }
         });
       }
       if (meetingType === 1) {