居民编辑两小时内如果输入密码去除密码验证,人房页面跳转新增房屋跟居民带入所选组织

pages/resiAndHouse/resiAndHouse.js

@@ -279,8 +279,8 @@ Page({
         })
     },
     onChangeJm(e) {
-        console.log(e);
-        const { value, selectedOptions } = e.detail;
+            console.log(e);
+            const { value, selectedOptions } = e.detail;
             const level = selectedOptions[selectedOptions.length - 1].level;
             const orgId = selectedOptions[selectedOptions.length - 1].id;
             const cascaderName =  selectedOptions.map(item=>item.label).join('');
@@ -289,6 +289,8 @@ Page({
                 cascaderName,
                 tableData:[],
                 pageNo: 1,
+                selectedOptions,
+                loadLeve:selectedOptions.findIndex(item=>item.level === 'house') !== -1 ? 'house':''
             })
             getNextTree({ level, id: value }).then(res => {
                 if (res.data.length > 0) {
@@ -325,7 +327,6 @@ Page({
             cascaderName: e.detail.selectedOptions.map(item => item.label).join(','),
             tableData: []
         })
-        this.getTableData()
         this.getAllOrgCategoryCount()
     },
     onChangeFw(e) {
@@ -385,7 +386,8 @@ Page({
                 // orgId: value,
                 level,
             },
-            tableFwData:[]
+            tableFwData:[],
+            selectedOptions
         });
         this.getTableFwData()
     },
@@ -564,8 +566,23 @@ Page({
 
     },
     toAddResi(){
+        let grid = this.data.selectedOptions.filter(item=>item.level === 'grid')[0].id;
+        let neighborHoodId = this.data.selectedOptions.filter(item=>item.level === "neighborHood")[0].id
+        let buildingId = this.data.selectedOptions.filter(item=>item.level === "building")[0].id
+        let buildingUnitId = this.data.selectedOptions.filter(item=>item.level === "unit")[0].id
+        let doorId = this.data.selectedOptions.filter(item=>item.level === "house")[0].id
+        wx.navigateTo({
+            url: `/subpages/addResi/pages/addResi/addResi?type=add&grid=${grid}&neighborHoodId=${neighborHoodId}&buildingId=${buildingId}&buildingUnitId=${buildingUnitId}&doorId=${doorId}`,
+        })
+    },
+    toAddHouse(){
+        let grid = this.data.selectedOptions.filter(item=>item.level === 'grid')[0].id;
+        let neighborHoodId = this.data.selectedOptions.filter(item=>item.level === "neighborHood")[0].id
+        let buildingId = this.data.selectedOptions.filter(item=>item.level === "building")[0].id
+        let buildingUnitId = this.data.selectedOptions.filter(item=>item.level === "unit")[0].id
+        let ids = {grid,neighborHoodId,buildingId,buildingUnitId}
         wx.navigateTo({
-            url: `/subpages/addResi/pages/addResi/addResi`,
+            url: `/subpages/addhouse/pages/addhouse/addhouse?ids=${JSON.stringify(ids)}`,
         })
     },
     getTableFwData: async function () {

pages/resiAndHouse/resiAndHouse.wxml

@@ -87,8 +87,8 @@
             </view>
             <!-- <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}"></load-more> -->
             <!-- <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data> -->
-            <view  class="loadVisible">{{loadMoreType == 'more'?'加载中...':'如果找不到该居民的信息，您也可以先'}}<text wx:if="{{loadMoreType == 'none'}}" style="color: #3A80E7;" bind:tap="toAddResi">新增居民</text></view>
-        </scroll-view>
+            <view  class="loadVisible">{{loadMoreType == 'more'?'加载中...':'暂无数据'}}</view>
+            <view wx:if="{{loadLeve == 'house'}}" bind:tap="toAddResi" class="btoBtn">新增居民</view></scroll-view>
     </view>
 
 </view>
@@ -156,6 +156,7 @@
             <no-data isShow="{{nodatafw}}" wx:if="{{nodatafw}}"></no-data>
         </scroll-view>
     </view>
+    <view wx:if="{{selectVale === 'house' && selectedOptions}}" bind:tap="toAddHouse" class="btoBtn">新增房屋</view>
 </view>
 <custom-tab-bar></custom-tab-bar>
 <van-popup show="{{ showAngenCascader }}" round position="bottom">

pages/resiAndHouse/resiAndHouse.wxss

@@ -1577,4 +1577,19 @@ page {
 .list_card .right image{
     width: 20rpx;
     height: 20rpx;
+}
+.btoBtn{
+    position: fixed;
+    bottom: 170rpx;
+    width: 170rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    color: #ffffff;
+    left: 50%;
+    text-align: center;
+    transform: translateX(-85rpx);
+    border-radius: 30px;
+    background-color: #3974f6;
+    /* padding: 10rpx 25rpx;
+    box-sizing: border-box; */
 }

subpages/addResi/pages/addResi/addResi.js

@@ -698,6 +698,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: async function (options) {
+    console.log(options,'seeee');
     this.setData({
       agencyId: app.globalData.user.agencyId,
       'form.resideInfoDtos[0].agencyId': app.globalData.user.agencyId,

subpages/addhouse/pages/addhouse/addhouse.js

@@ -102,21 +102,37 @@ Page({
             formType:options.type,
             houseId:options.houseId
         })
-       await this.getGridoptionDict()
+        await this.getGridoptionDict()
         if(options.houseId){
             wx.setNavigationBarTitle({
               title: '修改房屋信息',
             })
            await this.getClearHouseDeatilById()
            
-        }else{
+        }else if(options.ids){
+            let ids = JSON.parse(options.ids);
             this.setData({
+                gridId:ids.grid,
+                'form.neighborHoodId':ids.neighborHoodId,
+                'form.buildingId':ids.buildingId,
+                'form.buildingUnitId':ids.buildingUnitId
+            })
+            await this.delay(1000)
+            await  this.bindPickerChangeGrid();
+            await this.delay(400)
+            await this.bindPickerChangeneighborHoodId();
+            await this.delay(400)
+            await this.bindPickerChangebuilding();
+            await this.delay(400)
+            await  this.bindPickerChangeUnit();
+        }else{
+           this.setData({
                 isFirstLoadGrid:false,
                 isFirstLoadVillage: false,
                 isFirstLoadBuilding:false,
                 isFirstLoadUnit:false,
                 isFirstLoadHouse:false,
-            })
+            }) 
         }
     },
     getClearHouseDeatilById: async function() {
@@ -151,18 +167,21 @@ Page({
             this.setData(data, resolve);
         });
     },
-   getGridoptionDict(){
+    async getGridoptionDict(){
+    try {
         let parm ={
             agencyId:this.data.agencyId,
             purpose:'addorupdate'
         }
-        api.getGridoptionDict(parm).then(res=>{
-            this.setData({
-                gridList:res.data,
-            })
-        }).catch(err=>{
-            console.log(err);
+        const res = await api.getGridoptionDict(parm);
+        this.setData({
+            gridList:res.data,
         })
+        return res;  // 返回 res 以便在其他地方使用
+      } catch (err) {
+        console.log(err);
+        throw err;  // 抛出错误以便在其他地方捕获
+      }
     },
     getQuartersOptions(gridId){
         let parm = {

subpages/searchResult/pages/resiInfo/resiInfo.js

@@ -956,8 +956,14 @@ Page({
         })
     },
     toAddResi() {
-        this.setData({
-            checkPassword:true
+        api.isUpdater(this.data.resiId).then(res=>{
+            if(res.data){
+                this.onConfirmassword()
+            }else{
+                this.setData({
+                    checkPassword:true
+                })
+            }
         })
     },
     bindPassword(e){

utils/api.js

@@ -82,7 +82,8 @@ module.exports = {
   addRecord,
   showRecord,
   inspectionStaff,
-  getChangeRecordsById
+  getChangeRecordsById,
+  isUpdater
 }
 
 // 获取公钥
@@ -430,4 +431,8 @@ function showRecord(parm){
 function inspectionStaff(parm){
   return fly.post(`data/aggregator/org/stafflist`,parm)
 }
+//两小时内输入密码无需再输入
+function isUpdater(id){
+  return fly.post(`actual/base/residentCategoryUpdateInfo/isUpdater/${id}`)
+}
 

utils/config.js

@@ -12,7 +12,6 @@ module.exports = {
     // return 'http://192.168.1.144/api/' //测试环境
     // return 'http://219.146.91.110:30801/api/'
     //return http://219.146.91.110:30801/api //外网
-
   }
   
   function getToken() {