From 03eaa258e9f6ae5aceb9e26989cd1025d35de147 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 11 Nov 2023 21:51:30 +0800
Subject: [PATCH] merge
---
pages.json | 2
subPackage/house/houseNumber/index.vue | 48 +++++-
subPackage/house/roomControl/index.vue | 13 +
subPackage/workbench/views/editExamine.vue | 120 ++++++++++------
subPackage/workbench/components/formItem.vue | 2
subPackage/workbench/views/rental.vue | 19 +
subPackage/house/roomDetails/index.vue | 2
pages/home/index.vue | 1
subPackage/workbench/views/cscj.vue | 56 ++++---
subPackage/bs/views/repair.vue | 2
subPackage/workbench/views/csjl.vue | 15 +
subPackage/house/family/index.vue | 32 ++--
subPackage/bs/views/addRepair.vue | 4
subPackage/house/list/index.vue | 44 +++---
subPackage/workbench/views/cshw.vue | 10
subPackage/workbench/views/report.vue | 7
16 files changed, 227 insertions(+), 150 deletions(-)
diff --git a/pages.json b/pages.json
index 710dc46..f98dc02 100644
--- a/pages.json
+++ b/pages.json
@@ -246,7 +246,7 @@
{
"path": "views/report",
"style": {
- "navigationBarTitleText": "报事报修",
+ "navigationBarTitleText": "保修报事",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/pages/home/index.vue b/pages/home/index.vue
index cd9b4fa..c44d4e6 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -117,7 +117,6 @@
<text class="f-32 fw">我的任务</text>
</view>
</view>
-
<view class="row flex j-c-s-b">
<view class="row-item flex_base" @click="navigatorPage(`/subPackage/workbench/views/audit?type=1`)">
<u-icon name="/static/icon/nav-07.png" width="90rpx" height="90rpx"></u-icon>
diff --git a/subPackage/bs/views/addRepair.vue b/subPackage/bs/views/addRepair.vue
index c486804..86ba038 100644
--- a/subPackage/bs/views/addRepair.vue
+++ b/subPackage/bs/views/addRepair.vue
@@ -86,8 +86,8 @@
this.info.type = option.type
},
onShow() {
- this.curSelectSite = uni.getStorageSync('siteInfo')
- this.info.addressCode = this.curSelectSite.id
+ this.curSelectSite = uni.getStorageSync('curSelectSite')
+ this.info.addressCode = this.curSelectSite.id
console.log(this.curSelectSite);
},
methods: {
diff --git a/subPackage/bs/views/repair.vue b/subPackage/bs/views/repair.vue
index 258bc13..e3460b6 100644
--- a/subPackage/bs/views/repair.vue
+++ b/subPackage/bs/views/repair.vue
@@ -114,7 +114,7 @@
},
onShow() {
this.getStatistics()
- this.curSelectSite = uni.getStorageSync('siteInfo')
+ this.curSelectSite = uni.getStorageSync('curSelectSite')
console.log(this.curSelectSite);
},
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index 5a5c401..b574149 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -8,11 +8,11 @@
<view class="h0 flex-1 build-list-box content">
<u-collapse :border="false">
<u-collapse-item v-show="isShowBuild" style="border: none;" :name="index"
- v-for="(item, index) in buildingList" :key="index">
- <!-- :title="item.unitName" -->
- <view slot="title" class="flex">
- <u-icon name="/static/icon/group.png" size="16"></u-icon>
- <view style="margin-left: 17rpx;">{{ item.unitName }}</view>
+ v-for="(item, index) in buildingList" :key="index">
+ <!-- :title="item.unitName" -->
+ <view slot="title" class="flex">
+ <u-icon name="/static/icon/group.png" size="16"></u-icon>
+ <view style="margin-left: 17rpx;">{{ item.unitName }}</view>
</view>
<view class="flex floor-content" v-for="(cItem, cIndex) in item.children" :key="cIndex">
<view class="floor-num-box flex a-i-c j-c-c">
@@ -56,10 +56,10 @@
</view>
</u-collapse-item>
<u-collapse-item class="sp-list" v-show="isShowShop" style="border: none;">
- <view slot="title" class="flex">
- <u-icon name="/static/icon/group.png" size="16"></u-icon>
- <view style="margin-left: 17rpx;">商铺</view>
- </view>
+ <view slot="title" class="flex">
+ <u-icon name="/static/icon/group.png" size="16"></u-icon>
+ <view style="margin-left: 17rpx;">商铺</view>
+ </view>
<view class="house-list-box flex" v-for="(item, index) in shopList" :name="index" :key="index"
@click.native="pushShopPage(item)">
<view class="l">
@@ -117,7 +117,7 @@
},
onShow() {
this.getBuildingList()
- this.curSelectSite = uni.getStorageSync('siteInfo')
+ this.curSelectSite = uni.getStorageSync('curSelectSite')
},
methods: {
async getBuildingList() {
@@ -179,12 +179,12 @@
height: 0;
flex: 1;
overflow-y: auto;
-
-
+
+
.content {
margin-top: 20rpx;
- background-color: #fff;
+ background-color: #fff;
.floor-info-box {
@@ -256,8 +256,8 @@
align-items: center;
width: calc(100% - 30rpx);
min-height: 116rpx;
- box-sizing: border-box;
- background-color: #FAFBFE;
+ box-sizing: border-box;
+ background-color: #FAFBFE;
margin: 15rpx;
&>view {
@@ -266,7 +266,7 @@
}
}
- .u-grid-item {
+ .u-grid-item {
border: none;
}
}
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index 6fff03f..d3c0417 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -21,7 +21,8 @@
<line-item :list="collectData">
<template #other="{ sdate }">
<view style="padding: 20rpx 0;" v-if="sdate.name === 'imageUrls' && sdate.value !== '未完善' ">
- <u--image :src="sdate.value" width="80px" height="80px" @click="imgPreview(sdate.value)"></u--image>
+ <u--image :src="sdate.value" width="80px" height="80px"
+ @click="imgPreview(sdate.value)"></u--image>
</view>
</template>
</line-item>
@@ -56,6 +57,9 @@
import {
getDoorplateAddressDetail
} from "@/api/doorplateAddress/doorplateAddress";
+ import {
+ getPlaceDetail
+ } from '@/api/place/place.js'
export default {
components: {
lineItem
@@ -191,12 +195,19 @@
},
methods: {
async getBuildingDetail() {
+ // const {
+ // code,
+ // data
+ // } = await getDoorplateAddressDetail({
+ // stdId: this.stdId
+ // })
const {
code,
data
- } = await getDoorplateAddressDetail({
- stdId: this.stdId
+ } = await getPlaceDetail({
+ houseCode: this.stdId
})
+ console.log(data);
if (code !== 200) {
uni.showToast({
title: "数据请求失败",
@@ -205,34 +216,49 @@
})
return
}
+ const doorplateAddressEntity = data?.doorplateAddressEntity || {}
+ const placePoiLabelVOList = data?.placePoiLabelVOList || {}
this.houseNumberData.forEach(item => {
if (!data[item.name]) {
- item.value = data.place[item.name] || '未完善'
+ item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
+
+ if (item.name == 'label') {
+
+ let labelArr = []
+ placePoiLabelVOList.forEach(item => {
+ labelArr.push(item.labelName)
+ })
+
+ item.value = labelArr.join('、')
+ }
})
-
+
this.gridData.forEach(item => {
if (!data[item.name]) {
- item.value = data.place[item.name] || '未完善'
+ item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
})
-
+
this.collectData.forEach(item => {
if (!data[item.name]) {
- item.value = data.place[item.name] || '未完善'
+ item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
})
-
this.policeData.forEach(item => {
- item.value = data[item.name] || '未完善'
+ if (!data[item.name]) {
+ item.value = data.doorplateAddressEntity[item.name] || '未完善'
+ } else {
+ item.value = data[item.name] || '未完善'
+ }
})
},
imgPreview(value) {
@@ -259,11 +285,13 @@
height: calc(100% - 110rpx);
padding-bottom: 20rpx;
overflow: auto;
+
.map {
width: 100%;
height: 240rpx;
background-color: #fff;
}
+
.box-title {
padding: 10px 0;
diff --git a/subPackage/house/list/index.vue b/subPackage/house/list/index.vue
index c824d88..07342bc 100644
--- a/subPackage/house/list/index.vue
+++ b/subPackage/house/list/index.vue
@@ -1,7 +1,7 @@
<template>
<view class="container">
<view class="header">
- <u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
+ <u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
<text>{{ curSelectSite.name }}/{{ curHouseTitle }}</text>
</view>
<view class="flex f-d-c main">
@@ -41,7 +41,7 @@
return {
isShowAoi:false,
isShowShop:false,
- currentId: '',
+ currentId: '',
curSelectSite: {},
curHouseTitle: '',
houseList: [{
@@ -61,8 +61,8 @@
},
onShow() {
- this.getHouseInfo()
- this.curSelectSite = uni.getStorageSync('siteInfo')
+ this.getHouseInfo()
+ this.curSelectSite = uni.getStorageSync('curSelectSite')
},
methods: {
@@ -75,9 +75,9 @@
const aoiList = res.data.aoiList
const shopList = res.data.shopList
if(aoiList.length>0){
- this.isShowAoi =true
- aoiList.forEach(item => {
- item.title = item.name
+ this.isShowAoi =true
+ aoiList.forEach(item => {
+ item.title = item.name
})
this.houseList = aoiList || [{
title: '-'
@@ -95,9 +95,9 @@
},
pushPage(value) {
- const { id, title,addressType } = value
- if (!id) {
- return
+ const { id, title,addressType } = value
+ if (!id) {
+ return
}
// addressType == 3 街路巷
if(addressType == 1 || addressType == 3){
@@ -118,9 +118,9 @@
}
</script>
-<style lang="scss" scoped>
- page {
- background-color: #f5f5f5;
+<style lang="scss" scoped>
+ page {
+ background-color: #f5f5f5;
}
.container {
width: 100%;
@@ -130,12 +130,12 @@
font-size: 26rpx;
.header {
- background-color: #fff;
- padding: 20rpx 30rpx;
- display: flex;
- color: #333333;
- text {
- margin-left: 15rpx;
+ background-color: #fff;
+ padding: 20rpx 30rpx;
+ display: flex;
+ color: #333333;
+ text {
+ margin-left: 15rpx;
}
}
@@ -143,12 +143,12 @@
position: relative;
height: 0;
flex: 1;
- overflow-y: auto;
- margin-top: 20rpx;
+ overflow-y: auto;
+ margin-top: 20rpx;
background-color: #fff;
.house-container {
- flex-wrap: wrap;
+ flex-wrap: wrap;
padding: 14rpx;
.house-list-box {
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index d455b56..b70ecf8 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -57,7 +57,7 @@
{{ labelModelInfo.title }}
</view>
- <u-radio-group class="mt-40" v-model="labelValue" placement="row">
+ <u-radio-group v-model="" class="mt-40" v-model="labelValue" placement="row">
<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in labelList" :key="index"
:label="item.name" :labelColor="item.color" :name="item.name" :activeColor="item.color" @change="radioChange(item)">
</u-radio>
@@ -178,10 +178,11 @@
title: '',
selectedColor: ''
},
- labelValue: '',
+ labelValue: "",
remark: '',
// 标记
- number: 0
+ number: 0
+
}
},
created() {
@@ -306,9 +307,11 @@
this.labelModelInfo.title = item.name
this.currentLabelInfo = item
// 遍历标签集合
- this.labelList.forEach(e => {
+ this.labelList.forEach(e => {
+ console.log(e.color,item.color);
if (e.color == item.color) {
- this.labelValue = e.name
+ this.labelValue = e.name
+ console.log(e);
this.remark = item.remark
this.number = 1
}
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index f36b605..8c8a498 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -62,7 +62,7 @@
<view class="l flex">
<u-icon name="/static/icon/selected.png" size="16"></u-icon>
<!-- u-icon name="photo"></u-icon> -->
- <view class="owner-img-box">主</view>
+ <view class="owner-img-box" v-if="item.relationship == 1">主</view>
</view>
<view class="r">
<u-icon name="/static/icon/delete.png" size="16" @click="removeHouseholdSub(item)"></u-icon>
diff --git a/subPackage/workbench/components/formItem.vue b/subPackage/workbench/components/formItem.vue
index 4e2b7a5..0bff21e 100644
--- a/subPackage/workbench/components/formItem.vue
+++ b/subPackage/workbench/components/formItem.vue
@@ -7,7 +7,7 @@
<u-form-item label="电话号码" class="form-item">
<u--input v-model="form.telephone" border="none"></u--input>
</u-form-item>
- <u-form-item label="根据地" class="form-item">
+ <u-form-item label="咱据地" class="form-item">
<u--input v-model="form.tempAddress" border="none"></u--input>
</u-form-item>
</u-form>
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index 028c8e9..e3b7237 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -265,7 +265,7 @@
},
{
label: "采集人",
- name: 'createUser',
+ name: 'createUserName',
value: "未完善"
},
{
@@ -367,7 +367,8 @@
onLoad(option) {
const {
houseCode,
- id
+ id,
+ type
} = option
this.houseCode = houseCode
this.currentId = id
@@ -375,7 +376,11 @@
this.getBuildingDetail()
}
-
+ if (!!type || type != void 0) {
+ uni.setNavigationBarTitle({
+ title: '详情'
+ })
+ }
},
onShow() {
this.getLabel()
@@ -453,11 +458,11 @@
icon: 'error'
})
return
- }
- const dpaEntity = data?.doorplateAddressEntity || {}
-
- this.form.buildingCode = dpaEntity?.buildingCode || ''
-
+ }
+ const dpaEntity = data?.doorplateAddressEntity || {}
+
+ this.form.buildingCode = dpaEntity?.buildingCode || ''
+
let buildingNameArr = [
dpaEntity?.townStreetName,
dpaEntity?.neiName,
@@ -468,17 +473,17 @@
let arr = buildingNameArr.filter(e => {
return e != null || e != ''
})
- this.form.placeName = data['placeName'] || ''
-
- Object.keys(this.form).forEach(key => {
- if (!data[key]) {
- this.form[key] = dpaEntity[key] || '未完善'
- } else {
- this.form[key] = data[key] || '未完善'
- }
- if (key === "images") {
- this.form[key] = []
- }
+ this.form.placeName = data['placeName'] || ''
+
+ Object.keys(this.form).forEach(key => {
+ if (!data[key]) {
+ this.form[key] = dpaEntity[key] || '未完善'
+ } else {
+ this.form[key] = data[key] || '未完善'
+ }
+ if (key === "images") {
+ this.form[key] = []
+ }
})
this.form.building = arr.join("")
@@ -488,20 +493,21 @@
if (!data[item.name]) {
item.value = dpaEntity[item.name] || '未完善'
} else {
- item.value = data[item.name]|| '未完善'
+ item.value = data[item.name] || '未完善'
}
})
this.publicData[key].forEach(item => {
if (!data[item.name]) {
item.value = dpaEntity[item.name] || '未完善'
} else {
- item.value = data[item.name]|| '未完善'
+ item.value = data[item.name] || '未完善'
}
})
})
data.placePoiLabelVOList.forEach(item => {
let label = this.labelList[0].children.find(sl => sl.text === item.labelName) || {}
+ console.log(label);
label['isClose'] = false
this.showLabelList.push(label)
})
@@ -544,16 +550,16 @@
const townStreet = await this.getDoorplateAddressList(null, "townStreet")
this.setColumn(townStreet, 0)
//设置社区
- const nei = await this.getDoorplateAddressList(townStreet[0].code, "nei")
+ const nei = await this.getDoorplateAddressList(townStreet[0]?.code, "nei")
this.setColumn(nei, 1)
//设置路
- const streetRu = await this.getDoorplateAddressList(nei[0].code, "streetRu")
+ const streetRu = await this.getDoorplateAddressList(nei[0]?.code, "streetRu")
this.setColumn(streetRu, 2)
//设置地区
- const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
+ const district = await this.getDoorplateAddressList(streetRu[0]?.code, "district")
this.setColumn(district, 3)
//设置楼栋
- const building = await this.getDoorplateAddressList(district[0].code, "building")
+ const building = await this.getDoorplateAddressList(district[0]?.code, "building")
this.setColumn(building, 4)
},
diff --git a/subPackage/workbench/views/cshw.vue b/subPackage/workbench/views/cshw.vue
index 36c834c..ffd876d 100644
--- a/subPackage/workbench/views/cshw.vue
+++ b/subPackage/workbench/views/cshw.vue
@@ -71,9 +71,9 @@
}
},
onShow() {
+ this.currentRole = uni.getStorageSync("activeRole")
this.resetParams()
- this.getSiteList()
- this.currentRole = uni.getStorageSync("activeRole")
+ this.getSiteList()
},
onReachBottom() {
this.pagingParams.current++
@@ -85,9 +85,11 @@
const params = {
placeName: this.keyWord,
confirmFlag: this.tabStatus
- }
+ }
+ const { roleName } = this.currentRole
const res = await getSiteMaintenanceData({
- ...params,
+ ...params,
+ roleName,
...this.pagingParams
})
console.log(res);
diff --git a/subPackage/workbench/views/csjl.vue b/subPackage/workbench/views/csjl.vue
index 0a12603..263e9c5 100644
--- a/subPackage/workbench/views/csjl.vue
+++ b/subPackage/workbench/views/csjl.vue
@@ -61,11 +61,13 @@
size: 10
},
tabsType: 1,
- status: 'nomore'
+ status: 'nomore',
+ currentRole: {}
}
},
onShow() {
- this.recordsData = []
+ this.recordsData = []
+ this.currentRole = uni.getStorageSync('activeRole')
this.getrRecordList()
},
onReachBottom() {
@@ -74,7 +76,9 @@
},
methods: {
async getrRecordList(placeName = this.iptContext, isPerfect = this.tabsType) {
- this.status = 'loadmore'
+ this.status = 'loadmore'
+ const { roleName } = this.currentRole
+ console.log(this.currentRole);
const {
code,
data: {
@@ -82,7 +86,8 @@
}
} = await getLocationRecord({
placeName,
- isPerfect,
+ isPerfect,
+ roleName,
...this.pagingParams
})
if (code !== 200) {
@@ -126,7 +131,7 @@
})
return
}
- let url = "/subPackage/workbench/views/cscj?id=" + id
+ let url = "/subPackage/workbench/views/cscj?id=" + id + "&type=1"
this.$u.func.globalNavigator(url)
}
}
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index d7edc75..3166e89 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -52,7 +52,7 @@
<script>
import {
- updatePlaceExtData,
+ updatePlaceExtData,
getPlaceDetail
} from '@/api/placeExp/placeExp.js'
import uploadMixin from "@/mixin/uploadMixin";
@@ -65,8 +65,8 @@
},
data() {
return {
- form: {
- id: '',
+ form: {
+ id: '',
placeId: '',
localtion: '',
placeName: '',
@@ -97,44 +97,68 @@
}
},
onShow() {
- this.curSelectSite = uni.getStorageSync('siteInfo')
+ this.curSelectSite = uni.getStorageSync('siteInfo')
this.getCsDetails()
+ // this.getLocation()
},
- methods: {
- getCsDetails() {
- getPlaceDetail({
- placeId: this.curSelectSite.id
- }).then(detailRes => {
- const { code, data } = detailRes
- if (code !== 200) {
- uni.showToast({
- title: '数据请求失败',
- icon: 'error'
- })
- return
- }
- const placePractitioner = data?.placePractitioner || []
- Object.keys(this.form).forEach(key => {
- this.form[key] = data[key]
- if(key === 'imageUrls' || key === 'planImageUrls') {
- this.form[key] = []
- !!data[key] && this.form[key].push()
- }
+ methods: {
+ // getLocation() {
+ // uni.chooseLocation({
+ // success: (res) => {
+ // console.log(res);
+ // }
+ // })
+ // },
+ getCsDetails() {
+ getPlaceDetail({
+ placeId: this.curSelectSite.id
+ }).then(detailRes => {
+ const {
+ code,
+ data
+ } = detailRes
+ if (code !== 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ const placePractitioner = data?.placePractitioner || []
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = data[key]
+ if (key === 'imageUrls' || key === 'planImageUrls') {
+ this.form[key] = []
+ if (!!data[key]) {
+ data[key] = JSON.parse(data[key])
+ if (Array.isArray(data[key])) {
+ this.form[key] = data[key]
+ }
+ } else {
+ this.form[key].push(data[key])
+ }
+ }
})
- this.personNum = placePractitioner.length
- this.$nextTick(() => {
- console.log(placePractitioner);
- this.$refs.formItemRef.forEach((item, index) => {
- item.form = placePractitioner[index]
- })
- })
- })
- },
+
+ console.log(this.form);
+ this.personNum = placePractitioner.length
+ this.$nextTick(() => {
+ console.log(placePractitioner);
+ this.$refs.formItemRef.forEach((item, index) => {
+ item.form = placePractitioner[index]
+ })
+ })
+ })
+ },
updatePlaceExt(data) {
- data['imageUrls'] = JSON.stringify(data['imageUrls'])
- data['planImageUrls'] = JSON.stringify(data['planImageUrls'])
- updatePlaceExtData({...data}).then(res => {
- const { code } = res
+ data['imageUrls'] = data['imageUrls'].join('、')
+ data['planImageUrls'] = data['planImageUrls'].join('、')
+ updatePlaceExtData({
+ ...data
+ }).then(res => {
+ const {
+ code
+ } = res
if (code !== 200) {
uni.showToast({
title: '提交失败',
@@ -151,19 +175,19 @@
}, 1500)
}
})
- })
- },
- addPerson() {
- this.personNum++
- },
- submit() {
- const placePractitioner = []
+ })
+ },
+ addPerson() {
+ this.personNum++
+ },
+ submit() {
+ const placePractitioner = []
this.$refs.formItemRef.forEach(item => {
- item.form.placeId = this.form.placeId
- placePractitioner.push(item.form)
- })
+ item.form.placeId = this.form.placeId
+ placePractitioner.push(item.form)
+ })
this.form.placePractitioner = placePractitioner
- this.updatePlaceExt(this.form)
+ this.updatePlaceExt(this.form)
},
pushPage() {
this.$u.func.globalNavigator('/subPackage/workbench/views/cshw')
diff --git a/subPackage/workbench/views/rental.vue b/subPackage/workbench/views/rental.vue
index 085ead8..2782260 100644
--- a/subPackage/workbench/views/rental.vue
+++ b/subPackage/workbench/views/rental.vue
@@ -158,7 +158,8 @@
})
}
},
- onLoad() {
+ onLoad() {
+ this.currentRole = uni.getStorageSync('activeRole')
this.getStatistics()
},
onShow() {
@@ -193,11 +194,15 @@
scrollTop: 0, // 滚动到页面的目标位置（单位px）
});
},
- getStatistics(auditStatus = '') {
- let params = {}
+ getStatistics(auditStatus = '') {
+ const { roleName } = this.currentRole
+ let params = {
+ roleName
+ }
if (auditStatus) {
params = {
- auditStatus
+ auditStatus,
+ roleName
}
}
getStatistics(params).then(res => {
@@ -212,7 +217,8 @@
return res.name
},
async getRentalHouseInfo(params = {}) {
- this.loadingStatus = 'loadmore'
+ this.loadingStatus = 'loadmore'
+ const { roleName } = this.currentRole
const {
code,
data: {
@@ -220,7 +226,8 @@
}
} = await getRentalHouseContent({
tenantName: this.keyword,
- ...this.pagingParams,
+ ...this.pagingParams,
+ roleName,
...this.selectParams
})
if (code !== 200) {
diff --git a/subPackage/workbench/views/report.vue b/subPackage/workbench/views/report.vue
index beea98b..cabbc65 100644
--- a/subPackage/workbench/views/report.vue
+++ b/subPackage/workbench/views/report.vue
@@ -93,6 +93,7 @@
}
},
onShow() {
+ this.currentRole = uni.getStorageSync("activeRole")
this.reportList = []
this.getPageList()
},
@@ -106,9 +107,11 @@
const params = {
realName: this.keyWord,
confirmFlag: this.tabStatus
- }
+ }
+ const { roleName } = this.currentRole
const res = await getPage({
- ...params,
+ ...params,
+ roleName,
...this.pagingParams
})
const {
--
Gitblit v1.9.3