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

src/views/meeting/weekly.vue

@@ -167,12 +167,20 @@ export default {
         this.getSpanArr(this.workContents);
         if (response.data.workPlan != null && response.data.workPlan.length > 0) {
           this.workPlans = response.data.workPlan
+        }else{
+          this.workPlans=[{
+            planContent: '请填写工作计划信息',
+            id: null,
+            meetingId: null,
+            completionTimes: null,
+            completionTime: null,
+            projectId: null
+          }]
         }
         this.weeks = response.data.weeks
         const date = new Date();
         // 获取当前第几周
         let week = this.getYearWeek(date.getFullYear(), Number(date.getMonth()) + 1, date.getDate());
-
         let currentWeek = week ;
         this.currentWeek = currentWeek;
         if (weekss !== currentWeek) {