diff --git a/public/pages/property/newOaWorkflowForm/newOaWorkflowForm.html b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.html similarity index 50% rename from public/pages/property/newOaWorkflowForm/newOaWorkflowForm.html rename to public/components/property/newOaWorkflowForm/newOaWorkflowForm.html index 84b2ad203..195440266 100644 --- a/public/pages/property/newOaWorkflowForm/newOaWorkflowForm.html +++ b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.html @@ -1,3 +1,3 @@ -
+
\ No newline at end of file diff --git a/public/pages/property/newOaWorkflowForm/newOaWorkflowForm.js b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js similarity index 80% rename from public/pages/property/newOaWorkflowForm/newOaWorkflowForm.js rename to public/components/property/newOaWorkflowForm/newOaWorkflowForm.js index 7eab3ab0c..a18c3dc60 100644 --- a/public/pages/property/newOaWorkflowForm/newOaWorkflowForm.js +++ b/public/components/property/newOaWorkflowForm/newOaWorkflowForm.js @@ -9,17 +9,17 @@ newOaWorkflowFormInfo: { formJson: {}, conditions: { - } + }, + flowId: '' } }, _initMethod: function () { - vc.component._listOaWorkflowForm(DEFAULT_PAGE, DEFAULT_ROWS); }, _initEvent: function () { - - vc.on('newOaWorkflowForm', 'listNewOaWorkflow', function (_param) { - vc.component._listNewOaWorkflows(DEFAULT_PAGE, DEFAULT_ROWS); - }); + vc.on('newOaWorkflowForm', 'witch', function (_value) { + $that.newOaWorkflowFormInfo.flowId = _value.flowId; + vc.component._listOaWorkflowForm(DEFAULT_PAGE, DEFAULT_ROWS); + }) }, methods: { _listOaWorkflowForm: function (_page, _rows) { @@ -27,7 +27,7 @@ params: { page: 1, row: 1, - flowId: vc.getParam('flowId') + flowId: $that.newOaWorkflowFormInfo.flowId } }; @@ -49,7 +49,7 @@ container, schema: $that.newOaWorkflowFormInfo.formJson }); - } + }, } }); })(window.vc); diff --git a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html new file mode 100644 index 000000000..466de0a9a --- /dev/null +++ b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.html @@ -0,0 +1,94 @@ +
+
+
+
+
+
查询条件
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
流程工单
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
申请人公告类型开始时间结束时间状态创建时间操作
{{pool.createUserName}}{{pool.noticeTypeCdName}}{{pool.startTime}}{{pool.endTime}}{{pool.stateName}}{{notice.createTime}} +
+ +
+
+
    +
    + + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js new file mode 100644 index 000000000..f734fcdd5 --- /dev/null +++ b/public/components/property/newOaWorkflowPool/newOaWorkflowPool.js @@ -0,0 +1,74 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + newOaWorkflowPoolInfo: { + pools: [], + total: 0, + records: 1, + conditions: { + createUserName: '', + startTime: '', + endTime: '', + flowId: '' + } + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on('newOaWorkflowPool', 'witch', function (_value) { + $that.newOaWorkflowFormInfo.conditions.flowId = _value.flowId; + vc.initDateTime('poolStartTime', function (_value) { + $that.newOaWorkflowPoolInfo.conditions.startTime = _value; + }); + vc.initDateTime('poolEndTime', function (_value) { + $that.newOaWorkflowPoolInfo.conditions.endTime = _value; + }); + vc.component._listOaWorkflowPools(DEFAULT_PAGE, DEFAULT_ROWS); + }) + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listOaWorkflowPools(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listOaWorkflowPools: function (_page, _rows) { + vc.component.newOaWorkflowPoolInfo.conditions.page = _page; + vc.component.newOaWorkflowPoolInfo.conditions.row = _rows; + var param = { + params: vc.component.newOaWorkflowPoolInfo.conditions + }; + + //发送get请求 + vc.http.get('newOaWorkflowPool', + 'list', + param, + function (json, res) { + var _newOaWorkflowPoolInfo = JSON.parse(json); + vc.component.newOaWorkflowPoolInfo.total = _newOaWorkflowPoolInfo.total; + vc.component.newOaWorkflowPoolInfo.records = _newOaWorkflowPoolInfo.records; + vc.component.newOaWorkflowPoolInfo.notices = _newOaWorkflowPoolInfo.notices; + vc.emit('pagination', 'init', { + total: vc.component.newOaWorkflowPoolInfo.records, + dataCount: vc.component.newOaWorkflowPoolInfo.total, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openNewOaWorkflowPoolDetail: function (_notice) { + vc.jumpToPage("/admin.html#/pages/common/noticeDetail?noticeId=" + _notice.noticeId); + }, + _queryOaWorkflowPoolMethod: function () { + vc.component._listOaWorkflowPools(DEFAULT_PAGE, DEFAULT_ROWS); + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/css/vc-ui.css b/public/css/vc-ui.css index 717eb8203..78b3c2606 100755 --- a/public/css/vc-ui.css +++ b/public/css/vc-ui.css @@ -2015,6 +2015,11 @@ a:hover { float:right } +.vc-node-selected{ + color: #FFFFFF; + background-color: #1ab394; +} + .vc-line{ width:100%; height:2px; diff --git a/public/pages/property/newOaWorkflow/newOaWorkflow.html b/public/pages/property/newOaWorkflow/newOaWorkflow.html new file mode 100644 index 000000000..d88e106c9 --- /dev/null +++ b/public/pages/property/newOaWorkflow/newOaWorkflow.html @@ -0,0 +1,30 @@ +
    +
    +
    +
    +
      +
    • 流程工单 +
      • +
    • + 起草流程
      • +
    • 流程待办 +
      • +
    • + 流程已办
      • +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/public/pages/property/newOaWorkflow/newOaWorkflow.js b/public/pages/property/newOaWorkflow/newOaWorkflow.js new file mode 100644 index 000000000..03c9af13f --- /dev/null +++ b/public/pages/property/newOaWorkflow/newOaWorkflow.js @@ -0,0 +1,30 @@ +/** + 入驻小区 +**/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 100; + vc.extends({ + data: { + newOaWorkflowInfo: { + switchValue: '' + } + }, + _initMethod: function () { + $that.swatch('newOaWorkflowPool'); + }, + _initEvent: function () { + vc.on('newOaWorkflow', 'listNewOaWorkflow', function (_param) { + vc.component._listNewOaWorkflows(DEFAULT_PAGE, DEFAULT_ROWS); + }); + }, + methods: { + swatch: function (_value) { + $that.newOaWorkflowInfo.switchValue = _value; + vc.emit(_value, 'witch', { + flowId: vc.getParam('flowId') + }); + } + } + }); +})(window.vc); diff --git a/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.js b/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.js index 347758456..d7b54bd64 100644 --- a/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.js +++ b/public/pages/property/newOaWorkflowManage/newOaWorkflowManage.js @@ -64,7 +64,7 @@ vc.toast('流程未部署'); return; } - vc.jumpToPage('/form.html#/pages/property/newOaWorkflowForm?flowId=' + _flow.flowId) + vc.jumpToPage('/form.html#/pages/property/newOaWorkflow?flowId=' + _flow.flowId) }, function (errInfo, error) { console.log('请求失败处理'); }