diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js index 215f5ac..62d7be5 100644 --- a/components/custom-tab-bar/index.js +++ b/components/custom-tab-bar/index.js @@ -1,10 +1,11 @@ import {getStaffbasicinfo} from "../../utils/api"; const app = getApp() -import {getOwnedRolesOfStaffId} from '../../utils/statisticsApi.js' +import {getOwnedRolesOfStaffId,editstaffinit} from '../../utils/statisticsApi.js' Component({ data: { + manageOrgNameList:[], selected: 0, color: "#999", selectedColor: "#3A80E7", @@ -52,28 +53,58 @@ Component({ }, attached() { }, - ready: function () { + ready: async function () { this.setData({ selected: app.globalData.selected }) + console.log(app.globalData.roleList,"dskldlsk"); // secretary 书记 admin 管理员 - console.log( app.globalData.roleList.filter(item => item.roleKey === 'secretary')) if(app.globalData.roleList.length <= 0) { - - getStaffbasicinfo().then(res=>{ - getOwnedRolesOfStaffId(res.data.id).then(res2 => { - app.globalData.user = res.data - this.setData({ - "list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0 - }) - }) - }) + const res = await getStaffbasicinfo(); + // 处理员工信息 + const res4 = await editstaffinit({ + agencyId: res.data.agencyId, + staffId: res.data.id + }); + console.log(res4.data.manageOrgNameList, "dsfkljdsf"); + // 确保数据是数组,避免 undefined + this.setData({ + manageOrgNameList: res4.data.manageOrgNameList || [] + }); + console.log(this.data.manageOrgNameList, "第二次"); + // 获取角色信息 + const res2 = await getOwnedRolesOfStaffId(res.data.id); + // 更新全局数据 + app.globalData.user = res.data; + // 更新 UI 数据 + this.setData({ + "list[3].show": res2.data.some(item => + ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey) + ) || this.data.manageOrgNameList.length > 0 + }); + + console.log( + res2.data.some(item => + ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey) + ) || this.data.manageOrgNameList.length > 0, + "dskjvdsljk" + ); } else { + editstaffinit({ + agencyId: app.globalData.user.agencyId, + staffId: app.globalData.user.id + }).then(res4 => { this.setData({ - "list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'administrator' || item.roleKey === 'street_secretary').length > 0 - }) + manageOrgNameList: res4.data.manageOrgNameList || [] + }, () => { + this.setData({ + "list[3].show": app.globalData.roleList.some(item => + ['secretary', 'administrator', 'street_secretary'].includes(item.roleKey) + ) || this.data.manageOrgNameList.length > 0 + }); + }); + }); } - console.log(app.globalData.roleList, 'userss') }, methods: { switchTab(e) { diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index b1b3d72..1f20462 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -7,14 +7,6 @@ {{userName}} {{agencyName}} - - - 网格长 - - - 楼长 - - diff --git a/utils/api.js b/utils/api.js index 8152962..000c25f 100644 --- a/utils/api.js +++ b/utils/api.js @@ -90,7 +90,7 @@ module.exports = { Enterpriseambiguity, hotResidentSearch, hotHouseSearch, - customerlist + customerlist, } // 获取公钥 @@ -144,6 +144,7 @@ function getCommunityHouse(para) { function getStaffbasicinfo(para) { return fly.post('epmetuser/customerstaff/staffbasicinfo', para) } + // 新增居民 function resiAdd(para) { return fly.post('actual/base/residentBaseInfo/save', para) diff --git a/utils/statisticsApi.js b/utils/statisticsApi.js index fcb222c..957c05c 100644 --- a/utils/statisticsApi.js +++ b/utils/statisticsApi.js @@ -277,6 +277,10 @@ export function dwdEventEventList(params) { export function getOwnedRolesOfStaffId(id) { return request.get('gov/access/govroleuser/getOwnedRolesOfStaffId/'+id) } +//修改信息 +export function editstaffinit(para) { + return request.post('gov/org/staff/editstaffinit', para) +} // 房屋性质 export function getHouseType(params) { return request.post('sys/dict/data/house',params)