diff --git a/public/components/common/flowAudit/flowAudit.js b/public/components/common/flowAudit/flowAudit.js
index d06d8412d..013879bd9 100644
--- a/public/components/common/flowAudit/flowAudit.js
+++ b/public/components/common/flowAudit/flowAudit.js
@@ -111,7 +111,7 @@
                     param,
                     function(json, res) {
                         let _auditOrdersInfo = JSON.parse(json);
-                        if (_auditOrdersInfo.data.length < 1) {
+                        if (_auditOrdersInfo.code != 0 || _auditOrdersInfo.data.length < 1) {
                             return;
                         }
                         $that.flowAuditInfo.assignee = _auditOrdersInfo.data[0].assignee;
diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
index dd364663e..708055a72 100644
--- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
+++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html
@@ -1,5 +1,5 @@
 <div class=" animated fadeInRight ecommerce">
-    <div class="row">
+    <div class="row" v-if="allocationStorehouseAuditOrdersInfo.audit == '1'">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
@@ -72,6 +72,7 @@
             </div>
         </div>
     </div>
-    <vc:create path="common/audit" callBackListener="allocationStorehouseAuditOrders" callBackFunction="notifyAudit">
-    </vc:create>
+    <div v-else>
+        <vc:create path="common/flowAudit" callBackListener="allocationStorehouseAuditOrders" callBackFunction="notifyAudit"></vc:create>
+    </div>
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
index 8d96e9cd0..7f3361753 100644
--- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
+++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js
@@ -19,7 +19,8 @@
                     auditLink: '',
                 },
                 orderInfo: '',
-                procure: false
+                procure: false,
+                audit: '1'
             }
         },
         _initMethod: function() {
@@ -27,8 +28,11 @@
             vc.component._loadStepStaff();
         },
         _initEvent: function() {
-
+            vc.on('allocationStorehouseAuditOrders', 'list', function(_param) {
+                $that.allocationStorehouseAuditOrdersInfo.audit = '1';
+            });
             vc.on('allocationStorehouseAuditOrders', 'listAuditOrders', function(_param) {
+                $that.allocationStorehouseAuditOrdersInfo.audit = '1';
                 vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS);
             });
             vc.on('pagination', 'page_event', function(_currentPage) {
@@ -36,12 +40,13 @@
             });
 
             vc.on('allocationStorehouseAuditOrders', 'notifyAudit', function(_auditInfo) {
+                $that.allocationStorehouseAuditOrdersInfo.audit = '1';
                 vc.component._auditOrderInfo(_auditInfo);
             });
         },
         methods: {
             _listAuditOrders: function(_page, _rows) {
-
+                $that.allocationStorehouseAuditOrdersInfo.audit = '1';
                 vc.component.allocationStorehouseAuditOrdersInfo.conditions.page = _page;
                 vc.component.allocationStorehouseAuditOrdersInfo.conditions.row = _rows;
                 var param = {
@@ -70,7 +75,9 @@
             },
             _openAuditOrderModel: function(_auditOrder) {
                 vc.component.allocationStorehouseAuditOrdersInfo.orderInfo = _auditOrder;
-                vc.emit('audit', 'openAuditModal', {});
+                //_auditOrder.startUserId = _auditOrder.userId;
+                $that.allocationStorehouseAuditOrdersInfo.audit = '2';
+                vc.emit('flowAudit', 'openAuditModal', _auditOrder);
             },
             _queryAuditOrdersMethod: function() {
                 vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS);
diff --git a/public/pages/admin/myAuditOrders/myAuditOrders.js b/public/pages/admin/myAuditOrders/myAuditOrders.js
index cf0ff93d8..0a00019b3 100755
--- a/public/pages/admin/myAuditOrders/myAuditOrders.js
+++ b/public/pages/admin/myAuditOrders/myAuditOrders.js
@@ -46,6 +46,7 @@
         },
         methods: {
             _listAuditOrders: function(_page, _rows) {
+                $that.auditOrdersInfo.audit = '1';
                 vc.component.auditOrdersInfo.conditions.page = _page;
                 vc.component.auditOrdersInfo.conditions.row = _rows;
                 var param = {
diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
index 3061def63..79a59ed06 100755
--- a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
+++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html
@@ -1,5 +1,5 @@
-<div class=" animated fadeInRight ecommerce">
-    <div class="row">
+<div class="animated fadeInRight ecommerce">
+    <div class="row" v-if="auditOrdersInfo.audit == '1'">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
@@ -10,59 +10,52 @@
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">订单号</th>
-                            <th class="text-center">订单类型</th>
-                            <th class="text-center">订单状态</th>
-                            <th class="text-center">申请人</th>
-                            <th class="text-center">创建时间</th>
-                            <th class="text-center">操作</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">订单号</th>
+                                <th class="text-center">订单类型</th>
+                                <th class="text-center">订单状态</th>
+                                <th class="text-center">申请人</th>
+                                <th class="text-center">创建时间</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="auditOrder in auditOrdersInfo.auditOrders">
-                            <td class="text-center">{{auditOrder.applyOrderId}}</td>
-                            <td class="text-center">{{auditOrder.resOrderTypeName}}</td>
-                            <td class="text-center">{{auditOrder.stateName}}</td>
-                            <td class="text-center">{{auditOrder.userName}}</td>
-                            <td class="text-center">{{auditOrder.createTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDetailPurchaseApplyModel(auditOrder)">查看
+                            <tr v-for="auditOrder in auditOrdersInfo.auditOrders">
+                                <td class="text-center">{{auditOrder.applyOrderId}}</td>
+                                <td class="text-center">{{auditOrder.resOrderTypeName}}</td>
+                                <td class="text-center">{{auditOrder.stateName}}</td>
+                                <td class="text-center">{{auditOrder.userName}}</td>
+                                <td class="text-center">{{auditOrder.createTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-on:click="_openDetailPurchaseApplyModel(auditOrder)">查看
                                     </button>
-                                </div>
-                                <div style="display: inline-block;" v-if="auditOrdersInfo.procure == false">
-                                    <div class="btn-group"
-                                         v-if="auditOrder.state == 1000 || auditOrder.state == 1001">
-                                        <button class="btn-white btn btn-xs"
-                                                v-on:click="_openAuditOrderModel(auditOrder)">审批
+                                    </div>
+                                    <div style="display: inline-block;" v-if="auditOrdersInfo.procure == false">
+                                        <div class="btn-group" v-if="auditOrder.state == 1000 || auditOrder.state == 1001">
+                                            <button class="btn-white btn btn-xs" v-on:click="_openAuditOrderModel(auditOrder)">审批
                                         </button>
+                                        </div>
+                                        <div class="btn-group" v-else>
+                                            <button class="btn-white btn btn-xs" v-on:click="_finishAuditOrder(auditOrder)">结束
+                                        </button>
+                                        </div>
                                     </div>
                                     <div class="btn-group" v-else>
-                                        <button class="btn-white btn btn-xs"
-                                                v-on:click="_finishAuditOrder(auditOrder)">结束
-                                        </button>
+                                        <button class="btn-white btn btn-xs" v-if="auditOrder.state == 1001" v-on:click="_distributionOrder(auditOrder)">物品发放
+                                    </button>
+                                        <button class="btn-white btn btn-xs" v-else v-on:click="_finishAuditOrder(auditOrder)">结束
+                                    </button>
                                     </div>
-                                </div>
-                                <div class="btn-group" v-else>
-                                    <button class="btn-white btn btn-xs"
-                                            v-if="auditOrder.state == 1001"
-                                            v-on:click="_distributionOrder(auditOrder)">物品发放
-                                    </button>
-                                    <button class="btn-white btn btn-xs" v-else
-                                            v-on:click="_finishAuditOrder(auditOrder)">结束
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -71,5 +64,7 @@
             </div>
         </div>
     </div>
-    <vc:create path="common/audit" callBackListener="myAuditOrders" callBackFunction="notifyAudit"></vc:create>
+    <div v-else>
+        <vc:create path="common/flowAudit" callBackListener="myAuditOrders" callBackFunction="notifyAudit"></vc:create>
+    </div>
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
index ba5049064..947fa7640 100755
--- a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
+++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js
@@ -19,7 +19,8 @@
                     auditLink: '',
                 },
                 orderInfo: '',
-                procure: false
+                procure: false,
+                audit: '1'
             }
         },
         _initMethod: function() {
@@ -27,18 +28,24 @@
             $that._loadStepStaff();
         },
         _initEvent: function() {
+            vc.on('myAuditOrders', 'list', function(_param) {
+                $that.auditOrdersInfo.audit = '1';
+            });
             vc.on('myAuditOrders', 'listAuditOrders', function(_param) {
+                $that.auditOrdersInfo.audit = '1';
                 vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS);
             });
             vc.on('pagination', 'page_event', function(_currentPage) {
                 vc.component._listAuditOrders(_currentPage, DEFAULT_ROWS);
             });
             vc.on('myAuditOrders', 'notifyAudit', function(_auditInfo) {
+                $that.auditOrdersInfo.audit = '1';
                 vc.component._auditOrderInfo(_auditInfo);
             });
         },
         methods: {
             _listAuditOrders: function(_page, _rows) {
+                $that.auditOrdersInfo.audit = '1';
                 vc.component.auditOrdersInfo.conditions.page = _page;
                 vc.component.auditOrdersInfo.conditions.row = _rows;
                 var param = {
@@ -66,7 +73,9 @@
             },
             _openAuditOrderModel: function(_auditOrder) {
                 vc.component.auditOrdersInfo.orderInfo = _auditOrder;
-                vc.emit('audit', 'openAuditModal', {});
+                _auditOrder.startUserId = _auditOrder.userId;
+                $that.auditOrdersInfo.audit = '2';
+                vc.emit('flowAudit', 'openAuditModal', _auditOrder);
             },
             _queryAuditOrdersMethod: function() {
                 vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS);
@@ -79,6 +88,7 @@
                 console.log("提交得参数：" + _auditInfo);
                 _auditInfo.taskId = vc.component.auditOrdersInfo.orderInfo.taskId;
                 _auditInfo.applyOrderId = vc.component.auditOrdersInfo.orderInfo.applyOrderId;
+                _auditInfo.nextUserId = _auditInfo.staffId;
                 // 新增通知状态字段，区别是否为仓管及对应状态
                 if (_auditInfo.state == '1200') {
                     _auditInfo.noticeState = '1004';
diff --git a/public/pages/common/addItemOutStep/addItemOutStep.js b/public/pages/common/addItemOutStep/addItemOutStep.js
index 6d67ce5a0..4deb2400d 100755
--- a/public/pages/common/addItemOutStep/addItemOutStep.js
+++ b/public/pages/common/addItemOutStep/addItemOutStep.js
@@ -110,9 +110,9 @@
                         if (_json.code == 0) {
                             //关闭model
                             if (vc.component.addItemOutStepInfo.purchaseApply.resOrderType == "10000") {
-                                vc.jumpToPage("/#/pages/common/purchaseApplyManage");
+                                vc.goBack();
                             } else {
-                                vc.jumpToPage("/#/pages/common/itemOutManage");
+                                vc.goBack();
                             }
                             return;
                         }