Browse Source

日期和选项联动

xiaohaizhao 1 year ago
parent
commit
346f326afe

+ 33 - 4
packageA/achievement/modules/bills.js

@@ -3,6 +3,11 @@ Component({
     options: {
     options: {
         addGlobalClass: true
         addGlobalClass: true
     },
     },
+    lifetimes: {
+        attached: function () {
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+        }
+    },
     data: {
     data: {
         content: {
         content: {
             nocache: true,
             nocache: true,
@@ -22,22 +27,29 @@ Component({
         filtratelist: [{
         filtratelist: [{
             label: "时间筛选",
             label: "时间筛选",
             index: 2,
             index: 2,
+            default: 2,
             showName: "name", //显示字段
             showName: "name", //显示字段
             valueKey: "dateType", //返回Key
             valueKey: "dateType", //返回Key
             value: "value", //选中值
             value: "value", //选中值
             selectKey: "value",
             selectKey: "value",
+            interrupt: true,
+            relevance: "dateRange",
             list: [{
             list: [{
                 name: "本日",
                 name: "本日",
-                value: "日"
+                value: "日",
+                day: 1
             }, {
             }, {
                 name: "本周",
                 name: "本周",
-                value: "周"
+                value: "周",
+                day: 7
             }, {
             }, {
                 name: "本月",
                 name: "本月",
-                value: "月"
+                value: "月",
+                month: 1
             }, {
             }, {
                 name: "本年",
                 name: "本年",
-                value: "年"
+                value: "年",
+                month: 12
             }]
             }]
         }]
         }]
     },
     },
@@ -45,6 +57,12 @@ Component({
         handleFilter({
         handleFilter({
             detail
             detail
         }) {
         }) {
+            if (detail.name == "reset") {
+                this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+                this.setData({
+                    'filtratelist[0].index': 2
+                })
+            }
             this.setData({
             this.setData({
                 "content.dateType": detail.dateType,
                 "content.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
@@ -53,6 +71,17 @@ Component({
             });
             });
             this.getList(true);
             this.getList(true);
         },
         },
+        interrupt({
+            detail
+        }) {
+            if (detail.data.label == "时间筛选") {
+                if (detail.item.day) {
+                    this.selectComponent("#Yl_Filtrate1").queryDays(detail.item.day)
+                } else {
+                    this.selectComponent("#Yl_Filtrate1").queryMonths(detail.item.month)
+                }
+            }
+        },
         init(type, dataid) {
         init(type, dataid) {
             console.log(this.data.filtratelist)
             console.log(this.data.filtratelist)
             if (this.data.content.dataid != dataid) {
             if (this.data.content.dataid != dataid) {

+ 1 - 1
packageA/achievement/modules/bills.wxml

@@ -76,4 +76,4 @@
     <view style="height: 80rpx;" />
     <view style="height: 80rpx;" />
 </Yl_ListBox>
 </Yl_ListBox>
 
 
-<Yl_Filtrate1 show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" />
+<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" bindinterrupt='interrupt' />

+ 33 - 4
packageA/achievement/modules/client.js

@@ -3,6 +3,11 @@ Component({
     options: {
     options: {
         addGlobalClass: true
         addGlobalClass: true
     },
     },
+    lifetimes: {
+        attached: function () {
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+        }
+    },
     data: {
     data: {
         content: {
         content: {
             nocache: true,
             nocache: true,
@@ -22,22 +27,29 @@ Component({
         filtratelist: [{
         filtratelist: [{
             label: "时间筛选",
             label: "时间筛选",
             index: 2,
             index: 2,
+            default: 2,
             showName: "name", //显示字段
             showName: "name", //显示字段
             valueKey: "dateType", //返回Key
             valueKey: "dateType", //返回Key
             value: "value", //选中值
             value: "value", //选中值
             selectKey: "value",
             selectKey: "value",
+            interrupt: true,
+            relevance: "dateRange",
             list: [{
             list: [{
                 name: "本日",
                 name: "本日",
-                value: "日"
+                value: "日",
+                day: 1
             }, {
             }, {
                 name: "本周",
                 name: "本周",
-                value: "周"
+                value: "周",
+                day: 7
             }, {
             }, {
                 name: "本月",
                 name: "本月",
-                value: "月"
+                value: "月",
+                month: 1
             }, {
             }, {
                 name: "本年",
                 name: "本年",
-                value: "年"
+                value: "年",
+                month: 12
             }]
             }]
         }]
         }]
     },
     },
@@ -45,6 +57,12 @@ Component({
         handleFilter({
         handleFilter({
             detail
             detail
         }) {
         }) {
+            if (detail.name == "reset") {
+                this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+                this.setData({
+                    'filtratelist[0].index': 2
+                })
+            }
             this.setData({
             this.setData({
                 "content.dateType": detail.dateType,
                 "content.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
@@ -53,6 +71,17 @@ Component({
             });
             });
             this.getList(true);
             this.getList(true);
         },
         },
+        interrupt({
+            detail
+        }) {
+            if (detail.data.label == "时间筛选") {
+                if (detail.item.day) {
+                    this.selectComponent("#Yl_Filtrate1").queryDays(detail.item.day)
+                } else {
+                    this.selectComponent("#Yl_Filtrate1").queryMonths(detail.item.month)
+                }
+            }
+        },
         init(type, dataid) {
         init(type, dataid) {
             console.log(this.data.filtratelist)
             console.log(this.data.filtratelist)
             if (this.data.content.dataid != dataid) {
             if (this.data.content.dataid != dataid) {

+ 1 - 1
packageA/achievement/modules/client.wxml

@@ -67,4 +67,4 @@
     <view style="height: 80rpx;" />
     <view style="height: 80rpx;" />
 </Yl_ListBox>
 </Yl_ListBox>
 
 
-<Yl_Filtrate1 show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" />
+<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" bindinterrupt='interrupt' />

+ 33 - 4
packageA/achievement/modules/clue.js

@@ -3,6 +3,11 @@ Component({
     options: {
     options: {
         addGlobalClass: true
         addGlobalClass: true
     },
     },
+    lifetimes: {
+        attached: function () {
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+        }
+    },
     data: {
     data: {
         content: {
         content: {
             nocache: true,
             nocache: true,
@@ -22,22 +27,29 @@ Component({
         filtratelist: [{
         filtratelist: [{
             label: "时间筛选",
             label: "时间筛选",
             index: 2,
             index: 2,
+            default: 2,
             showName: "name", //显示字段
             showName: "name", //显示字段
             valueKey: "dateType", //返回Key
             valueKey: "dateType", //返回Key
             value: "value", //选中值
             value: "value", //选中值
             selectKey: "value",
             selectKey: "value",
+            interrupt: true,
+            relevance: "dateRange",
             list: [{
             list: [{
                 name: "本日",
                 name: "本日",
-                value: "日"
+                value: "日",
+                day: 1
             }, {
             }, {
                 name: "本周",
                 name: "本周",
-                value: "周"
+                value: "周",
+                day: 7
             }, {
             }, {
                 name: "本月",
                 name: "本月",
-                value: "月"
+                value: "月",
+                month: 1
             }, {
             }, {
                 name: "本年",
                 name: "本年",
-                value: "年"
+                value: "年",
+                month: 12
             }]
             }]
         }]
         }]
     },
     },
@@ -45,6 +57,12 @@ Component({
         handleFilter({
         handleFilter({
             detail
             detail
         }) {
         }) {
+            if (detail.name == "reset") {
+                this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+                this.setData({
+                    'filtratelist[0].index': 2
+                })
+            }
             this.setData({
             this.setData({
                 "content.dateType": detail.dateType,
                 "content.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
@@ -62,6 +80,17 @@ Component({
                 this.getList(true);
                 this.getList(true);
             }
             }
         },
         },
+        interrupt({
+            detail
+        }) {
+            if (detail.data.label == "时间筛选") {
+                if (detail.item.day) {
+                    this.selectComponent("#Yl_Filtrate1").queryDays(detail.item.day)
+                } else {
+                    this.selectComponent("#Yl_Filtrate1").queryMonths(detail.item.month)
+                }
+            }
+        },
         getList(init = false) {
         getList(init = false) {
             if (init.detail != undefined) init = init.detail;
             if (init.detail != undefined) init = init.detail;
             let content = JSON.parse(JSON.stringify(this.data.content));
             let content = JSON.parse(JSON.stringify(this.data.content));

+ 1 - 2
packageA/achievement/modules/clue.wxml

@@ -70,5 +70,4 @@
     <My_empty wx:if="{{!list.length}}" />
     <My_empty wx:if="{{!list.length}}" />
     <view style="height: 80rpx;" />
     <view style="height: 80rpx;" />
 </Yl_ListBox>
 </Yl_ListBox>
-
-<Yl_Filtrate1 show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" />
+<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" bindinterrupt='interrupt' />

+ 28 - 4
packageA/achievement/modules/project.js

@@ -22,22 +22,29 @@ Component({
         filtratelist: [{
         filtratelist: [{
             label: "时间筛选",
             label: "时间筛选",
             index: 2,
             index: 2,
+            default: 2,
             showName: "name", //显示字段
             showName: "name", //显示字段
             valueKey: "dateType", //返回Key
             valueKey: "dateType", //返回Key
             value: "value", //选中值
             value: "value", //选中值
             selectKey: "value",
             selectKey: "value",
+            interrupt: true,
+            relevance: "dateRange",
             list: [{
             list: [{
                 name: "本日",
                 name: "本日",
-                value: "日"
+                value: "日",
+                day: 1
             }, {
             }, {
                 name: "本周",
                 name: "本周",
-                value: "周"
+                value: "周",
+                day: 7
             }, {
             }, {
                 name: "本月",
                 name: "本月",
-                value: "月"
+                value: "月",
+                month: 1
             }, {
             }, {
                 name: "本年",
                 name: "本年",
-                value: "年"
+                value: "年",
+                month: 12
             }]
             }]
         }]
         }]
     },
     },
@@ -45,6 +52,12 @@ Component({
         handleFilter({
         handleFilter({
             detail
             detail
         }) {
         }) {
+            if (detail.name == "reset") {
+                this.selectComponent("#Yl_Filtrate1").queryMonths(1)
+                this.setData({
+                    'filtratelist[0].index': 2
+                })
+            }
             this.setData({
             this.setData({
                 "content.dateType": detail.dateType,
                 "content.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
                 "content.where.dateType": detail.dateType,
@@ -53,6 +66,17 @@ Component({
             });
             });
             this.getList(true);
             this.getList(true);
         },
         },
+        interrupt({
+            detail
+        }) {
+            if (detail.data.label == "时间筛选") {
+                if (detail.item.day) {
+                    this.selectComponent("#Yl_Filtrate1").queryDays(detail.item.day)
+                } else {
+                    this.selectComponent("#Yl_Filtrate1").queryMonths(detail.item.month)
+                }
+            }
+        },
         init(type, dataid) {
         init(type, dataid) {
             console.log(this.data.filtratelist)
             console.log(this.data.filtratelist)
             if (this.data.content.dataid != dataid) {
             if (this.data.content.dataid != dataid) {

+ 1 - 1
packageA/achievement/modules/project.wxml

@@ -71,4 +71,4 @@
     <My_empty wx:if="{{!list.length}}" />
     <My_empty wx:if="{{!list.length}}" />
     <view style="height: 80rpx;" />
     <view style="height: 80rpx;" />
 </Yl_ListBox>
 </Yl_ListBox>
-<Yl_Filtrate1 show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" />
+<Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrete}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter" bindinterrupt='interrupt' />