diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html index f6f076de6..c42add1fa 100644 --- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html +++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.html @@ -11,23 +11,21 @@ - - - - + + + - - - - - + + + +
物品ID物品名称源仓库目标仓库调度编号 调拨数量 申请人状态时间 操作
{{auditOrder.resId}}{{auditOrder.resName}}{{auditOrder.shaName}}{{auditOrder.shzName}}{{auditOrder.stock}}{{auditOrder.applyId}}{{auditOrder.applyCount}} {{auditOrder.startUserName}}{{auditOrder.stateName}}{{auditOrder.createTime}}
-
diff --git a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js index 988335142..a4b69fb73 100644 --- a/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js +++ b/public/pages/admin/allocationStorehouseAuditOrders/allocationStorehouseAuditOrders.js @@ -115,7 +115,7 @@ ); }, _toDetail: function (_item) { - vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?asId=" + _item.asId); + vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?applyId=" + _item.applyId); } } }); diff --git a/public/pages/admin/allocationStorehouseHistoryAuditOrders/allocationStorehouseHistoryAuditOrders.html b/public/pages/admin/allocationStorehouseHistoryAuditOrders/allocationStorehouseHistoryAuditOrders.html index d3d7475c1..225a1b400 100644 --- a/public/pages/admin/allocationStorehouseHistoryAuditOrders/allocationStorehouseHistoryAuditOrders.html +++ b/public/pages/admin/allocationStorehouseHistoryAuditOrders/allocationStorehouseHistoryAuditOrders.html @@ -11,25 +11,21 @@ - - - - + - + + - - - - - + + - + +
物品ID物品名称源仓库目标仓库调度编号 调拨数量 申请人申请说明状态时间 操作
{{auditOrder.resId}}{{auditOrder.resName}}{{auditOrder.shaName}}{{auditOrder.shzName}}{{auditOrder.stock}}{{auditOrder.applyId}}{{auditOrder.applyCount}} {{auditOrder.startUserName}}{{auditOrder.remark}}{{auditOrder.stateName}}{{auditOrder.createTime}}
diff --git a/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.html b/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.html index e648af2e5..8f6e73ff1 100644 --- a/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.html +++ b/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.html @@ -13,55 +13,6 @@
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
- -
-
-
- - -
-
@@ -70,19 +21,79 @@
- + + +
+
+
+
+ + +
+
+
+
+
+
+
- - -
+ +
+
+
+
+
+
调拨物品
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
物品ID物品名称物品编码源仓库目标仓库调拨数量
{{resourceStore.resId}}{{resourceStore.resName}}{{resourceStore.resCode}}{{resourceStore.shaName}}{{resourceStore.shzName}}{{resourceStore.stock}}
+
    +
    + + +
    +
    +
    +
    + +
    diff --git a/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.js b/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.js index a52b04111..16148cdeb 100644 --- a/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.js +++ b/public/pages/common/allocationStorehouseDetail/allocationStorehouseDetail.js @@ -3,24 +3,22 @@ **/ (function (vc) { var DEFAULT_PAGE = 1; - var DEFAULT_ROWS = 1; + var DEFAULT_ROWS = 100; vc.extends({ data: { allocationStorehouseDetailInfo: { - asId: '', - resId: '', - resName: '', - shaName: '', - shzName: '', - stock: '', - stateName: '', - startUserName: '', + applyId: '', + resourceStores: [], remark: '', - auditUsers: [] + startUserName:'', + createTime:'', + auditUsers: [], + stateName:'' } }, _initMethod: function () { - vc.component.allocationStorehouseDetailInfo.asId = vc.getParam('asId'); + vc.component.allocationStorehouseDetailInfo.applyId = vc.getParam('applyId'); + $that._listAllocationStorehouseApply(); vc.component._listPurchaseApply(DEFAULT_PAGE, DEFAULT_ROWS); $that._loadAuditUser(); }, @@ -33,7 +31,7 @@ params: { page: _page, row: _rows, - applyOrderId: vc.component.allocationStorehouseDetailInfo.asId + applyId: vc.component.allocationStorehouseDetailInfo.applyId } }; @@ -43,7 +41,28 @@ function (json, res) { var _allocationStorehouseDetailInfo = JSON.parse(json); var _purchaseApply = _allocationStorehouseDetailInfo.data; - vc.copyObject(_purchaseApply[0], vc.component.allocationStorehouseDetailInfo); + vc.component.allocationStorehouseDetailInfo.resourceStores = _purchaseApply; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _listAllocationStorehouseApply: function () { + var param = { + params: { + page: 1, + row: 1, + applyId: vc.component.allocationStorehouseDetailInfo.applyId + } + }; + + //发送get请求 + vc.http.apiGet('resourceStore.listAllocationStorehouseApplys', + param, + function (json, res) { + var _allocationStorehouseDetailInfo = JSON.parse(json); + var _purchaseApply = _allocationStorehouseDetailInfo.data[0]; + vc.copyObject(_purchaseApply,vc.component.allocationStorehouseDetailInfo); }, function (errInfo, error) { console.log('请求失败处理'); } @@ -52,7 +71,7 @@ _loadAuditUser: function () { var param = { params: { - businessKey: vc.component.allocationStorehouseDetailInfo.asId, + businessKey: vc.component.allocationStorehouseDetailInfo.applyId, communityId: vc.getCurrentCommunity().communityId, } }; diff --git a/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.html b/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.html index b44e3a002..06759dfa7 100644 --- a/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.html +++ b/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.html @@ -77,11 +77,7 @@ - - - - - + @@ -91,12 +87,8 @@ - - - - - - + + diff --git a/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.js b/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.js index 742580f39..f79a42211 100644 --- a/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.js +++ b/public/pages/common/allocationStorehouseManage/allocationStorehouseManage.js @@ -50,7 +50,7 @@ param.params.resName = param.params.resName.trim(); param.params.resCode = param.params.resCode.trim(); //发送get请求 - vc.http.apiGet('resourceStore.listAllocationStorehouses', + vc.http.apiGet('resourceStore.listAllocationStorehouseApplys', param, function (json, res) { var _allocationStorehouseManageInfo = JSON.parse(json); @@ -96,7 +96,7 @@ }, //详情 _toDetail: function (_item) { - vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?asId=" + _item.asId); + vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?applyId=" + _item.applyId); }, _openAllocationStorehouseApplyModal: function () {
    物品ID物品名称物品编码源仓库目标仓库调度编号 调拨数量 申请人 状态
    {{resourceStore.resId}}{{resourceStore.resName}}{{resourceStore.resCode}}{{resourceStore.shaName}}{{resourceStore.shzName}}{{resourceStore.stock}}{{resourceStore.applyId}}{{resourceStore.applyCount}} {{resourceStore.startUserName}} {{resourceStore.stateName}} {{resourceStore.createTime}}