From 7555ee2f3095eac173b8b04a5bc4da6aec51197c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com> Date: Fri, 3 Apr 2020 16:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=87=BA=E5=BA=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addPurchaseApplyStep.js | 12 +- .../itemOutManage/itemOutManage.html | 149 ++++++++---------- .../components/itemOutManage/itemOutManage.js | 106 ++++++------- .../purchaseApplyManage.js | 2 +- .../viewResourceStoreInfo2.html | 6 +- 5 files changed, 127 insertions(+), 148 deletions(-) diff --git a/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js b/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js index 46bc79f90..782f80c10 100644 --- a/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js +++ b/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js @@ -12,12 +12,15 @@ resourceStores:[], description:'', file:'', - resOrderType:'10000' + resOrderType:'' } } }, _initMethod: function () { vc.component._initStep(); + //10000 采购 20000出库 + vc.component.addPurchaseApplyStepInfo.purchaseApply.resOrderType = vc.getParam('resOrderType'); + console.log("订单类型："+vc.getParam('resOrderType')); }, _initEvent: function () { vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) { @@ -85,7 +88,12 @@ if (res.status == 200) { //关闭model - vc.jumpToPage("/admin.html#/purchaseApplyManage"); + if(vc.component.addPurchaseApplyStepInfo.purchaseApply.resOrderType == "10000"){ + vc.jumpToPage("/admin.html#/purchaseApplyManage"); + }else{ + vc.jumpToPage("/admin.html#/itemOutManage"); + } + return; } vc.message(json); diff --git a/public/components/itemOutManage/itemOutManage.html b/public/components/itemOutManage/itemOutManage.html index 38600d54c..cdafae63d 100644 --- a/public/components/itemOutManage/itemOutManage.html +++ b/public/components/itemOutManage/itemOutManage.html @@ -1,4 +1,5 @@ -
+ +
@@ -11,78 +12,88 @@
-
- -
+ + + + + + +
+ +
- -
-
-
-
- +
+
- -
-
+
-
物品信息
- - - - - - +
采购申请信息
+
+ +
- + + + + + + + + + + + + - - - - - - + + + + + + + + @@ -100,46 +111,10 @@ -
- -
-
-
物品摘要
-
-
- - 总价 - -

- 390,00 元 -

- -
-
-
- -
-
-
当前申请人
-
-
- - -

系统登陆人

-

登陆时间

-
-
- - -
- - - - - - + + diff --git a/public/components/itemOutManage/itemOutManage.js b/public/components/itemOutManage/itemOutManage.js index 8160a3a73..aba8a8c9b 100644 --- a/public/components/itemOutManage/itemOutManage.js +++ b/public/components/itemOutManage/itemOutManage.js @@ -1,89 +1,85 @@ /** 入驻小区 **/ -(function (vc) { +(function(vc){ var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ - data: { - resourceStoreManageInfo: { - resourceStores: [], - total: 0, - records: 1, - moreCondition: false, - resName: '', - conditions: { - resId: '', - resName: '', - resCode: '', - description:'', - stock:'' - + data:{ + purchaseApplyManageInfo:{ + purchaseApplys:[], + total:0, + records:1, + moreCondition:false, + applyOrderId:'', + states:'', + conditions:{ + state:'', + userName:'', + resOrderType:'20000' } } }, - _initMethod: function () { - vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); + _initMethod:function(){ + vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); }, - _initEvent: function () { - - vc.on('resourceStoreManage', 'listResourceStore', function (_param) { - vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); + _initEvent:function(){ + vc.on('purchaseApplyManage','listPurchaseApply',function(_param){ + vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); }); - vc.on('pagination', 'page_event', function (_currentPage) { - vc.component._listResourceStores(_currentPage, DEFAULT_ROWS); + vc.on('pagination','page_event',function(_currentPage){ + vc.component._listPurchaseApplys(_currentPage,DEFAULT_ROWS); }); }, - methods: { - _resourceStoreLess:function(stock){ - vc.component.$data.resourceStoreManageInfo.conditions.stock=parseInt(stock--); - }, + methods:{ + _listPurchaseApplys:function(_page, _rows){ - _listResourceStores: function (_page, _rows) { - - vc.component.resourceStoreManageInfo.conditions.page = _page; - vc.component.resourceStoreManageInfo.conditions.row = _rows; + vc.component.purchaseApplyManageInfo.conditions.page = _page; + vc.component.purchaseApplyManageInfo.conditions.row = _rows; var param = { - params: vc.component.resourceStoreManageInfo.conditions + params:vc.component.purchaseApplyManageInfo.conditions }; //发送get请求 - vc.http.get('resourceStoreManage', + vc.http.get('purchaseApplyManage', 'list', param, - function (json, res) { - var _resourceStoreManageInfo = JSON.parse(json); - vc.component.resourceStoreManageInfo.total = _resourceStoreManageInfo.total; - vc.component.resourceStoreManageInfo.records = _resourceStoreManageInfo.records; - vc.component.resourceStoreManageInfo.resourceStores = _resourceStoreManageInfo.resourceStores; - vc.emit('pagination', 'init', { - total: vc.component.resourceStoreManageInfo.records, - currentPage: _page + function(json,res){ + var _purchaseApplyManageInfo=JSON.parse(json); + vc.component.purchaseApplyManageInfo.total = _purchaseApplyManageInfo.total; + vc.component.purchaseApplyManageInfo.records = _purchaseApplyManageInfo.records; + vc.component.purchaseApplyManageInfo.purchaseApplys = _purchaseApplyManageInfo.purchaseApplys; + vc.emit('pagination','init',{ + total:vc.component.purchaseApplyManageInfo.records, + currentPage:_page }); - }, function (errInfo, error) { + },function(errInfo,error){ console.log('请求失败处理'); } ); }, - _openAddResourceStoreModal: function () { - vc.emit('addResourceStore', 'openAddResourceStoreModal', {}); + _openAddPurchaseApplyModal:function(){ + vc.jumpToPage("/admin.html#/addPurchaseApplyStep?resOrderType="+vc.component.purchaseApplyManageInfo.conditions.resOrderType); }, - _openEditResourceStoreModel: function (_resourceStore) { - vc.emit('editItemNumberStore', 'openEditItemNumberStoreModal', _resourceStore); + _openDetailPurchaseApplyModel:function(_purchaseApply){ + vc.jumpToPage("/admin.html#/purchaseApplyDetail?applyOrderId="+_purchaseApply.applyOrderId); }, - _openDeleteResourceStoreModel: function (_resourceStore) { - vc.emit('deleteResourceStore', 'openDeleteResourceStoreModal', _resourceStore); + _openDeletePurchaseApplyModel:function(_purchaseApply){ + vc.emit('deletePurchaseApply','openDeletePurchaseApplyModal',_purchaseApply); }, - _queryResourceStoreMethod: function () { - vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); + _queryPurchaseApplyMethod:function(){ + vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); }, - _moreCondition: function () { - if (vc.component.resourceStoreManageInfo.moreCondition) { - vc.component.resourceStoreManageInfo.moreCondition = false; - } else { - vc.component.resourceStoreManageInfo.moreCondition = true; + _moreCondition:function(){ + if(vc.component.purchaseApplyManageInfo.moreCondition){ + vc.component.purchaseApplyManageInfo.moreCondition = false; + }else{ + vc.component.purchaseApplyManageInfo.moreCondition = true; } + }, + _queryInspectionPlanMethod:function () { + vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); } diff --git a/public/components/purchaseApplyManage/purchaseApplyManage.js b/public/components/purchaseApplyManage/purchaseApplyManage.js index edcf6e0c8..edec23762 100644 --- a/public/components/purchaseApplyManage/purchaseApplyManage.js +++ b/public/components/purchaseApplyManage/purchaseApplyManage.js @@ -59,7 +59,7 @@ ); }, _openAddPurchaseApplyModal:function(){ - vc.jumpToPage("/admin.html#/addPurchaseApplyStep"); + vc.jumpToPage("/admin.html#/addPurchaseApplyStep?resOrderType="+this.purchaseApplyManageInfo.conditions.resOrderType); }, _openDetailPurchaseApplyModel:function(_purchaseApply){ vc.jumpToPage("/admin.html#/purchaseApplyDetail?applyOrderId="+_purchaseApply.applyOrderId); diff --git a/public/components/viewResourceStoreInfo2/viewResourceStoreInfo2.html b/public/components/viewResourceStoreInfo2/viewResourceStoreInfo2.html index ed2b332c3..a36dafac5 100644 --- a/public/components/viewResourceStoreInfo2/viewResourceStoreInfo2.html +++ b/public/components/viewResourceStoreInfo2/viewResourceStoreInfo2.html @@ -22,7 +22,7 @@ - + @@ -36,7 +36,7 @@
单号审批状态流程处理人申请人申请时间物品总计价格操作
-

- - {{resourceStore.resName}} - -

-

- {{resourceStore.description}} -

- 		{{resourceStore.price}} - - - - - - -

- {{resourceStore.price}} -

+
{{purchaseApply.applyOrderId}}{{purchaseApply.stateName}}{{purchaseApply.agreeMan}}{{purchaseApply.userName}}{{purchaseApply.createTime}}{{purchaseApply.resourceNames}}{{purchaseApply.totalPrice}} +
+ +
+
+ +
物品编码 物品价格 物品库存采购数量申请数量 备注{{resourceStore.stock}} + placeholder="必填，请填写申请数量" class="form-control"> @@ -60,4 +60,4 @@ emitLoadData="viewResourceStoreInfo" > - \ No newline at end of file +