Merge branch 'http_mock' into daily_0.4.1

src/views/monthlyReport/childrenPage/editReport/components/TableAndFeedBack/index.vue

@@ -381,11 +381,12 @@ export default {
         }
       })
       // if (this.pageDate.status > 10 && this.tabsActive.indexOf('本月重点问题') < 0) {
-      const { isHistory } = this.$route.query
+      // const { isHistory } = this.$route.query
       // 非编辑状态，并且不是·本月重点问题·，删除操作按钮
-      if (this.pageDate && this.pageDate.status > 10 && !this.isExpand || isHistory) {
-        newColumns.splice(newColumns.length - 1, 1)
-      }
+      // if (this.pageDate && this.pageDate.status > 10 && !this.isExpand || isHistory) {
+      //   newColumns.splice(newColumns.length - 1, 1)
+      // }
+      newColumns.splice(newColumns.length - 1, 1)
       return newColumns
     },
     setExpandRowKeys() {