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

src/views/meeting/meeting.vue

@@ -350,7 +350,7 @@
         </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>
+                      :autosize="{ minRows: 4, maxRows: 10}" @input="editMeetings(pro)"></el-input>
         </el-descriptions-item>
       </el-descriptions>
 
@@ -493,7 +493,7 @@ import {
   startMeetingById,
   meetingAuthById,
   meetingDeleteAuth,
-  endMeeting, editMeetingContent, getMeetingContentsByMeetingId, exportOutMeetingNotice
+  endMeeting, editMeetingContent, getMeetingContentsByMeetingId, exportOutMeetingNotice, editMeeting
 } from '@/api/meeting/meeting'
 import {getDeptUserTree} from '@/api/system/user'
 import {getProjectList} from "@/api/task/project";
@@ -1195,6 +1195,15 @@ export default {
     exportOutMeetingNotices(row){
       let id=row.id
       exportOutMeetingNotice(id);
+    },
+    editMeetings(data){
+      let newData={
+        id:data.id,
+        remark:data.remark
+      }
+      editMeeting(newData).then(res=>{
+        //this.$message.success("操作成功")
+      })
     }
   }