diff --git a/public/components/complaintDetail/complaintDetail.html b/public/components/complaintDetail/complaintDetail.html new file mode 100644 index 000000000..5155a3af5 --- /dev/null +++ b/public/components/complaintDetail/complaintDetail.html @@ -0,0 +1,94 @@ + \ No newline at end of file diff --git a/public/components/complaintDetail/complaintDetail.js b/public/components/complaintDetail/complaintDetail.js new file mode 100644 index 000000000..39f97dfdc --- /dev/null +++ b/public/components/complaintDetail/complaintDetail.js @@ -0,0 +1,55 @@ +(function (vc, vm) { + + vc.extends({ + data: { + complaintDetailInfo: { + complaintId: '', + typeCd: '', + complaintName: '', + tel: '', + context: '', + typeCdName: '', + stateName: '', + roomName: '', + currentUserName: '', + currentUserTel: '', + currentUserId: '', + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('complaintDetail', 'openComplaintDetailModal', function (_params) { + vc.component.refreshcomplaintDetailInfo(); + $('#complaintDetailModel').modal('show'); + let _roomName = _params.floorNum + '号楼' + _params.unitNum + '单元' + _params.roomNum + '室'; + vc.copyObject(_params, vc.component.complaintDetailInfo); + $that.complaintDetailInfo.roomName = _roomName; + $that.complaintDetailInfo.currentUserName = _params.currentUserName == '' ? '无':_params.currentUserName; + $that.complaintDetailInfo.currentUserTel = _params.currentUserTel == '' ? '无':_params.currentUserTel; + $that.complaintDetailInfo.currentUserId = _params.currentUserId == '' ? '无':_params.currentUserId; + vc.component.complaintDetailInfo.communityId = vc.getCurrentCommunity().communityId; + }); + }, + methods: { + refreshcomplaintDetailInfo: function () { + vc.component.complaintDetailInfo = { + complaintId: '', + typeCd: '', + complaintName: '', + tel: '', + context: '', + typeCdName: '', + stateName: '', + roomName: '', + currentUserName: '', + currentUserTel: '', + currentUserId: '', + + } + } + } + }); + +})(window.vc, window.vc.component); diff --git a/public/components/complaintManage/complaintManage.html b/public/components/complaintManage/complaintManage.html index 6b8055720..fcec50061 100644 --- a/public/components/complaintManage/complaintManage.html +++ b/public/components/complaintManage/complaintManage.html @@ -83,20 +83,22 @@ > - 投诉ID + 投诉类型 房屋 投诉人 投诉电话 投诉状态 - 操作 + 处理人 + 处理电话 + 操作 - {{complaint.complaintId}} + {{complaint.typeCdName}} {{complaint.floorNum}}号楼{{complaint.unitNum}}单元{{complaint.roomNum}}室 @@ -104,7 +106,14 @@ {{complaint.complaintName}} {{complaint.tel}} {{complaint.stateName}} - + {{complaint.currentUserName == '' ? '无':complaint.currentUserName}} + {{complaint.currentUserTel == ''?'无':complaint.currentUserTel}} + +
+ +
diff --git a/public/components/complaintManage/complaintManage.js b/public/components/complaintManage/complaintManage.js index 7f09c0b69..5287d2a5d 100644 --- a/public/components/complaintManage/complaintManage.js +++ b/public/components/complaintManage/complaintManage.js @@ -77,6 +77,9 @@ vc.component._listComplaints(DEFAULT_PAGE, DEFAULT_ROWS); }, + _openComplaintDetailModel:function(_complaint){ + vc.emit('complaintDetail', 'openComplaintDetailModal', _complaint); + }, _moreCondition: function () { if (vc.component.complaintManageInfo.moreCondition) { vc.component.complaintManageInfo.moreCondition = false; diff --git a/public/import/hc.xlsx b/public/import/hc.xlsx index 2f78af458..5acb3fb55 100644 Binary files a/public/import/hc.xlsx and b/public/import/hc.xlsx differ diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index be42b5715..2e165a89e 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -1905,7 +1905,7 @@ vc 校验 工具类 -method //只要窗口高度发生变化,就会进入这里面,在这里就可以写,回到聊天最底部的逻辑 let _vcPageHeight = document.getElementsByClassName('vc-page-height')[0]; //浏览器可见高度 - let _minHeight = _targetDiv.clientHeight; + let _minHeight = document.documentElement.clientHeight; let _scollHeight = _targetDiv.scrollHeight; if (_scollHeight < _minHeight) {