diff --git a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html index d3b75437e..16bcd1ea9 100644 --- a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html +++ b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html @@ -60,7 +60,7 @@
- ({{newOaWorkflowDoingInfo.visitUndoCount}})
@@ -127,6 +127,11 @@ +
+
+ +
+
{{item.flowName}} diff --git a/public/pages/property/visitDetail/visitDetail.js b/public/pages/property/visitDetail/visitDetail.js index 2535d9d63..0be93bf71 100644 --- a/public/pages/property/visitDetail/visitDetail.js +++ b/public/pages/property/visitDetail/visitDetail.js @@ -124,7 +124,7 @@ } vc.http.apiPost( - '/itemRelease.auditUndoItemRelease', + '/visit.auditUndoVisit', JSON.stringify(_audit), { emulateJSON: true }, diff --git a/public/pages/property/visitFinish/visitFinish.html b/public/pages/property/visitFinish/visitFinish.html new file mode 100644 index 000000000..e6b80e540 --- /dev/null +++ b/public/pages/property/visitFinish/visitFinish.html @@ -0,0 +1,87 @@ +
+
+
+
+
+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
{{finish.vId}}{{finish.vName}}({{finish.phoneNumber}})/{{finish.visitGender=='0'?'男':'女'}}{{finish.ownerName}}{{finish.visitCase}}({{finish.reasonType == 0 ? '喜事' : + finish.reasonType == 1 ? '白事' : finish.reasonType == 2 ? '其他' : '-'}}) + {{finish.carNum}}{{finish.entourage}}{{finish.createTime}}{{finish.visitTime}}
{{finish.departureTime}}		{{finish.stateName}} +
+ +
+
+
    +
    + + +
    +
    +
    +
    +
    diff --git a/public/pages/property/visitFinish/visitFinish.js b/public/pages/property/visitFinish/visitFinish.js new file mode 100644 index 000000000..f230a0ee7 --- /dev/null +++ b/public/pages/property/visitFinish/visitFinish.js @@ -0,0 +1,69 @@ +/** + 审核订单 + **/ +(function(vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + visitFinishInfo: { + finishs: [], + total: 0, + records: 1, + moreCondition: false, + userName: '', + currentUserId: vc.getData('/nav/getUserInfo').userId, + conditions: { + vId: '', + userName: '', + auditLink: '', + }, + orderInfo: '', + procure: false, + audit: '1' + } + }, + _initMethod: function() { + vc.component._listFinishOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function() { + vc.on('pagination', 'page_event', function(_currentPage) { + vc.component._listFinishOrders(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listFinishOrders: function(_page, _rows) { + $that.visitFinishInfo.audit = '1'; + vc.component.visitFinishInfo.conditions.page = _page; + vc.component.visitFinishInfo.conditions.row = _rows; + var param = { + params: vc.component.visitFinishInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/visit.queryFinishVisit', + param, + function(json, res) { + var _visitFinishInfo = JSON.parse(json); + vc.component.visitFinishInfo.total = _visitFinishInfo.total; + vc.component.visitFinishInfo.records = _visitFinishInfo.records; + vc.component.visitFinishInfo.finishs = _visitFinishInfo.data; + vc.emit('pagination', 'init', { + total: vc.component.visitFinishInfo.records, + dataCount: vc.component.visitFinishInfo.total, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _queryFinishOrdersMethod: function() { + vc.component._listFinishOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _openDetail: function(_item) { + vc.jumpToPage("/#/pages/property/visitDetail?vId=" + _item.vId + "&flowId=" + _item.flowId); + } + } + }); +})(window.vc); \ No newline at end of file