diff --git a/public/pages/oa/editWork/editWork.js b/public/pages/oa/editWork/editWork.js index 4b91ef84e..e6125cf01 100644 --- a/public/pages/oa/editWork/editWork.js +++ b/public/pages/oa/editWork/editWork.js @@ -198,7 +198,7 @@ } }; //发送get请求 - vc.http.apiGet('/work.listWorkCopy', + vc.http.apiGet('/work.listWorkTask', param, function (json, res) { let _json = JSON.parse(json); @@ -217,7 +217,7 @@ } }; //发送get请求 - vc.http.apiGet('/workCopy.listWorkCopy', + vc.http.apiGet('/work.listWorkCopy', param, function (json, res) { let _json = JSON.parse(json); diff --git a/public/pages/oa/workPool/workPool.html b/public/pages/oa/workPool/workPool.html new file mode 100644 index 000000000..6fab6c113 --- /dev/null +++ b/public/pages/oa/workPool/workPool.html @@ -0,0 +1,152 @@ +
+
+
+
+
+
    +
  • + {{item.name}} +
    • +
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
{{work.workId}}{{work.workName}}{{work.typeName}}{{work.workCycle == '1001'?'一次性工单':'周期性工单'}}{{work.createUserName}}{{work.staffName || '-'}}{{work.startTime}}
+ ~{{work.endTime}} + 		{{work.stateName}}{{work.createTime}} +
+ +
+
+ + +
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/public/pages/oa/workPool/workPool.js b/public/pages/oa/workPool/workPool.js new file mode 100644 index 000000000..676a2f50c --- /dev/null +++ b/public/pages/oa/workPool/workPool.js @@ -0,0 +1,93 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + workPoolInfo: { + works: [], + states:[{ + name:'全部', + state:'' + },{ + name:'待处理', + state:'W' + },{ + name:'处理中', + state:'D' + },{ + name:'处理完成', + state:'C' + }], + total: 0, + records: 1, + moreCondition: false, + wtId: '', + conditions: { + state:'', + typeName: '', + staffNameLike: '', + workNameLike:'', + queryEndTime:'', + queryStartTime:'', + createUserNameLike:'', + } + } + }, + _initMethod: function () { + $that._listWorkPools(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function () { + + vc.on('workPool', 'listWorkPool', function (_param) { + $that._listWorkPools(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + $that._listWorkPools(_currentPage, DEFAULT_ROWS); + }); + vc.initDateTime('queryStartTime',function(_value){ + $that.workPoolInfo.conditions.queryStartTime = _value; + }) + vc.initDateTime('queryEndTime',function(_value){ + $that.workPoolInfo.conditions.queryEndTime = _value; + }) + }, + methods: { + _listWorkPools: function (_page, _rows) { + $that.workPoolInfo.conditions.page = _page; + $that.workPoolInfo.conditions.row = _rows; + var param = { + params: $that.workPoolInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/work.listWorkTask', + param, + function (json, res) { + let _json = JSON.parse(json); + $that.workPoolInfo.total = _json.total; + $that.workPoolInfo.records = _json.records; + $that.workPoolInfo.works = _json.data; + vc.emit('pagination', 'init', { + total: $that.workPoolInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _toWorkDetailPage:function(_work){ + vc.jumpToPage('/#/pages/oa/workDetail?workId='+_work.workId); + }, + _queryWorkPoolMethod: function () { + $that._listWorkPools(DEFAULT_PAGE, DEFAULT_ROWS); + }, + swatchWorkState:function(_state){ + $that.workPoolInfo.conditions.state = _state.state; + $that._listWorkPools(DEFAULT_PAGE, DEFAULT_ROWS); + } + } + }); +})(window.vc); diff --git a/public/pages/oa/workTaskDetail/workTaskDetail.html b/public/pages/oa/workTaskDetail/workTaskDetail.html index ec9b6ab0d..c2c4f8464 100644 --- a/public/pages/oa/workTaskDetail/workTaskDetail.html +++ b/public/pages/oa/workTaskDetail/workTaskDetail.html @@ -169,10 +169,10 @@ ~{{event.endTime}} - {{event.remark}} + {{event.createTime}} - {{event.createTime}} + {{event.remark}}