Browse Source

更新记录,业务记录

data-page-V4.3.1
mk 2 years ago
parent
commit
e73e7202ba
  1. 185
      subpages/searchResult/pages/resiInfo/resiInfo.js
  2. 3
      subpages/searchResult/pages/resiInfo/resiInfo.json
  3. 50
      subpages/searchResult/pages/resiInfo/resiInfo.wxml
  4. 78
      subpages/searchResult/pages/resiInfo/resiInfo.wxss
  5. 8
      utils/api.js

185
subpages/searchResult/pages/resiInfo/resiInfo.js

@ -1,6 +1,7 @@
// subpages/searchResult/pages/resiInfo/resiInfo.js
import api from "../../../../utils/api"
import { getComplainList, getShengList, getShequList, getshijianList, getxuqiuList, getfuwuList, getMultiLogList } from "../../../../utils/businessRecords.js";
var http = require('../../../../utils/request.js')
const QQMapWX = require('../../../../utils/qqmap-wx-jssdk')
const app = getApp()
@ -531,7 +532,8 @@ Page({
householdSituationArr:[],
houseHolderRelArr:[]
},
password:''
password:'',
ywData: { "12345": [], "provinceSurvey": [], "selfSurvey": [], "event": [], "need": [], "serve": [], "punchRecord": [] }
},
/**
@ -549,6 +551,8 @@ Page({
})
await this.getResiInfo()
this.getChangeRecordsById()
this.getTabData()
}
// this.data.qqMapWX = new QQMapWX({
// key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
@ -634,7 +638,9 @@ Page({
ensure_house: "保障房信息",
chronic_disease: "慢病信息",
base: "基本信息",
graph:"关系图谱"
graph:"关系图谱",
update:"更新记录",
business:"业务记录"
};
let list = Object.entries(
value
@ -649,6 +655,12 @@ Page({
list.push({
name:'关系图谱',
id:"graph"
},{
name:'业务记录',
id:"business"
},{
name:'更新记录',
id:"update"
},
)
this.setData({
@ -774,6 +786,175 @@ Page({
console.log(err);
})
},
// 获取业务记录
async getTabData() {
let params1 = {
"residList": [this.data.resiId],
"eventType": "3"
}
await getComplainList(params1).then(res => {
this.data.ywData['12345'] = res.data.list.map(item => {
return {
...item,
categorycode: item.categorycode || '--',
eventcontent: item.eventcontent || '--'
}
});
this.setData({
data: this.data.ywData
})
})
let params = {
"residList": [this.data.resiId]
}
await getShengList(params).then(res => {
if (res.data && res.data.length > 0) {
let renamedArray = [];
res.data.forEach(item => {
let renamedItem = {
categorycode: item.scope || '--',
eventcontent: item.problemDesc || '--'
};
renamedArray.push(renamedItem);
});
this.data.ywData['provinceSurvey'] = renamedArray;
this.setData({
ywData: this.data.ywData
})
} else {
this.data.ywData['provinceSurvey'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
await getShequList(params).then(res => {
if (res.data && res.data.length > 0) {
let renamedArray = [];
res.data.forEach(item => {
let renamedItem = {
categorycode: item.scope || '--',
eventcontent: item.problemDesc || '--'
};
renamedArray.push(renamedItem);
});
this.data.ywData['selfSurvey'] = renamedArray;
this.setData({
ywData: this.data.ywData
})
} else {
this.data.ywData['selfSurvey'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
await getshijianList(params).then(res => {
if (res.data && res.data.length > 0) {
let renamedArray = [];
res.data.forEach(item => {
let renamedItem = {
categorycode: item.categorycode || '--',
eventcontent: item.eventcontent || '--'
};
renamedArray.push(renamedItem);
});
this.data.ywData['event'] = renamedArray;
this.setData({
ywData: this.data.ywData
})
} else {
this.data.ywData['event'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
await getxuqiuList(params).then(res => {
if (res.data && res.data.length > 0) {
let renamedArray = [];
res.data.forEach(item => {
let renamedItem = {
categorycode: item.parentName || '--',
eventcontent: item.content || '--'
};
renamedArray.push(renamedItem);
});
this.data.ywData['need'] = renamedArray;
this.setData({
ywData: this.data.ywData
})
} else {
this.data.ywData['need'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
await getfuwuList(params).then(res => {
if (res.data && res.data.length > 0) {
let renamedArray = [];
res.data.forEach(item => {
let renamedItem = {
categorycode: item.serviceCategoryKey || '--',
eventcontent: item.serviceName || '--'
};
renamedArray.push(renamedItem);
});
this.data.ywData['serve'] = renamedArray;
this.setData({
ywData: this.data.ywData
})
} else {
this.data.ywData['serve'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
const params2 = {
"resiIdList": [this.data.resiId],
pageNo: 1,
pageSize: 1000,
}
await getMultiLogList(params2).then(res => {
if (res.data && res.data.length > 0) {
let arr = [];
res.data.forEach(item => {
item.list.forEach(item1=>{
arr.push(item1)
})
})
this.data.ywData['punchRecord'] = arr;
this.setData({
ywData: this.data.ywData,
})
} else {
this.data.ywData['punchRecord'] = [];
this.setData({
ywData: this.data.ywData
})
}
})
this.setData({
ywVisible: true
})
},
// 获取更新记录
getChangeRecordsById() {
api.getChangeRecordsById(this.data.resiId).then(res => {
console.log(res);
this.setData({
logs:res.data
})
}).catch(err => {
console.log(err);
})
},
toAddResi() {
this.setData({
checkPassword:true

3
subpages/searchResult/pages/resiInfo/resiInfo.json

@ -1,7 +1,8 @@
{
"usingComponents": {
"van-dialog": "@vant/weapp/dialog/index",
"resi-graph":"./component/graph/graph"
"resi-graph":"./component/graph/graph",
"BusinessRecord": "../../../businessRecord/businessRecord"
},
"navigationBarTitleText": "详情"
}

50
subpages/searchResult/pages/resiInfo/resiInfo.wxml

@ -314,6 +314,56 @@
<resi-graph resiId="{{resiId}}" bind:clickGraphNode="clickGraphNode" wx:if="{{resiId}}"></resi-graph>
</view>
<view class="card" id="business">
<view class="title">
<text>业务记录</text>
</view>
<BusinessRecord wx:if="{{ywVisible}}" ywData="{{ywData}}" />
</view>
<view class="card" id="update">
<view class="title">
<text>更新记录</text>
</view>
<view style="margin-top: 32rpx; padidng:0 12rpx;">
<view class="logsBox" wx:for="{{logs}}" wx:key="{{item.changeTime}}">
<view class="item-dian {{index!=0?'item-dian1':''}}">
<view class="neidian"></view>
</view>
<view class="logs-top">
<view class="logs-top-title">{{item.typeName}}-{{item.operatorName}}</view>
<view class="logs-top-time">{{item.changeTime}}</view>
</view>
<view class="logs-content">
<view class="logs-content-left">
<view>
<text class="logs-content-title">变更信息:</text>
<text class="logs-content-txt">{{item.fieldName}}</text>
</view>
<view>
<text class="logs-content-title">变更后:</text>
<text class="logs-content-txt">{{item.beforeChangeName}}</text>
</view>
<view>
<text class="logs-content-title">备注:</text>
<text class="logs-content-txt">{{item.remark||'--'}}</text>
</view>
</view>
<view class="logs-content-right">
<view>
<text class="logs-content-title">变更前:</text>
<text class="logs-content-txt">{{item.afterChangeName}}</text>
</view>
<view>
<text class="logs-content-title">操作人:</text>
<text class="logs-content-txt">{{item.operatorName}}</text>
</view>
</view>
</view>
</view>
</view>
<no-data isShow="{{logs.length===0}}" wx:if="{{logs.length===0}}"></no-data>
</view>
<!-- 走访打卡 -->
<!-- <view class="card ">
<view class="flex-sb">

78
subpages/searchResult/pages/resiInfo/resiInfo.wxss

@ -294,4 +294,82 @@ page {
.dialog{
padding: 0 20rpx;
box-sizing: border-box;
}
.logsBox {
border-left: 3rpx solid #DADEE5;
margin-left: -18rpx;
padding-left: 12rpx;
}
.logs-top {
display: flex;
justify-content: space-between;
position: relative;
top: -32rpx;
padding-left: 12rpx;
}
.logs-top-title {
height: 31rpx;
font-family: PingFang SC;
font-weight: 500;
font-size: 32rpx;
color: #333333;
line-height: 41rpx;
}
.logs-top-time {
height: 20rpx;
font-family: PingFang SC;
font-weight: 500;
font-size: 26rpx;
color: #BDBDBD;
line-height: 40rpx;
}
.logs-content {
position: relative;
top: -24rpx;
padding-top: 12rpx;
padding-bottom: 24rpx;
display: flex;
justify-content: space-between;
font-family: PingFang SC;
font-weight: 500;
font-size: 30rpx;
color: #999999;
line-height: 52rpx;
}
.logs-content-left {
width: 48%;
}
.logs-content-right {
width: 48%;
}
.logs-content-txt {
color: #333333;
}
.item-dian {
position: relative;
left: -28rpx;
width: 32rpx;
height: 32rpx;
box-sizing: border-box;
background: #FFFFFF;
border-radius: 50%;
border: 1px solid #3A80E7;
display: flex;
align-items: center;
justify-content: center;
}
.neidian {
width: 18rpx;
height: 18rpx;
background: #3A80E7;
border-radius: 50%;
}

8
utils/api.js

@ -77,7 +77,8 @@ module.exports = {
waitCollectHouseList,
nonIntResiList,
overView,
getFamilyRelationshipListByHouseId
getFamilyRelationshipListByHouseId,
getChangeRecordsById
}
// 获取公钥
@ -404,6 +405,11 @@ function nonIntResiList(parm){
function overView(parm){
return fly.get(`actual/base/communityHouse/resiAndHouseCollect/overview`,parm)
}
// 获取更新记录
function getChangeRecordsById(id) {
return fly.post(`actual/base/residentChangeRecord/getChangeRecordsById/${id}`,)
}

Loading…
Cancel
Save