diff --git a/public/pages/property/newOaWorkflow/newOaWorkflow.js b/public/pages/property/newOaWorkflow/newOaWorkflow.js
index 452816d2b..7f72434fd 100644
--- a/public/pages/property/newOaWorkflow/newOaWorkflow.js
+++ b/public/pages/property/newOaWorkflow/newOaWorkflow.js
@@ -11,13 +11,18 @@
             }
         },
         _initMethod: function () {
+            $that.newOaWorkflowInfo.switchValue = vc.getParam('switchValue');
+            if ($that.newOaWorkflowInfo.switchValue) {
+                $that.swatch($that.newOaWorkflowInfo.switchValue);
+                return;
+            }
             $that.swatch('newOaWorkflowPool');
         },
         _initEvent: function () {
             vc.on('newOaWorkflow', 'listNewOaWorkflow', function (_param) {
                 vc.component._listNewOaWorkflows(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-            vc.on('newOaWorkflow','switch',function(_switchValue){
+            vc.on('newOaWorkflow', 'switch', function (_switchValue) {
                 $that.swatch(_switchValue);
             })
         },
diff --git a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html
index cee31b06f..a0bdea811 100644
--- a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html
+++ b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.html
@@ -11,45 +11,51 @@
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/property/repairDispatchManage')">报修待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/property/repairDispatchManage')">报修待办({{newOaWorkflowDoingInfo.repair}})</a>
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/common/myAuditComplaints')">投诉待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/common/myAuditComplaints')">投诉待办({{newOaWorkflowDoingInfo.complaint}})</a>
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/admin/myAuditOrders')">采购待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/admin/myAuditOrders')">采购待办({{newOaWorkflowDoingInfo.purchase}})</a>
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/admin/myItemOutAuditOrders')">物品领用待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/admin/myItemOutAuditOrders')">物品领用待办({{newOaWorkflowDoingInfo.collection}})</a>
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/admin/contractApplyAuditOrders')">合同起草待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/admin/contractApplyAuditOrders')">合同起草待办({{newOaWorkflowDoingInfo.contractApply}})</a>
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/admin/contractChangeAuditOrders')">合同变更待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/admin/contractChangeAuditOrders')">合同变更待办({{newOaWorkflowDoingInfo.contractChange}})</a>
                             </div>
                         </div>
                     </div>
-                    <div class="row margin-top">
-                        <div class="col-sm-2">
+                    <div class="row ">
+                        <div class="col-sm-2 margin-top">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
-                                    @click="_toGo('/admin.html#/pages/admin/allocationStorehouseAuditOrders')">调拨待办(0)</a>
+                                    @click="_toGo('/admin.html#/pages/admin/allocationStorehouseAuditOrders')">调拨待办({{newOaWorkflowDoingInfo.allocation}})</a>
+                            </div>
+                        </div>
+                        <div class="col-sm-2 margin-top" v-for="(item,index) in newOaWorkflowDoingInfo.newOaWorkflows">
+                            <div class="form-group text-center">
+                                <a class="col-form-label" style="text-decoration:underline;"
+                                    @click="_toGoA(item)">{{item.flowName}}待办(0)</a>
                             </div>
                         </div>
                     </div>
@@ -104,13 +110,19 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row margin-top">
-                        <div class="col-sm-2">
+                    <div class="row ">
+                        <div class="col-sm-2 margin-top">
                             <div class="form-group text-center">
                                 <a class="col-form-label" style="text-decoration:underline;"
                                     @click="_toGo('/admin.html#/pages/admin/allocationStorehouseHistoryAuditOrders')">物品调拨已办</a>
                             </div>
                         </div>
+                        <div class="col-sm-2 margin-top" v-for="(item,index) in newOaWorkflowDoingInfo.newOaWorkflows">
+                            <div class="form-group text-center">
+                                <a class="col-form-label" style="text-decoration:underline;"
+                                    @click="_toGoB(item)">{{item.flowName}}已办</a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.js b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.js
index 7da3720b9..78b9e667f 100644
--- a/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.js
+++ b/public/pages/property/newOaWorkflowDoing/newOaWorkflowDoing.js
@@ -6,42 +6,78 @@
     var DEFAULT_ROWS = 100;
     vc.extends({
         data: {
-            newOaWorkflowManageInfo: {
+            newOaWorkflowDoingInfo: {
                 newOaWorkflows: [],
                 conditions: {
                     state: 'C'
-                }
+                },
+                repair: 0,
+                complaint: 0,
+                purchase: 0,
+                collection: 0,
+                contractApply: 0,
+                contractChange: 0,
+                allocation: 0
             }
         },
         _initMethod: function () {
             vc.component._listNewOaWorkflows(DEFAULT_PAGE, DEFAULT_ROWS);
+            $that._loadUndoInfo();
         },
         _initEvent: function () {
 
         },
         methods: {
+            _toGo: function (_url) {
+                vc.jumpToPage(_url);
+            },
+            _toGoA: function (item) {
+                vc.jumpToPage('/form.html#/pages/property/newOaWorkflow?flowId=' + item.flowId + "&switchValue=newOaWorkflowUndo");
+            },
+            _toGoB: function (item) {
+                vc.jumpToPage('/form.html#/pages/property/newOaWorkflow?flowId=' + item.flowId + "&switchValue=newOaWorkflowFinish");
+            },
             _listNewOaWorkflows: function (_page, _rows) {
-
-                vc.component.newOaWorkflowManageInfo.conditions.page = _page;
-                vc.component.newOaWorkflowManageInfo.conditions.row = _rows;
                 var param = {
-                    params: vc.component.newOaWorkflowManageInfo.conditions
+                    params: {
+                        state: 'C',
+                        page: 1,
+                        row: 100
+                    }
                 };
-
                 //发送get请求
                 vc.http.apiGet('/oaWorkflow/queryOaWorkflow',
                     param,
                     function (json, res) {
-                        var _newOaWorkflowManageInfo = JSON.parse(json);
-                        $that.newOaWorkflowManageInfo.newOaWorkflows = _newOaWorkflowManageInfo.data;
+                        var _newOaWorkflowDoingInfo = JSON.parse(json);
+                        $that.newOaWorkflowDoingInfo.newOaWorkflows = _newOaWorkflowDoingInfo.data;
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );
             },
-            _toGo:function(_url){
-                vc.jumpToPage(_url);
-            }
+            _loadUndoInfo: function () {
+                var param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        page: 1,
+                        row: 10
+                    }
+                }
+                vc.http.get(
+                    'undo',
+                    'list',
+                    param,
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        let _json = JSON.parse(json).data;
+                        vc.copyObject(_json,$that.newOaWorkflowDoingInfo);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    });
+            },
         }
+
     });
 })(window.vc);