Merge branch 'bug_mk' into data-page

pages/resiAndHouse/resiAndHouse.js

@@ -52,15 +52,11 @@ Page({
         showAngenCascader: false,
         agencyName: '',
         fieldName: {
-            text: 'agencyName',
-            value: 'agencyId',
-            children: 'subAgencyList'
-        },
-        fieldNameFw: {
             text: 'label',
             value: 'id',
             children: 'children'
         },
+        
         cascaderNameFw: null,
         showFw: false,
         params: {
@@ -83,7 +79,8 @@ Page({
             { name: '闲置', num: 0, value: '2' },
             { name: '未出售', num: 0, value: '3' },
         ],
-        tempList:[]
+        tempList:[],
+        angencyJmList:[]
     },
     /**
      * 生命周期函数--监听页面加载
@@ -106,7 +103,6 @@ Page({
             statusHeight: App.globalData.deviceInfo.statusHeight,
             navigationHeight: App.globalData.deviceInfo.navigationHeight,
         })
-        this.getAgencygridtree()
         this.getAllOrgCategoryCount()
         this.getTableData()
         this.getTopTreeData()
@@ -240,6 +236,7 @@ Page({
             })
             this.setData({
                 angencyFwList: [{ ...res.data, children: arr }],
+                angencyJmList:[{ ...res.data, children: arr }]
             })
         })
     },
@@ -260,6 +257,55 @@ Page({
             return item
         })
     },
+    onChangeJm(e) {
+        const { value, tabIndex, selectedOptions } = e.detail;
+        if (tabIndex > 0 && selectedOptions[selectedOptions.length - 1].level != 'house') {
+            const level = selectedOptions[selectedOptions.length - 1].level
+            const orgId = selectedOptions[selectedOptions.length - 1].id
+            this.setData({
+                searchOrgIdPath:orgId,
+                cascaderName:selectedOptions.map(item=>item.label).join(','),
+                tableData:[],
+                pageNo: 1,
+            })
+            getNextTree({ level, id: value }).then(res => {
+                if (res.data.length > 0) {
+                    const data = res.data.map(item => {
+                        if (item.level != 'house') {
+                            return {
+                                ...item,
+                                children: []
+                            }
+                        }
+                        return {
+                            ...item,
+                            children: null
+                        }
+                    });
+                    const arr = this.getTreeFun(value, this.data.angencyJmList, data);
+                    this.setData({
+                        angencyJmList: arr,
+                    })
+                } else {
+                    const arr = this.getTreeFun(value, this.data.angencyJmList, null);
+                    this.setData({
+                        angencyJmList: arr,
+                    })
+                }
+            })
+        }
+        this.getTableData()
+        this.getAllOrgCategoryCount()
+    },
+    onFinishJm(e) {
+        this.setData({
+            pageNo: 1,
+            searchOrgIdPath: e.detail.selectedOptions[e.detail.selectedOptions.length - 1].agencyId,
+            cascaderName: e.detail.selectedOptions.map(item => item.agencyName).join(','),
+            tableData: []
+        })
+        this.getAllOrgCategoryCount()
+    },
     onChangeFw(e) {
         const { value, tabIndex, selectedOptions } = e.detail;
         if (tabIndex > 0 && selectedOptions[selectedOptions.length - 1].level != 'unit') {
@@ -350,17 +396,7 @@ Page({
             showFw: true
         })
     },
-    // 组织树
-    getAgencygridtree () {
-        api.getAgencygridtree().then(res => {
-            this.getUnitoption( [res.data])
-             this.setData({
-                angencyList: [res.data],
-            })
-        }).catch(err => {
-            console.log(err);
-        })
-    },
+  
     async handelClickSearch() {
         if (this.data.selectVale === 'resi') {
             this.setData({
@@ -422,16 +458,7 @@ Page({
             url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.resiid}`,
         })
     },
-    onFinish(e) {
-        this.setData({
-            pageNo: 1,
-            searchOrgIdPath: e.detail.selectedOptions[e.detail.selectedOptions.length - 1].agencyId,
-            cascaderName: e.detail.selectedOptions.map(item => item.agencyName).join(','),
-            tableData: []
-        })
-        this.getTableData()
-        this.getAllOrgCategoryCount()
-    },
+    
     onClose() {
         this.setData({
             showAngenCascader: false

pages/resiAndHouse/resiAndHouse.wxml

@@ -148,8 +148,8 @@
 </view>
 <custom-tab-bar></custom-tab-bar>
 <van-popup show="{{ showAngenCascader }}" round position="bottom">
-    <van-cascader field-names="{{fieldName}}" wx:if="{{showAngenCascader}}" value="{{ searchOrgIdPath }}" title="请选择" options="{{ angencyList }}" bind:close="onClose" bind:finish="onFinish" />
+    <van-cascader field-names="{{fieldName}}" wx:if="{{showAngenCascader}}" value="{{ searchOrgIdPath }}" title="请选择" options="{{ angencyJmList }}" bind:close="onClose"  bind:change="onChangeJm" bind:finish="onFinishJm" />
 </van-popup>
 <van-popup show="{{ showFw }}" round position="bottom">
-    <van-cascader wx:if="{{ showFw }}" field-names="{{ fieldNameFw }}" value="{{ cascaderFwValue }}" title="请选择所在地区" options="{{ angencyFwList }}" bind:close="onCloseFw" bind:change="onChangeFw" bind:finish="onFinishFw" />
+    <van-cascader wx:if="{{ showFw }}" field-names="{{ fieldName }}" value="{{ cascaderFwValue }}" title="请选择所在地区" options="{{ angencyFwList }}" bind:close="onCloseFw" bind:change="onChangeFw" bind:finish="onFinishFw" />
 </van-popup>