Browse Source

添加上月

xiaohaizhao 5 months ago
parent
commit
0af19363ab

+ 14 - 0
components/timeRange/timeRange.js

@@ -189,6 +189,20 @@ Component({
                     whereType.begdate = begdate;
                     whereType.enddate = enddate;
                     break;
+                case '去年':
+                    begdate = (new Date().getFullYear() - 1) + (grading === "year-month" ? "-01" : "-01-01");
+                    enddate = (new Date().getFullYear() - 1) + (grading === "year-month" ? "-12" : "-12-31");
+                    whereType.begdate = begdate;
+                    whereType.enddate = enddate;
+                    break;
+                case '上月':
+                    const lastMonth = new Date();
+                    lastMonth.setMonth(lastMonth.getMonth() - 1);
+                    begdate = formatTime(lastMonth, "-").split(' ')[0].slice(0, grading === "year-month" ? 7 : 10);
+                    enddate = formatTime(lastMonth, "-").split(' ')[0].slice(0, grading === "year-month" ? 7 : 10);
+                    whereType.begdate = begdate;
+                    whereType.enddate = enddate;
+                    break;
                 case '近一年':
                     begdate = formatTime(new Date(new Date().setFullYear(new Date().getFullYear() - 1)), "-").split(' ')[0].slice(0, grading === "year-month" ? 7 : 10);
                     enddate = formatTime(new Date(), "-").split(' ')[0].slice(0, grading === "year-month" ? 7 : 10);

+ 2 - 0
salesPanel/dataOverview/Client/dataOverview.js

@@ -39,6 +39,8 @@ Component({
             value: "本季"
         }, {
             value: "本月"
+        }, {
+            value: "上月"
         }, {
             value: "去年"
         }, ],

+ 2 - 0
salesPanel/dataOverview/Clue/dataOverview.js

@@ -39,6 +39,8 @@ Component({
             value: "本季"
         }, {
             value: "本月"
+        }, {
+            value: "上月"
         }, {
             value: "去年"
         }, ],

+ 2 - 0
salesPanel/dataOverview/Costs/dataOverview.js

@@ -44,6 +44,8 @@ Component({
             value: "本季"
         }, {
             value: "本月"
+        }, {
+            value: "上月"
         }, {
             value: "去年"
         }, ],

+ 2 - 0
salesPanel/dataOverview/Project/dataOverview.js

@@ -39,6 +39,8 @@ Component({
             value: "本季"
         }, {
             value: "本月"
+        }, {
+            value: "上月"
         }, {
             value: "去年"
         }, ],