From 7ac8c943231fc1ff92effc48e63bc4230aea28b9 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 30 Mar 2022 12:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=8B=A8=E6=8C=87=E5=AE=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/flowAudit/flowAudit.js | 2 +- .../allocationStorehouseAuditOrders.html | 7 +- .../allocationStorehouseAuditOrders.js | 15 +++- .../admin/myAuditOrders/myAuditOrders.js | 1 + .../myItemOutAuditOrders.html | 89 +++++++++---------- .../myItemOutAuditOrders.js | 14 ++- .../common/addItemOutStep/addItemOutStep.js | 4 +- 7 files changed, 73 insertions(+), 59 deletions(-) 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 @@
-
+
@@ -72,6 +72,7 @@
- - +
+ +
\ 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 @@ -
-
+
+
@@ -10,59 +10,52 @@
- - - - - - - - + + + + + + + + - - - - - - - + + + + + + - + + - - - + + +
订单号订单类型订单状态申请人创建时间操作
订单号订单类型订单状态申请人创建时间操作
{{auditOrder.applyOrderId}}{{auditOrder.resOrderTypeName}}{{auditOrder.stateName}}{{auditOrder.userName}}{{auditOrder.createTime}} -
-
{{auditOrder.applyOrderId}}{{auditOrder.resOrderTypeName}}{{auditOrder.stateName}}{{auditOrder.userName}}{{auditOrder.createTime}} +
+ -
-
-
-
+
+
+ +
+
+ +
- + +
-
-
- - -
-
-
    -
    +
      +
      @@ -71,5 +64,7 @@
      - +
      + +
      \ 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; }