From a542b4fe6d1cd1f9d746bb139b4fe486fad10488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com>
Date: Thu, 26 Mar 2020 11:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=C3=A2=C2=80=C3=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPurchaseApplyStep/addPurchaseApplyStep.js         | 9 ++++-----
 .../purchaseApplyManage/purchaseApplyManage.html         | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js b/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js
index a4e50e5fc..46bc79f90 100644
--- a/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js
+++ b/public/components/addPurchaseApplyStep/addPurchaseApplyStep.js
@@ -21,7 +21,6 @@
         },
         _initEvent: function () {
             vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) {
-                console.log("收到最终参数："+viewResourceStoreInfo2);
                 vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores;
             });
 
@@ -52,12 +51,12 @@
                 vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null);
                 var _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores;
                 if (_resourceStores.length == 0) {
-                    vc.message("请完善需要采购的物品信息");
+                    vc.toast("请完善需要采购的物品信息");
                     return;
                 }
                for( var i = 0; i < _resourceStores.length; i++){
                    if(_resourceStores[i].quantity <= 0){
-                       vc.message("请完善需要采购的物品信息");
+                       vc.toast("请完善需要采购的物品信息");
                         return;
                    }
                }
@@ -72,7 +71,7 @@
                 vc.emit('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', null);
                 var _description = vc.component.addPurchaseApplyStepInfo.purchaseApply.description;
                 if (_description == null || _description == '') {
-                    vc.message("请填写申请说明");
+                    vc.toast("请填写申请说明");
                     return;
                 }
                 vc.http.post(
@@ -94,7 +93,7 @@
                     function (errInfo, error) {
                         console.log('请求失败处理');
 
-                        vc.message(errInfo);
+                        vc.toast(errInfo);
                     });
             }
         }
diff --git a/public/components/purchaseApplyManage/purchaseApplyManage.html b/public/components/purchaseApplyManage/purchaseApplyManage.html
index 34d8e74be..d76511732 100644
--- a/public/components/purchaseApplyManage/purchaseApplyManage.html
+++ b/public/components/purchaseApplyManage/purchaseApplyManage.html
@@ -64,7 +64,9 @@
                     >
                         <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>
@@ -74,7 +76,9 @@
                         </thead>
                         <tbody>
                         <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
+                            <td class="text-center">{{purchaseApply.applyOrderId}}</td>
                             <td class="text-center">{{purchaseApply.stateName}}</td>
+                            <td class="text-center">{{purchaseApply.agreeMan}}</td>
                             <td class="text-center">{{purchaseApply.userName}}</td>
                             <td class="text-center">{{purchaseApply.createTime}}</td>
                             <td class="text-center">{{purchaseApply.resourceNames}}</td>