Merge remote-tracking branch 'origin/master'

src/views/task/projectView.vue

@@ -349,6 +349,7 @@ export default {
     },
 
     cellClick(row, column, cell, event) {
+      this.feedbacks = []
       if (!row[column.property].value || row[column.property].value === '') {
         return;
       }
@@ -364,7 +365,12 @@ export default {
       })
     },
     cellDbClick(row, column, cell, event) {
-      if (row.status === '4' || row.status === '5') {
+      if (row.status === '4') {
+        this.$message.warning("任务已完成,不可评论")
+        return;
+      }
+      if (row.status === '5') {
+        this.$message.warning("任务已终止,不可评论")
         return;
       }
       let feedbackDate = DateUtil.getFeedBackDate(this.queryParams.startDate, this.queryParams.endDate, column.property)

src/views/task/view.vue

@@ -471,6 +471,7 @@ export default {
     },
 
     cellClick(row, column, cell, event) {
+      this.feedbacks = []
       if (!row[column.property].value || row[column.property].value === '') {
         return;
       }
@@ -486,6 +487,14 @@ export default {
       })
     },
     cellDbClick(row, column, cell, event) {
+      if (row.status === '4' || row.status === '5') {
+        this.$message.warning("任务已完成,不可反馈")
+        return;
+      }
+      if (row.status === '5') {
+        this.$message.warning("任务已终止,不可反馈")
+        return;
+      }
       let feedbackDate = DateUtil.getFeedBackDate(this.queryParams.startDate, this.queryParams.endDate, column.property)
       if (DateUtil.unix(feedbackDate) > DateUtil.unix()) {
         this.$message.warning("反馈时间不能超过:" + DateUtil.day())