diff --git a/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.html b/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.html new file mode 100644 index 000000000..236a3c7b2 --- /dev/null +++ b/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.html @@ -0,0 +1,95 @@ +
+
+
+
+
+
查询条件
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
已办流程
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
申请人 + {{item.label}}状态创建时间操作
{{finish.create_user_name}} + {{finish[item1.key]}}{{_getNewOaWorkflowFinishState(finish)}}{{finish.create_time}} +
+ +
+
+
    +
    + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.js b/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.js new file mode 100644 index 000000000..63b03e516 --- /dev/null +++ b/public/components/property/newOaWorkflowFinish/newOaWorkflowFinish.js @@ -0,0 +1,117 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + newOaWorkflowFinishInfo: { + finishs: [], + total: 0, + records: 1, + formJson: [], + conditions: { + createUserName: '', + startTime: '', + endTime: '', + flowId: '' + } + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('newOaWorkflowFinish', 'witch', function (_value) { + $that.newOaWorkflowFinishInfo.conditions.flowId = _value.flowId; + vc.initDateTime('finishStartTime', function (_value) { + $that.newOaWorkflowFinishInfo.conditions.startTime = _value; + }); + vc.initDateTime('finishEndTime', function (_value) { + $that.newOaWorkflowFinishInfo.conditions.endTime = _value; + }); + $that._listOaWorkFlowFinishForm(); + vc.component._listOaWorkflowFinishs(DEFAULT_PAGE, DEFAULT_ROWS); + }) + vc.on('newOaWorkflowFinish','paginationPlus', 'page_event', function (_currentPage) { + vc.component._listOaWorkflowFinishs(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listOaWorkFlowFinishForm: function () { + var param = { + params: { + page: 1, + row: 1, + flowId: $that.newOaWorkflowFinishInfo.conditions.flowId + } + }; + //发送get请求 + vc.http.apiGet('/oaWorkflow/queryOaWorkflowForm', + param, + function (json, res) { + let _newOaWorkflowFormInfo = JSON.parse(json); + $that.newOaWorkflowFinishInfo.formJson = JSON.parse(_newOaWorkflowFormInfo.data[0].formJson).components; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _listOaWorkflowFinishs: function (_page, _rows) { + vc.component.newOaWorkflowFinishInfo.conditions.page = _page; + vc.component.newOaWorkflowFinishInfo.conditions.row = _rows; + var param = { + params: vc.component.newOaWorkflowFinishInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('/oaWorkflow/queryOaWorkflowFormData', + param, + function (json, res) { + var _newOaWorkflowFinishInfo = JSON.parse(json); + vc.component.newOaWorkflowFinishInfo.total = _newOaWorkflowFinishInfo.total; + vc.component.newOaWorkflowFinishInfo.records = _newOaWorkflowFinishInfo.records; + vc.component.newOaWorkflowFinishInfo.finishs = _newOaWorkflowFinishInfo.data; + vc.emit('newOaWorkflowFinish','paginationPlus', 'init', { + total: vc.component.newOaWorkflowFinishInfo.records, + dataCount: vc.component.newOaWorkflowFinishInfo.total, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openNewOaWorkflowFinishDetail: function (_notice) { + vc.jumpToPage("/admin.html#/pages/common/noticeDetail?noticeId=" + _notice.noticeId); + }, + _queryOaWorkflowFinishMethod: function () { + vc.component._listOaWorkflowFinishs(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _getNewOaWorkflowFinishState: function (_finish) { + /** + * 1001 申请 1002 待审核 1003 退回 1004 委托 1005 办结 + */ + if (!_finish.hasOwnProperty('state')) { + return "未知"; + } + + switch (_finish.state) { + case '1001': + return "申请"; + case '1002': + return "待审核"; + case '1003': + return "退回"; + case '1004': + return "委托"; + case '1005': + return "办结"; + } + + return "未知" + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html index 84d1ec091..cef93cc93 100644 --- a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html +++ b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html @@ -67,7 +67,7 @@ {{pool[item1.key]}} - {{pool.stateName}} + {{_getNewOaWorkflowPoolState(pool)}} {{pool.create_time}}
    @@ -87,7 +87,7 @@ - +
    diff --git a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js index 1b8fd6ae7..380c665db 100644 --- a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js +++ b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js @@ -34,7 +34,7 @@ $that._listOaWorkFlowPoolForm(); vc.component._listOaWorkflowPools(DEFAULT_PAGE, DEFAULT_ROWS); }) - vc.on('pagination', 'page_event', function (_currentPage) { + vc.on('newOaWorkflowPool','paginationPlus', 'page_event', function (_currentPage) { vc.component._listOaWorkflowPools(_currentPage, DEFAULT_ROWS); }); }, @@ -73,7 +73,7 @@ vc.component.newOaWorkflowPoolInfo.total = _newOaWorkflowPoolInfo.total; vc.component.newOaWorkflowPoolInfo.records = _newOaWorkflowPoolInfo.records; vc.component.newOaWorkflowPoolInfo.pools = _newOaWorkflowPoolInfo.data; - vc.emit('pagination', 'init', { + vc.emit('newOaWorkflowPool','paginationPlus', 'init', { total: vc.component.newOaWorkflowPoolInfo.records, dataCount: vc.component.newOaWorkflowPoolInfo.total, currentPage: _page @@ -88,6 +88,29 @@ }, _queryOaWorkflowPoolMethod: function () { vc.component._listOaWorkflowPools(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _getNewOaWorkflowPoolState: function (_pool) { + /** + * 1001 申请 1002 待审核 1003 退回 1004 委托 1005 办结 + */ + if (!_pool.hasOwnProperty('state')) { + return "未知"; + } + + switch (_pool.state) { + case '1001': + return "申请"; + case '1002': + return "待审核"; + case '1003': + return "退回"; + case '1004': + return "委托"; + case '1005': + return "办结"; + } + + return "未知" } } }); diff --git a/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.html b/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.html new file mode 100644 index 000000000..3456845a4 --- /dev/null +++ b/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.html @@ -0,0 +1,101 @@ +
    +
    +
    +
    +
    +
    查询条件
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    待办流程
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    申请人 + {{item.label}}状态创建时间操作
    {{undo.create_user_name}} + {{undo[item1.key]}}{{_getNewOaWorkflowUndoState(undo)}}{{undo.create_time}} +
    + + + +
    +
    +
      +
      + + +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.js b/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.js new file mode 100644 index 000000000..481e36447 --- /dev/null +++ b/public/components/property/newOaWorkflowUndo/newOaWorkflowUndo.js @@ -0,0 +1,117 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + newOaWorkflowUndoInfo: { + undos: [], + total: 0, + records: 1, + formJson: [], + conditions: { + createUserName: '', + startTime: '', + endTime: '', + flowId: '' + } + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('newOaWorkflowUndo', 'witch', function (_value) { + $that.newOaWorkflowUndoInfo.conditions.flowId = _value.flowId; + vc.initDateTime('undoStartTime', function (_value) { + $that.newOaWorkflowUndoInfo.conditions.startTime = _value; + }); + vc.initDateTime('undoEndTime', function (_value) { + $that.newOaWorkflowUndoInfo.conditions.endTime = _value; + }); + $that._listOaWorkFlowUndoForm(); + vc.component._listOaWorkflowUndos(DEFAULT_PAGE, DEFAULT_ROWS); + }) + vc.on('newOaWorkflowUndo','paginationPlus', 'page_event', function (_currentPage) { + vc.component._listOaWorkflowUndos(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listOaWorkFlowUndoForm: function () { + var param = { + params: { + page: 1, + row: 1, + flowId: $that.newOaWorkflowUndoInfo.conditions.flowId + } + }; + //发送get请求 + vc.http.apiGet('/oaWorkflow/queryOaWorkflowForm', + param, + function (json, res) { + let _newOaWorkflowFormInfo = JSON.parse(json); + $that.newOaWorkflowUndoInfo.formJson = JSON.parse(_newOaWorkflowFormInfo.data[0].formJson).components; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _listOaWorkflowUndos: function (_page, _rows) { + vc.component.newOaWorkflowUndoInfo.conditions.page = _page; + vc.component.newOaWorkflowUndoInfo.conditions.row = _rows; + var param = { + params: vc.component.newOaWorkflowUndoInfo.conditions + }; + + //发送get请求 + vc.http.apiGet('/oaWorkflow/queryOaWorkflowFormData', + param, + function (json, res) { + var _newOaWorkflowUndoInfo = JSON.parse(json); + vc.component.newOaWorkflowUndoInfo.total = _newOaWorkflowUndoInfo.total; + vc.component.newOaWorkflowUndoInfo.records = _newOaWorkflowUndoInfo.records; + vc.component.newOaWorkflowUndoInfo.undos = _newOaWorkflowUndoInfo.data; + vc.emit('newOaWorkflowUndo','paginationPlus', 'init', { + total: vc.component.newOaWorkflowUndoInfo.records, + dataCount: vc.component.newOaWorkflowUndoInfo.total, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openNewOaWorkflowUndoDetail: function (_notice) { + vc.jumpToPage("/admin.html#/pages/common/noticeDetail?noticeId=" + _notice.noticeId); + }, + _queryOaWorkflowUndoMethod: function () { + vc.component._listOaWorkflowUndos(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _getNewOaWorkflowUndoState: function (_undo) { + /** + * 1001 申请 1002 待审核 1003 退回 1004 委托 1005 办结 + */ + if (!_undo.hasOwnProperty('state')) { + return "未知"; + } + + switch (_undo.state) { + case '1001': + return "申请"; + case '1002': + return "待审核"; + case '1003': + return "退回"; + case '1004': + return "委托"; + case '1005': + return "办结"; + } + + return "未知" + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/newOaWorkflow/newOaWorkflow.html b/public/pages/property/newOaWorkflow/newOaWorkflow.html index d88e106c9..1650bd2f9 100644 --- a/public/pages/property/newOaWorkflow/newOaWorkflow.html +++ b/public/pages/property/newOaWorkflow/newOaWorkflow.html @@ -10,10 +10,10 @@ :class="{'vc-node-selected':newOaWorkflowInfo.switchValue=='newOaWorkflowForm'}" @click="swatch('newOaWorkflowForm')"> 起草流程
    • 流程待办 + :class="{'vc-node-selected':newOaWorkflowInfo.switchValue=='newOaWorkflowUndo'}" @click="swatch('newOaWorkflowUndo')">流程待办
    • + :class="{'vc-node-selected':newOaWorkflowInfo.switchValue=='newOaWorkflowFinish'}" @click="swatch('newOaWorkflowFinish')"> 流程已办
      • @@ -25,6 +25,12 @@
      +
      + +
      +
      + +
      \ No newline at end of file