任务反馈bug修改

src/utils/date.js

@@ -94,5 +94,19 @@ export default {
       return moment(date).add(num, 'weeks').format(DATE_FORMAT)
     }
     return moment().add(num, 'weeks').format(DATE_FORMAT)
+  },
+
+  getFeedBackDate(dateRange, day) {
+    let startYear = moment(dateRange[0]).year()
+    let endYear = moment(dateRange[1]).year()
+
+    if (startYear == endYear) {
+      return startYear + '-' + day
+    }
+
+    if (this.unix(startYear + '-' + day) > this.unix(dateRange[1])) {
+      return startYear + '-' + day
+    }
+    return endYear + '-' + day
   }
 }

src/views/task/view.vue

@@ -296,7 +296,9 @@ export default {
       // if (!row[column.property].color || row[column.property].color === '1') {
       //   return
       // }
-      let feedbackDate = this.queryParams.month + '-' + column.property
+      console.log(this.queryParams);
+      console.log(column,cell);
+      let feedbackDate = DateUtil.getFeedBackDate(this.queryParams.month, column.property)
       if (DateUtil.unix(feedbackDate) > DateUtil.unix()) {
         this.$message.warning("反馈时间不能超过:" + DateUtil.day())
         return;
@@ -314,6 +316,7 @@ export default {
         fileUrl: undefined,
         description: undefined
       };
+      console.log(this.form);
       this.open = true
     },
     rowClick(row, column, event) {