diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js index e1a22bf..89a3798 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js @@ -161,11 +161,18 @@ Page({ 'fmData.resiId': res.data.reportUserId, 'fmData.longitude': res.data.longitude, 'fmData.latitude': res.data.latitude, + 'fmData.demandType': res.data.demandType, + 'fmData.responsibleUnit': res.data.responsibleUnit, + 'fmData.responsibleName': res.data.responsibleName, + 'fmData.responsibleMobile': res.data.responsibleMobile, agencyName: res.data.gridName, showTime: res.data.happenTime, addressContent: res.data.address, resiName: res.data.name, resiMobile: res.data.mobile, + responsibleUnit: res.data.responsibleUnit, + responsibleName: res.data.responsibleName, + responsibleMobile: res.data.responsibleMobile, uploadImageList: res.data.imageList && res.data.imageList.length > 0 ? res.data.imageList.map(item => ({ ossUrl: { url: item diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index 1d42383..f9c6cce 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -156,7 +156,7 @@ - + * 有无责任单位 @@ -170,7 +170,7 @@ - + * 责任人 @@ -180,7 +180,7 @@ - + * 责任人电话 diff --git a/subpages/myTroubleshootDemand/pages/index/index.js b/subpages/myTroubleshootDemand/pages/index/index.js index b51e9b1..c61fc82 100644 --- a/subpages/myTroubleshootDemand/pages/index/index.js +++ b/subpages/myTroubleshootDemand/pages/index/index.js @@ -1,4 +1,4 @@ -import {getMyTroubleshootDemand} from "../../../../utils/api" +import {getMyTroubleshootDemand,getMyWaitTroubleshootDemand} from "../../../../utils/api" var global = require('../../../../utils/config') const app = getApp() @@ -84,7 +84,7 @@ Page({ this.data.pageNo += 1 // 待我处理 if(this.data.checkResultFlag===0){ - this.getMyTroubleshootDemandList() + this.getMyWaitTroubleshootDemandList() } // 我上报的 if(this.data.checkResultFlag===1){ @@ -135,7 +135,7 @@ Page({ pageSize:this.data.pageSize } if(!parm.type) delete parm.type - getMyTroubleshootDemand(parm).then(res=>{ + getMyWaitTroubleshootDemand(parm).then(res=>{ this.setData({ loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none', tableData1: this.data.tableData.concat(res.data.list), @@ -163,7 +163,7 @@ Page({ toDetail(e){ console.log(e); wx.navigateTo({ - url: `/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck?id=${e.currentTarget.dataset.item.id}&type=${e.currentTarget.dataset.item.type==="event"?0:1}`, + url: `/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck?id=${e.currentTarget.dataset.item.id}&type=${(e.currentTarget.dataset.item.type==="event" || e.currentTarget.dataset.item.type==="chengguan")?0:1}`, }) }, diff --git a/utils/api.js b/utils/api.js index b13f60d..8a6e49e 100644 --- a/utils/api.js +++ b/utils/api.js @@ -56,6 +56,7 @@ module.exports = { recorHistory, serviceNumber, getMyTroubleshootDemand, + getMyWaitTroubleshootDemand, getIcEventOld, getDemandDetail, updateMeasure, @@ -331,6 +332,11 @@ function serviceNumber(parm) { function getMyTroubleshootDemand(parm) { return fly.get(`governance/demandCollect/my/collects`,parm) } + +//获取我的诉求摸排-待我处理 +function getMyWaitTroubleshootDemand(parm) { + return fly.get(`governance/demandCollect/my/orderList`,parm) +} // 过去事件详情 function getIcEventOld(parm) { return fly.post(`governance/icEventOld/detail`,parm)