销售漏斗添加时间范围全部筛选项

components/Yl_Filtrate1/index.js

@@ -209,12 +209,14 @@ Component({
             })
         },
         queryDays(num) {
+            if (num == -1) return this.setTimeCycle()
             let now = new Date().getTime(),
                 end = now,
                 beg = end - (num * 86400000);
             this.setTimeCycle(formatTime(new Date(beg), '-').split(' ')[0], formatTime(new Date(end), '-').split(' ')[0])
         },
         queryMonths(period) {
+            if (period == -1) return this.setTimeCycle()
             let startdate = formatTime(new Date(), '-').split(' ')[0],
                 enddate = formatTime(new Date(), '-').split(' ')[0].split('-');
             for (let i = period; i != 0; i--) {

packageA/salesHourglass/index.js

@@ -82,6 +82,10 @@ Page({
             interrupt: true,
             relevance: "dateRange",
             list: [{
+                name: "全部",
+                id: 0,
+                queryMonths: -1
+            }, {
                 name: "近一年",
                 id: 1,
                 queryMonths: 12
@@ -132,7 +136,7 @@ Page({
     onReady() {
         this.setChartData();
         this.selectComponent("#organization").initDepAndUser();
-        this.selectComponent("#Yl_Filtrate1").queryMonths(12)
+        // this.selectComponent("#Yl_Filtrate1").queryMonths(12)
     },
     interrupt({
         detail
@@ -171,10 +175,10 @@ Page({
                 'content.where.unfinish': detail.unfinish || 0,
             })
         }
+        this.data.content.where.begdate = detail.startdate;
+        this.data.content.where.enddate = detail.enddate;
         if (detail.startdate && detail.enddate) {
             this.data.content.dateType = 0;
-            this.data.content.where.begdate = detail.startdate;
-            this.data.content.where.enddate = detail.enddate;
         } else {
             this.data.content.dateType = detail.dateType && detail.dateType != 'id' ? dateType : 0
         }