会议增加备注。。。。。。。

src/api/material/category.js

@@ -59,3 +59,8 @@ export function listCategoryExcludeChild(categoryId) {
   })
 }
 
+
+
+
+
+

src/views/meeting/meeting.vue

@@ -112,7 +112,7 @@
 
     <!--编辑会议窗体-->
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="950px" @click="closeDialog"
+    <el-dialog :title="title" :visible.sync="editFormVisible" width="70%" @click="closeDialog"
                :close-on-click-modal="false">
       <el-form label-width="120px" ref="form" size="mini" :model="editForm">
         <el-form-item label="会议主题:" prop="meetingName" :rules="[{required:true,message: '请输入会议主题', trigger: 'blur'}]">
@@ -219,7 +219,7 @@
             </el-table-column>
             <el-table-column label="工作内容" prop="content">
               <template slot-scope="scope">
-                <el-input size="mini" v-model="scope.row.content"></el-input>
+                <el-input size="mini" v-model="scope.row.content" placeholder="请输入会议内容"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="操作" prop="op" width="150">
@@ -230,6 +230,9 @@
             </el-table-column>
           </el-table>
         </el-form-item>
+        <el-form-item label="会议备注:">
+          <div id="editorElem" style="text-align:left" ></div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeDialog">取消</el-button>
@@ -375,23 +378,29 @@
         <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">
         <el-table-column label="序号" width="60" type="index"></el-table-column>
         <el-table-column label="会议内容" prop="content"></el-table-column>
       </el-table>
+
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeotherMeetingDailog">取消</el-button>
       </div>
     </el-dialog>
-
-
   </div>
 </template>
 
 <script>
 import Pagination from '../../components/Page/Pagination'
+import E from 'wangeditor';
+
+let editor;
+
 import {
   addMeeting,
   getMeetingsByPage,
@@ -447,7 +456,8 @@ export default {
         duration:null,
         meetingContents: [
           {content: '会议内容', 'op': ''}
-        ]
+        ],
+        remarks:null,
       },
       usersVisble: false,
       userList: [],
@@ -469,6 +479,7 @@ export default {
         beginTime:null,
         endTime:null,
         meetingConfirmStatus:0,
+        remarks:null,
         meetingContents: [{
           id: null,
           meetingId: null,
@@ -512,11 +523,28 @@ export default {
         this.pageparm.total = response.data.total;
       });
     },
+    createwangeditor() {
+      editor = new E('#editorElem');
+      editor.config.height = 250
+      editor.create()
+      editor.txt.html(this.editForm.remarks)
+      editor.config.onchange = (html) => {
+        this.editForm.remarks = editor.txt.html()
+      };
+    },
     createMeeting() {
       getProjectList("").then(res => {
         this.projectList = res.data;
         this.title = '创建会议'
         this.editFormVisible = true
+        this.$nextTick(() => {
+          if (editor == null) {
+            this.createwangeditor()
+          } else {
+            editor.destroy();//这里做了一次判断，判断编辑器是否被创建，如果创建了就先销毁。
+            this.createwangeditor()
+          }
+        });
       })
       this.editForm = {
         id: null,
@@ -534,9 +562,11 @@ export default {
         emcee: '',
         recorder: '',
         meetingContents: [
-          {content: '会议内容', 'op': ''}
-        ]
+          {content: '', 'op': ''}
+        ],
+        remarks: null
       }
+
     },
     closeDialog() {
       this.editFormVisible = false
@@ -590,8 +620,6 @@ export default {
           return false;
         }
       });
-
-
     },
     resetSearch() {
       this.formInline = {
@@ -682,6 +710,7 @@ export default {
         this.pro.endTime=row.endTime
         this.pro.meetingPlace = row.meetingPlace
         this.pro.meetingConfirmStatus=row.meetingConfirmStatus
+        this.pro.remarks=row.remarks
         let meetingType = row.meetingType
         //1-周例会，2-项目会议，3-实施会议，4-其他会议
         let meetingTypeNames = '';
@@ -855,6 +884,15 @@ export default {
             this.editForm.duration=data.duration
             this.title = '修改会议'
             this.editFormVisible = true
+
+            this.$nextTick(() => {
+              if (editor == null) {
+                this.createwangeditor()
+              } else {
+                editor.destroy();//这里做了一次判断，判断编辑器是否被创建，如果创建了就先销毁。
+                this.createwangeditor()
+              }
+            });
           });
         }
       });