From c04580cd133fb7265e4a303ba5b9dead17e68001 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 23 Jul 2024 18:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BC=96=E8=BE=91=E4=B8=A4?=
=?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=86=85=E5=A6=82=E6=9E=9C=E8=BE=93=E5=85=A5?=
=?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8E=BB=E9=99=A4=E5=AF=86=E7=A0=81=E9=AA=8C?=
=?UTF-8?q?=E8=AF=81,=E4=BA=BA=E6=88=BF=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E6=96=B0=E5=A2=9E=E6=88=BF=E5=B1=8B=E8=B7=9F=E5=B1=85?=
=?UTF-8?q?=E6=B0=91=E5=B8=A6=E5=85=A5=E6=89=80=E9=80=89=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/resiAndHouse/resiAndHouse.js | 27 ++++++++++---
pages/resiAndHouse/resiAndHouse.wxml | 5 ++-
pages/resiAndHouse/resiAndHouse.wxss | 15 +++++++
subpages/addResi/pages/addResi/addResi.js | 1 +
subpages/addhouse/pages/addhouse/addhouse.js | 39 ++++++++++++++-----
.../searchResult/pages/resiInfo/resiInfo.js | 10 ++++-
utils/api.js | 7 +++-
utils/config.js | 1 -
8 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 51f35d9..c70813b 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/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 () {
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index 0e267b4..28fbbfc 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -87,8 +87,8 @@
- {{loadMoreType == 'more'?'加载中...':'如果找不到该居民的信息，您也可以先'}}新增居民
-
+ {{loadMoreType == 'more'?'加载中...':'暂无数据'}}
+ 新增居民
@@ -156,6 +156,7 @@
+ 新增房屋
diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss
index 0b45c24..2f4ff7b 100644
--- a/pages/resiAndHouse/resiAndHouse.wxss
+++ b/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; */
}
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index f159196..503bea7 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/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,
diff --git a/subpages/addhouse/pages/addhouse/addhouse.js b/subpages/addhouse/pages/addhouse/addhouse.js
index 7b448a3..322f92b 100644
--- a/subpages/addhouse/pages/addhouse/addhouse.js
+++ b/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 = {
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
index e6cce99..1070f88 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.js
+++ b/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){
diff --git a/utils/api.js b/utils/api.js
index 2452291..b13f60d 100644
--- a/utils/api.js
+++ b/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}`)
+}
diff --git a/utils/config.js b/utils/config.js
index a32a3d6..78cc30d 100644
--- a/utils/config.js
+++ b/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() {