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

src/views/meeting/meeting.vue

@@ -218,9 +218,11 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="closeDialog">取消</el-button>
-        <el-button size="mini" type="primary"  class="title" @click="submitForm('editForm')">保存
-        </el-button>
+        <template slot-scope="scope">
+          <el-button size="mini" @click="closeDialog">取消</el-button>
+          <el-button size="mini" type="primary"  class="title" @click="submitForm(scope.row,'editForm')">保存</el-button>
+        </template>
+
       </div>
     </el-dialog>
 
@@ -253,7 +255,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog"
+    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen
                :close-on-click-modal="false">
       <el-descriptions title="会议记录详情" border :column="2">
         <el-descriptions-item label="会议主题">
@@ -327,12 +329,12 @@
       <div slot="footer" class="dialog-footer">
         <el-button v-if="pro.status!==0" type="success" size="mini" @click="confirmMeeting(pro)">会议结果确认
         </el-button>
-        <el-button size="mini" @click="closeProjectMeetingDailog">取消</el-button>
-        <el-button size="mini" type="primary" class="title" @click="submitMeetingOptionsForm('editForm')">保存</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>
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog"
+    <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog" fullscreen
                :close-on-click-modal="false">
       <el-descriptions title="会议记录详情" border :column="2">
         <el-descriptions-item label="会议主题">
@@ -455,6 +457,7 @@ export default {
         status: null,
         beginTime:null,
         endTime:null,
+        meetingConfirmStatus:0,
         meetingContents: [{
           id: null,
           meetingId: null,
@@ -546,7 +549,7 @@ export default {
       }
 
     },
-    submitForm() {
+    submitForm(row,str) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let data = this.editForm;
@@ -596,6 +599,16 @@ export default {
       })
     },
     confirmMeeting(row) {
+      let status=row.status;
+      if(status!==2){
+        this.$message.warning("会议暂未结束，请会议结束后在确认!");
+        return
+      }
+      let meetingConfirmStatus=row.meetingConfirmStatus
+      if(meetingConfirmStatus===1){
+        this.$message.warning("会议已经确认，请勿再次操作!")
+        return
+      }
       let id = row.id;
       //点击会议确认时候判断信息是否完整
       let data = this.pro.meetingContents;
@@ -624,7 +637,6 @@ export default {
     },
     meetingDetail(row) {
       let meetingType = row.meetingType
-
       if (meetingType !== 1) {
         if (row.meetingType == 2) {
           this.projectMeetingDetailVisble = true
@@ -640,6 +652,7 @@ export default {
         this.pro.beginTime=row.beginTime
         this.pro.endTime=row.endTime
         this.pro.meetingPlace = row.meetingPlace
+        this.pro.meetingConfirmStatus=row.meetingConfirmStatus
         let meetingType = row.meetingType
         //1-周例会，2-项目会议，3-实施会议，4-其他会议
         let meetingTypeNames = '';
@@ -813,7 +826,12 @@ export default {
     closeProjectMeetingDailog() {
       this.projectMeetingDetailVisble = false;
     },
-    submitMeetingOptionsForm() {
+    submitMeetingOptionsForm(row,str) {
+      let meetingConfirmStatus=row.meetingConfirmStatus
+      if(meetingConfirmStatus===1){
+        this.$message.warning("会议已经确认，请勿再次操作!")
+        return
+      }
       let data = this.pro.meetingContents;
       for (let i = 0; i < data.length; i++) {
         let t = data[i];