diff --git a/pages/index/index.js b/pages/index/index.js
index 4c29379..0f974e5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -83,7 +83,7 @@ toDetaill(e){
},
toSynthesis(){
wx.navigateTo({
- url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${this.data.communitySelfInspTop.id}&qrCodeImgUrl=${this.data.communitySelfInspTop.qrCodeImgUrl}&agencyName=${this.data.communitySelfInspTop.agencyName}&monthName=${this.data.communitySelfInspTop.monthName}&questionnaireUrl=${this.data.communitySelfInspTop.questionnaireUrl}`,
+ url: `/subpages/communitySelfInsp/pages/synthesis/synthesis?inspRecordId=${encodeURIComponent(this.data.communitySelfInspTop.id)}&qrCodeImgUrl=${encodeURIComponent(this.data.communitySelfInspTop.qrCodeImgUrl)}&agencyName=${encodeURIComponent(this.data.communitySelfInspTop.agencyName)}&monthName=${encodeURIComponent(this.data.communitySelfInspTop.monthName)}&questionnaireUrl=${encodeURIComponent(this.data.communitySelfInspTop.questionnaireUrl)}&status=${encodeURIComponent(this.data.communitySelfInspTop.status)}`,
})
},
toHistoryQuery(){
@@ -217,7 +217,7 @@ onScrollToLower(e){
this.clearOneMessage(e.currentTarget.dataset.item.id)
if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
wx.navigateTo({
- url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
+ url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.targetId}`,
})
}else if(e.currentTarget.dataset.item.msgType == 'community_house'){
wx.navigateTo({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c5faa27..d534820 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -90,9 +90,11 @@
-
- {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查
-
+
+
+ {{communitySelfInspTop.agencyName}}{{communitySelfInspTop.monthName}}月份满意度自查
+
+
已提交 {{communitySelfInspTop.personQty?communitySelfInspTop.personQty:'--'}} 人
@@ -105,10 +107,9 @@
未创建{{curMonth}}月份满意度自查
- 进行中
-
+ 进行中
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 58f348c..1e51ade 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -856,6 +856,20 @@ line-height: 40rpx;
transform: translateY(-50%);
right: 0;
}
+.bg_new_box .tag{
+ display: inline-block;
+ position: absolute;
+ top: 0;
+ right: 0;
+ background: #FFEFDB;
+ border-radius: 0rpx 10rpx 0rpx 10rpx;
+ padding: 10rpx 26rpx;
+ box-sizing: border-box;
+ font-size: 24rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #FF783C;
+}
.new_h2{
margin-top: 30rpx;
margin-left: 30rpx;
diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml
index 368f096..80aeac1 100644
--- a/pages/resiAndHouse/resiAndHouse.wxml
+++ b/pages/resiAndHouse/resiAndHouse.wxml
@@ -20,7 +20,7 @@
-
+
搜索
diff --git a/subpages/addhouse/pages/addhouse/addhouse.js b/subpages/addhouse/pages/addhouse/addhouse.js
index daa51eb..7b448a3 100644
--- a/subpages/addhouse/pages/addhouse/addhouse.js
+++ b/subpages/addhouse/pages/addhouse/addhouse.js
@@ -167,7 +167,7 @@ Page({
getQuartersOptions(gridId){
let parm = {
gridId,
- agencyId:this.data.agecyId
+ agencyId:app.globalData.user.agencyId
}
api.getQuartersOptions(parm).then(res=>{
this.setData({
diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.js b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
index 0d4bbde..ea9fb16 100644
--- a/subpages/communitySelfInsp/pages/synthesis/synthesis.js
+++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
@@ -34,6 +34,7 @@ Page({
questionnaireUrl:decodeURIComponent(options.questionnaireUrl),
status:decodeURIComponent(options.status)
})
+ console.log(this.data.status);
// 获取当前日期
const currentDate = new Date();
const currentMonth = currentDate.getMonth() + 1;
diff --git a/subpages/house/pages/housePortrait/component/graph/graph.js b/subpages/house/pages/housePortrait/component/graph/graph.js
index d24d72f..fd46ea8 100644
--- a/subpages/house/pages/housePortrait/component/graph/graph.js
+++ b/subpages/house/pages/housePortrait/component/graph/graph.js
@@ -110,7 +110,7 @@ Component({
let links = data.map((item, index) => ({
"source": 0,
- "target": index+1,
+ "target": index,
"name":item.resiHouseRel ===null?'未知':item.resiHouseRel ==='0'?'自住':item.resiHouseRel === '1'?'出租':'未知',
"label": {
"align": "center",
@@ -121,9 +121,9 @@ Component({
"color": "#9cbbf9"
}
}))
- links.splice(links.length-1,1)
+ // links.splice(links.length-1,1)
let categories = data.map((item, index) => ({
- "name":item.houseHolderRel||'暂不清楚',
+ "name":item.houseHolderRel||'未知',
"id":index+1,
"itemStyle": {
"color": '#9cbbf9'
diff --git a/subpages/searchResult/pages/resiInfo/component/graph/graph.js b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
index ef1f760..1ad2f52 100644
--- a/subpages/searchResult/pages/resiInfo/component/graph/graph.js
+++ b/subpages/searchResult/pages/resiInfo/component/graph/graph.js
@@ -101,8 +101,8 @@ Component({
let links = data.map((item, index) => ({
"source": 0,
- "target": index+1,
- "name": item.houseHolderRel||'暂不清楚',
+ "target": index,
+ "name": item.houseHolderRel||'未知',
"label": {
"align": "center",
"fontSize": 12,
@@ -112,15 +112,14 @@ Component({
"color": "#9cbbf9"
}
}))
- links.splice(links.length-1,1)
let categories = data.map((item, index) => ({
- "name":item.houseHolderRel||'暂不清楚',
+ "name":item.houseHolderRel||'未知',
"id":index+1,
"itemStyle": {
"color": '#9cbbf9'
},
}))
-
+ categories.splice(0,1)
var option = {
legend: [{
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
index a854f38..65a8655 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.js
+++ b/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
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.json b/subpages/searchResult/pages/resiInfo/resiInfo.json
index b454563..1b49899 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.json
+++ b/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": "详情"
}
\ No newline at end of file
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
index e6bdb89..2529ce9 100644
--- a/subpages/searchResult/pages/resiInfo/resiInfo.wxml
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -314,6 +314,56 @@
+
+
+ 业务记录
+
+
+
+
+
+
+ 更新记录
+
+
+
+
+
+
+
+ {{item.typeName}}-{{item.operatorName}}
+ {{item.changeTime}}
+
+
+
+
+ 变更信息:
+ {{item.fieldName}}
+
+
+ 变更后:
+ {{item.beforeChangeName}}
+
+
+ 备注:
+ {{item.remark||'--'}}
+
+
+
+
+ 变更前:
+ {{item.afterChangeName}}
+
+
+ 操作人:
+ {{item.operatorName}}
+
+
+
+
+
+
+