From 851a124577f3d455e4194afbc27e585c8aafde42 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 02 Jan 2024 18:47:51 +0800
Subject: [PATCH] 更新
---
utils/func.js | 3
subPackage/house/family/index.vue | 156 +++++++++++++++++++++++++++++----------------------
subPackage/workbench/views/reportAudit.vue | 11 +++
store/index.js | 3
4 files changed, 104 insertions(+), 69 deletions(-)
diff --git a/store/index.js b/store/index.js
index afb51d3..41fe799 100644
--- a/store/index.js
+++ b/store/index.js
@@ -146,8 +146,9 @@
}
if (uni.getStorageSync("siteInfo").addressType == 1 || roleName == "居民") {
param.labelType = uni.getStorageSync("siteInfo").addressType;
- param.roleName = roleName;
+
}
+ param.roleName = roleName;
console.log("===>", param);
dynamicMenu(param).then(res => {
if (res.code == 200) {
diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index c87dddd..dfb24d9 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -5,41 +5,45 @@
<u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
<view>{{ curSelectSite.name }}/{{housingName}}{{buildingName}}</view>
</view>
- <block v-if="addressName">
- <view class="cur-header">
- <u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
- <view>{{neiName}}/{{housingName}}{{buildingName}}</view>
- </view>
- <view class="house-address f-26 bgc-ff">
- <text>标准地址：</text>
- <text>{{addressName}}</text>
- </view>
-
- <view class="cell flex j-c-s-b flex-wrap " v-if="addressName">
- <view class="cell-item">
- <text class="f-28 mb-20 c-99">房屋数（套）</text>
- <text class="f-30 fw">{{houseData.result2}}</text>
- <image class="cell-item-icon" src="/static/icon/statistics-nav-02.png" mode="aspectFill"></image>
- </view>
- <view class="cell-item">
- <text class="f-28 mb-20 c-99">住户数（人）</text>
- <text class="f-30 fw">{{houseData.result3}}</text>
- <image class="cell-item-icon" src="/static/icon/statistics-nav-03.png" mode="aspectFill"></image>
- </view>
- <view class="cell-item" v-if="!unitName">
- <text class="f-28 mb-20 c-99">单元数</text>
- <text class="f-30 fw">{{houseData.result4}}</text>
- <image class="cell-item-icon" src="/static/icon/statistics-nav-01.png" mode="aspectFill"></image>
- </view>
- </view>
-
-
+ <block v-if="addressName">
+ <view class="cur-header">
+ <u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
+ <view>{{neiName}}/{{housingName}}{{buildingName}}</view>
+ </view>
+ <view class="house-address f-26 bgc-ff">
+ <text>标准地址：</text>
+ <text>{{addressName}}</text>
+ </view>
+
+ <view class="cell flex j-c-s-b flex-wrap " v-if="addressName">
+ <view class="cell-item">
+ <text class="f-28 mb-20 c-99">房屋数（套）</text>
+ <text class="f-30 fw">{{houseData.result2}}</text>
+ <image class="cell-item-icon" src="/static/icon/statistics-nav-02.png" mode="aspectFill">
+ </image>
+ </view>
+ <view class="cell-item">
+ <text class="f-28 mb-20 c-99">住户数（人）</text>
+ <text class="f-30 fw">{{houseData.result3}}</text>
+ <image class="cell-item-icon" src="/static/icon/statistics-nav-03.png" mode="aspectFill">
+ </image>
+ </view>
+ <view class="cell-item" v-if="!unitName">
+ <text class="f-28 mb-20 c-99">单元数</text>
+ <text class="f-30 fw">{{houseData.result4}}</text>
+ <image class="cell-item-icon" src="/static/icon/statistics-nav-01.png" mode="aspectFill">
+ </image>
+ </view>
+ </view>
+
+
</block>
-
- <view class="search-box mt-20 around-p-20 flex a-i-c j-c-c bgc-ff" v-if="buildingList.length">
- <u-search placeholder="请输入人员名" :showAction="false" @search="getBuildingList" @clear="getBuildingList" v-model="searchKey" :clearabled="true"></u-search>
+
+ <view class="search-box mt-20 around-p-20 flex a-i-c j-c-c bgc-ff" v-if="buildingList.length">
+ <u-search placeholder="请输入人员名" :showAction="false" @search="getBuildingList" @clear="getBuildingList"
+ v-model="searchKey" :clearabled="true"></u-search>
</view>
-
+
<view class="mt-20 h0 flex-1 build-list-box content">
<u-collapse :value="buildingList.length == 1?['0']:''">
<u-collapse-item v-if="isShowBuild" style="border: none;" :name="index" :title="item.unitName"
@@ -73,6 +77,8 @@
<!-- <view v-show="!!scItem.roleType == 1">
<u-icon name="/static/icon/selected.png" size="16"></u-icon>
</view> -->
+
+
</view>
</view>
<view class="flex floor-info-box">
@@ -82,6 +88,14 @@
<text class="r floor-box">
{{scItem.houseNo}}
</text>
+ </view>
+ <view style="margin-top:5rpx;">
+ <block>
+ <view class="mr-10" style="display: inline-block;">
+ <u-tag text="测试" size="mini">
+ </u-tag>
+ </view>
+ </block>
</view>
</view>
</view>
@@ -156,8 +170,12 @@
import {
getHouseList
} from "@/api/doorplateAddress/doorplateAddress";
- import { getHouseStatistics } from "@/api/statistics/statistics.js"
-import { codeName } from "../../../common/setting";
+ import {
+ getHouseStatistics
+ } from "@/api/statistics/statistics.js"
+ import {
+ codeName
+ } from "../../../common/setting";
export default {
components: {},
@@ -166,8 +184,8 @@
isShowBuild: false,
isShowShop: false,
currentId: '',
- housingName: '', //楼盘名称
- buildingName: 1, //楼栋名称
+ housingName: '', //楼盘名称
+ buildingName: 1, //楼栋名称
addressType: 1,
// 社区编号
neiCode: "",
@@ -175,10 +193,10 @@
searchKey: '',
shopList: [],
curSelectSite: {},
- addressName:"" ,//详细地址
- neiName:"" ,//居委会名称
- unitName:"" ,//单元名称
- houseData:{}
+ addressName: "", //详细地址
+ neiName: "", //居委会名称
+ unitName: "", //单元名称
+ houseData: {}
}
},
onLoad(e) {
@@ -192,27 +210,27 @@
this.currentId = id
this.housingName = housingName
this.buildingName = buildingName
- if(addressType){
+ if (addressType) {
this.addressType = addressType
}
-
+
this.neiCode = neiCode
-
- if(e.address){ //扫码跳入
+
+ if (e.address) { //扫码跳入
this.addressName = e.address;
this.neiName = e.neiName;
this.currentId = e.buildingCode;
- if(e.unitName){
+ if (e.unitName) {
this.unitName = e.unitName;
uni.setNavigationBarTitle({
- title:`${housingName}${buildingName}${e.unitName}`
+ title: `${housingName}${buildingName}${e.unitName}`
})
- this.getHouseData(neiCode,e.unitCode,1)
- }else{
+ this.getHouseData(neiCode, e.unitCode, 1)
+ } else {
uni.setNavigationBarTitle({
- title:`${housingName}${buildingName}`
+ title: `${housingName}${buildingName}`
})
- this.getHouseData(neiCode,e.buildingCode,2)
+ this.getHouseData(neiCode, e.buildingCode, 2)
}
}
},
@@ -256,14 +274,14 @@
if (aoiList.length) {
this.isShowBuild = true
// 正常展示户室数据
-
- if(this.unitName){ //扫单元码进入过滤其它单元
+
+ if (this.unitName) { //扫单元码进入过滤其它单元
this.buildingList = aoiList.filter(e => e.unitName == this.unitName);
- }else {
- aoiList.forEach(item => {
- item.children && item.children.sort((a, b) => a.floor - b.floor)
- })
- this.buildingList = aoiList || []
+ } else {
+ aoiList.forEach(item => {
+ item.children && item.children.sort((a, b) => a.floor - b.floor)
+ })
+ this.buildingList = aoiList || []
}
}
if (shopList.length) {
@@ -299,14 +317,14 @@
let url = `/subPackage/house/houseNumber/index?stdId=${addressCode}&addressType=${addressType}`
this.$u.func.globalNavigator(url, "navTo")
},
- getHouseData(code,code2,type) {
+ getHouseData(code, code2, type) {
let params = {
code,
- roleType:1
+ roleType: 1
}
- if(type == 1){
+ if (type == 1) {
params.unitCode = code2
- }else {
+ } else {
params.buildingCode = code2
}
getHouseStatistics(params).then(res => {
@@ -476,8 +494,10 @@
padding: 20rpx;
}
+
.cell {
padding: 20rpx 20rpx 0;
+
.cell-item {
// width: 220rpx;
width: calc(50% - 20rpx);
@@ -493,7 +513,7 @@
position: relative;
box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 0, 0, 0.1);
}
-
+
.cell-item-icon {
width: 64rpx;
height: 64rpx;
@@ -501,11 +521,13 @@
right: 20rpx;
top: 20rpx;
}
+
.cell-item:nth-last-child(-n+2) {
- margin-bottom:0;
- }
+ margin-bottom: 0;
+ }
}
- .search-box{
- padding:20rpx;
+
+ .search-box {
+ padding: 20rpx;
}
</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/reportAudit.vue b/subPackage/workbench/views/reportAudit.vue
index 594e915..9be0260 100644
--- a/subPackage/workbench/views/reportAudit.vue
+++ b/subPackage/workbench/views/reportAudit.vue
@@ -28,6 +28,13 @@
<view class="text">审核信息</view>
</view> -->
<caption-row title="审核信息" />
+
+ <view class="step-list " v-for="i in defaultData.taskRepairStepList"
+ v-if="defaultData.taskRepairStepList.length">
+ <view class="f-26 mb-10 c-99">{{i.createTime}} </view>
+ <view class="f-28">{{i.content}}</view>
+ </view>
+
<view class="audit-form">
<u-form labelWidth="70" :model="form" class="form" ref="form">
<!-- <u-form-item label="事件状态" @click="showPicker" class="form-item">
@@ -524,4 +531,8 @@
border: 1px solid #EEEEEE;
}
}
+
+ .step-list {
+ padding: 15rpx 0;
+ }
</style>
\ No newline at end of file
diff --git a/utils/func.js b/utils/func.js
index d338d57..949da3d 100644
--- a/utils/func.js
+++ b/utils/func.js
@@ -26,7 +26,8 @@
const {
data
} = await dynamicMenu({
- roleId: activeRoleId
+ roleId: activeRoleId,
+ roleName: resDetail.data.roleName
})
let appMenu = data.filter(e => e.name == 'app')[0].children
--
Gitblit v1.9.3