Merge branch '红色' into 测试

components/Yl_Filtrate1/index.js

@@ -215,6 +215,7 @@ Component({
             })
         },
         setTimeCycle(startdate = "", enddate = "") {
+            console.log(startdate,enddate)
             if (typeof startdate == 'object') {
                 startdate = formatTime(startdate, '-').split(' ')[0]
             }
@@ -245,9 +246,17 @@ Component({
             const startOfMonth = new Date(date.getFullYear(), date.getMonth(), 1);
             const endOfMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0);
             endOfMonth.setHours(23, 59, 59, 999);
-            console.log("startOfMonth", startOfMonth)
             this.setTimeCycle(startOfMonth, endOfMonth)
         },
+        //上月
+        getLastMonthRange(date = new Date()) {
+            const year = date.getFullYear();
+            const month = date.getMonth(); // Current month (0-based index)
+            const startOfLastMonth = new Date(year, month - 1, 1); // First day of last month
+            const endOfLastMonth = new Date(year, month, 0); // Last day of last month
+            endOfLastMonth.setHours(23, 59, 59, 999); // Set end time to the last millisecond of the day
+            this.setTimeCycle(startOfLastMonth, endOfLastMonth);
+        },
         //本年
         getYearRange(date = new Date()) {
             const startOfYear = new Date(date.getFullYear(), 0, 1);

packageA/achievement/modules/bills.js

@@ -30,6 +30,9 @@ Component({
             interrupt: true,
             relevance: "dateRange",
             list: [{
+                name: "上月",
+                value: "上月"
+            }, {
                 name: "本日",
                 value: "日"
             }, {
@@ -73,6 +76,9 @@ Component({
         }) {
             if (detail.data.label == "时间筛选") {
                 switch (detail.item.name) {
+                    case '上月':
+                        this.selectComponent("#Yl_Filtrate1").getLastMonthRange()
+                        break;
                     case '本日':
                         this.selectComponent("#Yl_Filtrate1").queryDays(1)
                         break;

packageA/achievement/modules/client.js

@@ -30,6 +30,9 @@ Component({
             interrupt: true,
             relevance: "dateRange",
             list: [{
+                name: "上月",
+                value: "上月"
+            }, {
                 name: "本日",
                 value: "日",
             }, {
@@ -73,6 +76,9 @@ Component({
         }) {
             if (detail.data.label == "时间筛选") {
                 switch (detail.item.name) {
+                    case '上月':
+                        this.selectComponent("#Yl_Filtrate1").getLastMonthRange()
+                        break;
                     case '本日':
                         this.selectComponent("#Yl_Filtrate1").queryDays(1)
                         break;

packageA/achievement/modules/clue.js

@@ -30,6 +30,9 @@ Component({
             interrupt: true,
             relevance: "dateRange",
             list: [{
+                name: "上月",
+                value: "上月"
+            }, {
                 name: "本日",
                 value: "日",
             }, {
@@ -82,6 +85,9 @@ Component({
         }) {
             if (detail.data.label == "时间筛选") {
                 switch (detail.item.name) {
+                    case '上月':
+                        this.selectComponent("#Yl_Filtrate1").getLastMonthRange()
+                        break;
                     case '本日':
                         this.selectComponent("#Yl_Filtrate1").queryDays(1)
                         break;

packageA/achievement/modules/project.js

@@ -30,6 +30,9 @@ Component({
             interrupt: true,
             relevance: "dateRange",
             list: [{
+                name: "上月",
+                value: "上月"
+            }, {
                 name: "本日",
                 value: "日",
             }, {
@@ -73,6 +76,9 @@ Component({
         }) {
             if (detail.data.label == "时间筛选") {
                 switch (detail.item.name) {
+                    case '上月':
+                        this.selectComponent("#Yl_Filtrate1").getLastMonthRange()
+                        break;
                     case '本日':
                         this.selectComponent("#Yl_Filtrate1").queryDays(1)
                         break;