zhaoxiaohai 3 лет назад
Родитель
Сommit
3a3e33bb71
2 измененных файлов с 38 добавлено и 44 удалено
  1. 35 41
      packageA/work/index.js
  2. 3 3
      packageA/work/index.wxml

+ 35 - 41
packageA/work/index.js

@@ -1,14 +1,8 @@
 const _Http = getApp().globalData.http;
 Page({
-    /* , {
-            label: "筛选",
-            icon: "icon-shaixuan",
-            color: "",
-            width: "",
-            id: "2"
-        } */
     data: {
         list: [],
+        filtrate: false,
         navList: [{
             label: "我负责的",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -21,6 +15,12 @@ Page({
             color: "",
             width: "",
             id: "sort"
+        }, {
+            label: "筛选",
+            icon: "icon-shaixuan",
+            color: "",
+            width: "",
+            id: "2"
         }],
         classActions: [{
                 name: '我负责的',
@@ -56,11 +56,34 @@ Page({
             "sort": []
         },
         classShow: false, //type类型
-        filter: {
-            statusActive: "",
-            startdate: "",
-            enddate: ""
-        }
+        filtratelist: [{
+            label: "任务状态",
+            index: null,
+            showName: "name", //显示字段
+            valueKey: "status", //返回Key
+            selectKey: "name", //传参 代表选着字段 不传参返回整个选择对象
+            value: "", //选中值
+            list: [{
+                name: "待执行"
+            }, {
+                name: "进行中"
+            }, {
+                name: "已完成"
+            }]
+        }]
+    },
+    /* 导航点击功能 */
+    navOnClick({
+        detail
+    }) {
+        if (detail.label == '筛选') this.setData({
+            filtrate: true
+        })
+    },
+    /* 处理筛选 */
+    handleFilter(e) {
+        this.data.content.where.status = e.detail.status || "";
+        this.getList(true)
     },
     /* 去添加 */
     toAdd() {
@@ -88,35 +111,6 @@ Page({
             [`filter.${name}`]: value
         })
     },
-    /* 处理筛选 */
-    handleFilter({
-        detail
-    }) {
-        const data = this.data.filter;
-        switch (detail) {
-            case 'confirm':
-                this.setData({
-                    'content.where.status': data.statusActive,
-                    'content.where.startdate': data.startdate,
-                    'content.where.enddate': data.enddate,
-                    'filter.show': false
-                });
-                this.getList(true);
-                break;
-            case 'reset':
-                this.setData({
-                    'filter.statusActive': "",
-                    'filter.startdate': "",
-                    'filter.enddate': "",
-                });
-                break;
-            case 'close':
-                this.setData({
-                    'filter.show': false
-                });
-                break;
-        }
-    },
     getList(init = false) {
         //init 用于初始化分页
         if (init.detail != undefined) init = init.detail;

+ 3 - 3
packageA/work/index.wxml

@@ -1,6 +1,5 @@
-<Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bind:onSearch='onSearch' />
+<Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bind:onSearch='onSearch' bindonClick='navOnClick' />
 <view class="total">共{{content.total}}个</view>
-
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <list list='{{list}}' />
 </Yl_ListBox>
@@ -25,4 +24,5 @@
     </view>
 </Yl_filtrate>
 <!-- 浮动按钮 -->
-<Yl_FloatingButton bindtap="toAdd" />
+<Yl_FloatingButton bindtap="toAdd" />
+<Yl_Filtrate1 show='{{filtrate}}' list="{{filtratelist}}" bindhandle="handleFilter" />