增加代码

src/views/meeting/meeting.vue

@@ -218,11 +218,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <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>
-
+        <el-button size="mini" @click="closeDialog">取消</el-button>
+        <el-button size="mini" type="primary"  class="title" @click="submitForm('editForm')">保存</el-button>
       </div>
     </el-dialog>
 
@@ -549,7 +546,7 @@ export default {
       }
 
     },
-    submitForm(row,str) {
+    submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let data = this.editForm;

src/views/meeting/weekly.vue

@@ -33,7 +33,8 @@
           <el-table-column label="工作反馈" prop="description">
             <template slot-scope="scope">
               <span v-if="scope.row.description!==''" v-for="(item,index) in scope.row.description.split(',') ">
-                {{index+1}}. {{ item }}<br/>
+                {{index+1}}.<span v-html="stripTags(item)"></span><br/>
+
               </span>
             </template>
           </el-table-column>
@@ -144,6 +145,9 @@ export default {
     this.getData()
   },
   methods: {
+    stripTags(html) {
+      return html.replace(/<\/?[^>]+(>|$)/g, '');
+    },
     getData() {
       list().then(response => {
         this.meetingData = response.data
@@ -213,13 +217,19 @@ export default {
       this.$PDFSave(this.$refs.exportPdf, "我的工作周报");
     },
     saveWorkPlan() {
-      if (this.meetingWeek == null || this.meetingWeek == undefined || this.meetingWeek === '') {
+      if (this.meetingWeek === null || this.meetingWeek === undefined || this.meetingWeek === '') {
         this.$message({
           message: '请选择会议信息!',
           type: 'warning'
         });
         return
       }
+      //判断是否存在周会信息，无周会信息，就不保存工作计划
+      let meetingId=this.meetingId
+      if(meetingId===undefined || meetingId===null){
+        this.$message.warning("请选择周会会议，再填写工作计划!")
+        return
+      }
 
       let workPlanss = this.workPlans;
       for (let i = 0; i < workPlanss.length; i++) {