1.获取任务开始结束时间在本周时间内的任务

2.本周有反馈的任务

src/views/meeting/weeklyRecords.vue

@@ -84,8 +84,15 @@
       <el-table-column label="本周工作总结" min-width="450">
         <el-table-column label="工作内容" prop="taskName">
           <template slot-scope="scope">
-            <div class="underline-on-hover"  @click="getTaskScheduleRemarks(scope.row)">{{scope.row.taskId}}、 {{ scope.row.taskName }}
-              ({{scope.row.projectName}})&nbsp;&nbsp;&nbsp;&nbsp;花费工时:({{scope.row.taskCostWorkTime}})
+
+            <div class="underline-on-hover"  @click="getTaskScheduleRemarks(scope.row)">
+              <div v-if="scope.row.taskId!==undefined && scope.row.taskId!=null">
+                {{scope.row.taskId}}、 {{ scope.row.taskName }}
+                ({{scope.row.projectName}})&nbsp;&nbsp;&nbsp;&nbsp;花费工时:({{scope.row.taskCostWorkTime}})
+              </div>
+              <div v-else>
+               1、 {{ scope.row.taskName }}
+              </div>
             </div>
           </template>
         </el-table-column>
@@ -474,20 +481,28 @@ export default {
 
     },
     getTaskScheduleRemarks(row) {
-      this.taskFeedbackTitle = row.userName + ":" + row.taskName
-      getTaskScheduleRemark(row.taskId).then(res => {
-        let content = res.data;
-        let feedbackContent = '';
-        let j = 1;
-        for (let i = 0; i < content.length; i++) {
-          feedbackContent += j + ":" + content[i].description + "&nbsp;&nbsp;&nbsp;&nbsp;" + content[i].value + "%" + "&nbsp;&nbsp;&nbsp" + '</br>'
-          j++;
-        }
-        if (content.length === 0) {
-          feedbackContent = '暂无反馈'
-        }
-        this.taskFeedbackContent = feedbackContent
-      });
+      if(row.taskId===undefined || row.taskId===null){
+        this.taskFeedbackTitle=row.userName+''
+        this.taskFeedbackContent='暂无反馈'
+        this.taskFeedbackVisible = true
+      }else {
+        this.taskFeedbackTitle = row.userName + ":" + row.taskName
+
+        getTaskScheduleRemark(row.taskId).then(res => {
+          let content = res.data;
+          let feedbackContent = '';
+          let j = 1;
+          for (let i = 0; i < content.length; i++) {
+            feedbackContent += j + ":" + content[i].description + "&nbsp;&nbsp;&nbsp;&nbsp;" + content[i].value + "%" + "&nbsp;&nbsp;&nbsp" + '</br>'
+            j++;
+          }
+          if (content.length === 0) {
+            feedbackContent = '暂无反馈'
+          }
+          this.taskFeedbackContent = feedbackContent
+
+        });
+      }
       this.taskFeedbackVisible = true
     },
     exportPdf() {