diff --git a/public/components/property/editOwnerRepair/editOwnerRepair.html b/public/components/property/editOwnerRepair/editOwnerRepair.html index e75f57043..c6fd37b4a 100644 --- a/public/components/property/editOwnerRepair/editOwnerRepair.html +++ b/public/components/property/editOwnerRepair/editOwnerRepair.html @@ -7,40 +7,7 @@
- +
diff --git a/public/components/property/visitOwnerRepair/visitOwnerRepair.html b/public/components/property/visitOwnerRepair/visitOwnerRepair.html new file mode 100644 index 000000000..af9a520e9 --- /dev/null +++ b/public/components/property/visitOwnerRepair/visitOwnerRepair.html @@ -0,0 +1,44 @@ + diff --git a/public/components/property/visitOwnerRepair/visitOwnerRepair.js b/public/components/property/visitOwnerRepair/visitOwnerRepair.js new file mode 100644 index 000000000..7eee422fe --- /dev/null +++ b/public/components/property/visitOwnerRepair/visitOwnerRepair.js @@ -0,0 +1,94 @@ +(function (vc, vm) { + vc.extends({ + data: { + visitOwnerRepairInfo: { + repairId: '', + visitType: '', + context: '' + } + }, + _initMethod: function () { + vc.component._initEditOwnerRepairInfo(); + }, + _initEvent: function () { + + vc.on('visitOwnerRepair', 'openVisitOwnerRepairModal', function (_params) { + vc.component.refreshVisitOwnerRepairInfo(); + vc.copyObject(_params, vc.component.visitOwnerRepairInfo); + $('#visitOwnerRepairModel').modal('show'); + vc.component.visitOwnerRepairInfo.communityId = vc.getCurrentCommunity().communityId; + }); + }, + methods: { + visitOwnerRepairValidate: function () { + return vc.validate.validate({ + visitOwnerRepairInfo: vc.component.visitOwnerRepairInfo + }, { + 'visitOwnerRepairInfo.visitType': [ + { + limit: "required", + param: "", + errInfo: "报修类型不能为空" + }, + { + limit: "maxin", + param: "2,50", + errInfo: "报修类型错误" + }, + ], + 'visitOwnerRepairInfo.context': [ + { + limit: "required", + param: "", + errInfo: "报修内容不能为空" + }, + { + limit: "maxLength", + param: "1000", + errInfo: "报修内容不能超过1000个字" + }, + ], + 'visitOwnerRepairInfo.repairId': [ + { + limit: "required", + param: "", + errInfo: "报修ID不能为空" + }] + }); + }, + _visitOwnerRepair: function () { + + if (!vc.component.visitOwnerRepairValidate()) { + vc.toast(vc.validate.errInfo); + return; + } + vc.component.visitOwnerRepairInfo.communityId = vc.getCurrentCommunity().communityId; + vc.http.apiPost( + '/repair/saveRepairReturnVisit', + JSON.stringify(vc.component.visitOwnerRepairInfo), + { + emulateJSON: true + }, + function (json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + if (res.status == 200) { + //关闭model + $('#visitOwnerRepairModel').modal('hide'); + vc.emit('repairReturnVisit', 'listRepairPool', {}); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + }, + refreshVisitOwnerRepairInfo: function () { + vc.component.visitOwnerRepairInfo = { + repairId: '', + visitType: '', + context: '' + } + } + } + }); +})(window.vc, window.vc.component); diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html index aba15b480..e99f98268 100644 --- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html +++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html @@ -72,6 +72,20 @@
+
+
+
+ + +
+
+
+
+ + +
+
+
@@ -91,9 +105,9 @@
+ v-for="(item,index) in ownerRepairDetailInfo.repairPhotos"> + v-on:click="openFile(item)" />
@@ -113,9 +127,9 @@
+ v-for="(item,index) in ownerRepairDetailInfo.beforePhotos"> + v-on:click="openFile(item)" />
@@ -135,9 +149,9 @@
+ v-for="(item,index) in ownerRepairDetailInfo.afterPhotos"> + v-on:click="openFile(item)" />
@@ -157,24 +171,24 @@
- - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + +
序号处理人状态处理时间耗时意见
序号处理人状态处理时间耗时意见
{{index+1}}{{item.staffName}}{{item.stateName}}{{item.endTime}}{{item.duration}}{{item.context}}
{{index+1}}{{item.staffName}}{{item.stateName}}{{item.endTime}}{{item.duration}}{{item.context}}
diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js index 394db237e..f5a33cef1 100644 --- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js +++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js @@ -19,7 +19,9 @@ photos: [], repairPhotos: [], beforePhotos: [], - afterPhotos: [] + afterPhotos: [], + visitType:'', + visitContext:'' } }, _initMethod: function () { diff --git a/public/pages/property/repairReturnVisit/repairReturnVisit.html b/public/pages/property/repairReturnVisit/repairReturnVisit.html new file mode 100644 index 000000000..531cff29a --- /dev/null +++ b/public/pages/property/repairReturnVisit/repairReturnVisit.html @@ -0,0 +1,119 @@ +
+
+
+
+
+
查询条件
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
报修回访
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
工单编码位置报修类型报修人联系方式预约时间操作
{{repairPool.repairId}}{{repairPool.repairObjName}}{{repairPool.repairTypeName}}{{repairPool.repairName}}{{repairPool.tel}}{{repairPool.appointmentTime}} +
+ +
+
+ +
+
+
    +
    + + +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/public/pages/property/repairReturnVisit/repairReturnVisit.js b/public/pages/property/repairReturnVisit/repairReturnVisit.js new file mode 100644 index 000000000..6c92a0570 --- /dev/null +++ b/public/pages/property/repairReturnVisit/repairReturnVisit.js @@ -0,0 +1,121 @@ +/** + 入驻小区 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + repairReturnVisitInfo: { + repairPools: [], + total: 0, + records: 1, + moreCondition: false, + repairName: '', + repairSettings: [], + states: [], + conditions: { + repairId: '', + repairName: '', + tel: '', + repairType: '', + roomId: '', + roomName: '', + ownerId: '', + state: 'waiting' + } + } + }, + _initMethod: function () { + //vc.component._listRepairPools(DEFAULT_PAGE, DEFAULT_ROWS); + //vc.component._validateParam(); + $that._listRepairSettings(DEFAULT_PAGE, 50); + vc.getDict('r_repair_pool', "state", function (_data) { + vc.component.repairReturnVisitInfo.states = _data; + }); + vc.component._listRepairPools(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + vc.on('repairReturnVisit', 'listRepairPool', function (_param) { + vc.component._listRepairPools(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listRepairPools(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + //查询方法 + _listRepairPools: function (_page, _rows) { + vc.component.repairReturnVisitInfo.conditions.page = _page; + vc.component.repairReturnVisitInfo.conditions.row = _rows; + vc.component.repairReturnVisitInfo.conditions.communityId = vc.getCurrentCommunity().communityId; + var param = { + params: vc.component.repairReturnVisitInfo.conditions + }; + //报修人查询框去空 + param.params.repairName = param.params.repairName.trim(); + //报修ID查询框去空 + param.params.repairId = param.params.repairId.trim(); + //报修电话查询框去空 + param.params.tel = param.params.tel.trim(); + //发送get请求 + vc.http.apiGet('/repair/queryRepairReturnVisit', + param, + function (json, res) { + var _repairReturnVisitInfo = JSON.parse(json); + vc.component.repairReturnVisitInfo.total = _repairReturnVisitInfo.total; + vc.component.repairReturnVisitInfo.records = _repairReturnVisitInfo.records; + vc.component.repairReturnVisitInfo.repairPools = _repairReturnVisitInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.repairReturnVisitInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + + _openRepairDetail: function (_repairPool) { + vc.jumpToPage('/admin.html#/pages/property/ownerRepairDetail?repairId=' + _repairPool.repairId) + }, + //查询 + _queryRepairPoolMethod: function () { + vc.component._listRepairPools(DEFAULT_PAGE, DEFAULT_ROWS); + }, + + _openEditOwnerRepairModel: function (_repairPool) { + // _ownerRepair.roomName = vc.component.ownerRepairManageInfo.conditions.roomName; + // _ownerRepair.roomId = vc.component.ownerRepairManageInfo.conditions.roomId; + vc.emit('visitOwnerRepair', 'openVisitOwnerRepairModal', _repairPool); + }, + + _moreCondition: function () { + if (vc.component.repairReturnVisitInfo.moreCondition) { + vc.component.repairReturnVisitInfo.moreCondition = false; + } else { + vc.component.repairReturnVisitInfo.moreCondition = true; + } + }, + _listRepairSettings: function (_page, _rows) { + var param = { + params: { + page: _page, + row: _rows, + communityId: vc.getCurrentCommunity().communityId + } + }; + //发送get请求 + vc.http.apiGet('repair.listRepairSettings', + param, + function (json, res) { + var _repairSettingManageInfo = JSON.parse(json); + vc.component.repairReturnVisitInfo.repairSettings = _repairSettingManageInfo.data; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + } + } + }); +})(window.vc);