漏斗修改

packageA/salesHourglass/index.js

@@ -43,6 +43,11 @@ Page({
             "begindate": "",
             "enddate": "",
             "departmentid": ""
+        },
+        content: {
+            nocache: true,
+            dataid: 0,
+            type: 0,
         }
     },
     onLoad(options) {
@@ -56,28 +61,23 @@ Page({
                 icon: "none"
             })
             let data = {
-                label: "部门",
-                index: 0,
+                label: "查询范围",
                 showName: "name", //显示字段
-                valueKey: "departmentid", //返回Key
+                valueKey: "active", //返回Key
                 value: "id", //选中值
-                selectKey: "id",
-                list: []
-            };
-            /* res.data.hr.map(v => {
+                list: res.data.hr.map(v => {
                     v.id = v.userid;
-                    // v.key = v.name + v.userid;
                     v.type = '人员'
                     delete(v.rowindex)
                     delete(v.userid)
                     return v
-                }) */
+                })
+            };
             const mflat = (v, prefix) => {
                 v.subdep.forEach(s => mflat(s, v.depname));
-                v.name = v.depname; //prefix ? prefix + '/' + v.depname : v.depname
+                v.name = v.depname; 
                 v.type = '部门';
                 v.id = v.departmentid;
-                // v.key = v.name + v.id;
                 delete(v.depname)
                 delete(v.departmentid)
                 delete(v.parentid)
@@ -86,14 +86,8 @@ Page({
                 data.list.unshift(v)
             };
             res.data.dep.forEach(v => mflat(v))
-            data.list.map((v, i) => {
-                v.index = i;
-                if (v.type == '人员' && v.id == wx.getStorageSync('userMsg').userid) data.index = i;
-                return v
-            })
             this.setData({
-                "filtratelist[0]": data,
-                active: data.list[data.index]
+                "filtratelist[0]": data
             });
         });
     },
@@ -105,25 +99,18 @@ Page({
             showFiltrate: true
         })
     },
-    handleFilter({
-        detail
-    }) {
-        this.setData({
-            where: {
-                "begindate": detail.startdate,
-                "enddate": detail.enddate,
-                "departmentid": detail.departmentid
-            }
-        })
+    handleFilter(e) {
+        let {
+            active
+        } = e.detail;
+        this.data.content.type = active.type == '人员' ? 0 : 1;
+        this.data.content.dataid = active.id;
         this.setChartData();
     },
     setChartData() {
         _Http.basic({
             "id": 20230630151504,
-            "content": {
-                nocache: true,
-                where: this.data.where
-            }
+            "content": this.data.content
         }).then(res => {
             console.log("漏斗数据", res)
             let full = Math.max(...res.data.map(v => v.sequence1));

packageA/salesHourglass/index.wxml

@@ -33,9 +33,9 @@
     </view>
     <view class="row">
         <view>
-            总计签约金额：{{item.signamount_due}}元
+            总计签约金额：{{item.signamount_due}}万元
         </view>
     </view>
 </view>
 <My_empty wx:if="{{!statistics.length}}" />
-<Yl_Filtrate1 show='{{showFiltrate}}' dateRange list="{{filtratelist}}" bindhandle="handleFilter" />
+<Yl_Filtrate1 show='{{showFiltrate}}' dateRange='{{false}}' list="{{filtratelist}}" bindhandle="handleFilter" />