From 503001d87bfb1b8f01fbb235d07a41ff138efc69 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 9 May 2020 18:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=B3=E8=AF=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseApplyDetail.html                  | 126 ++++++++++++------
 .../purchaseApplyDetail.js                    |   5 +-
 .../purchaseApplyManage.html                  |   4 +-
 3 files changed, 89 insertions(+), 46 deletions(-)

diff --git a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
index 5474d550c..ac8013de8 100644
--- a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
+++ b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.html
@@ -1,35 +1,79 @@
-<div id="component">
+<div>
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>申请信息</h5>
-                    <div class="ibox-tools" style="top:10px;">
-
-                    </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-md-3">
-                            <h5>审核状态:</h5>
-                            <i class="fa fa-search">:</i><span>{{purchaseApplyDetailInfo.stateName}}</span>
+
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">申请单号：</label>
+                                <label class="">{{purchaseApplyDetailInfo.applyOrderId}}</label>
+                            </div>
                         </div>
-                        <div class="col-md-3">
-                            <h5>申请人:</h5>
-                            <i class="fa fa-user">:</i><span>{{purchaseApplyDetailInfo.userName}}</span>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">申请人：</label>
+                                <label class="">{{purchaseApplyDetailInfo.userName}}</label>
+                            </div>
                         </div>
-                        <div class="col-md-3">
-                            <h5>申请时间:</h5>
-                            <i class="fa fa-clock-o">:</i><span>{{purchaseApplyDetailInfo.createTime}}</span>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">使用人：</label>
+                                <label class="">{{purchaseApplyDetailInfo.endUserName}}</label>
+                            </div>
                         </div>
+
                     </div>
-                    <hr style="border-top:1px dashed #987cb9;" width="100%" color="#987cb9" size=1>
+
                     <div class="row">
-                        <div class="col-md-12">
-                            <h5>申请说明:</h5>
-                            <i class="fa fa-pencil">:</i> <span>{{purchaseApplyDetailInfo.description}}</span>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">使用人联系方式：</label>
+                                <label class="">{{purchaseApplyDetailInfo.endUserTel}}</label>
+                            </div>
                         </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">申请时间：</label>
+                                <label class="">{{purchaseApplyDetailInfo.createTime}}</label>
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">参考价格：</label>
+                                <label class="">{{purchaseApplyDetailInfo.totalPrice}}</label>
+                            </div>
+                        </div>
+
                     </div>
+
+                    <div class="row">
+
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">当前处理人：</label>
+                                <label class="">{{purchaseApplyDetailInfo.staffName}}</label>
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">当前处理人电话：</label>
+                                <label class="">{{purchaseApplyDetailInfo.staffTel}}</label>
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <label class="col-form-label">审批状态：</label>
+                                <label class="">{{purchaseApplyDetailInfo.stateName}}</label>
+                            </div>
+                        </div>
+
+                    </div>
+
                 </div>
             </div>
         </div>
@@ -42,39 +86,37 @@
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
+                    <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="resourceStore in purchaseApplyDetailInfo.purchaseApplyDetailVo">
-                            <td class="text-center">{{resourceStore.resName}}</td>
-                            <td class="text-center">{{resourceStore.resCode}}</td>
-                            <td class="text-center">{{resourceStore.price}}</td>
-                            <td class="text-center">{{resourceStore.stock}}</td>
-                            <td class="text-center">{{resourceStore.quantity}}</td>
-                            <td class="text-center">{{resourceStore.remark}}</td>
-                        </tr>
+                            <tr v-for="resourceStore in purchaseApplyDetailInfo.purchaseApplyDetailVo">
+                                <td class="text-center">{{resourceStore.resName}}</td>
+                                <td class="text-center">{{resourceStore.resCode}}</td>
+                                <td class="text-center">{{resourceStore.price}}</td>
+                                <td class="text-center">{{resourceStore.stock}}</td>
+                                <td class="text-center">{{resourceStore.quantity}}</td>
+                                <td class="text-center">{{resourceStore.remark}}</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>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.js b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.js
index 1c867e103..0601fa57b 100644
--- a/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.js
+++ b/public/pages/common/purchaseApplyDetail/purchaseApplyDetail.js
@@ -20,11 +20,12 @@
             }
         },
         _initMethod:function(){
+            vc.component.purchaseApplyDetailInfo.applyOrderId = vc.getParam('applyOrderId');
+            vc.component.purchaseApplyDetailInfo.resOrderType = vc.getParam('resOrderType');
             vc.component._listPurchaseApply(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent:function(){
-            vc.component.purchaseApplyDetailInfo.applyOrderId = vc.getParam('applyOrderId');
-            vc.component.purchaseApplyDetailInfo.resOrderType = vc.getParam('resOrderType');
+            
         },
         methods:{
             _listPurchaseApply:function(_page, _rows){
diff --git a/public/pages/common/purchaseApplyManage/purchaseApplyManage.html b/public/pages/common/purchaseApplyManage/purchaseApplyManage.html
index 15df09c5a..83f3dffd6 100644
--- a/public/pages/common/purchaseApplyManage/purchaseApplyManage.html
+++ b/public/pages/common/purchaseApplyManage/purchaseApplyManage.html
@@ -64,7 +64,7 @@
                                 <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>
                                 <th class="text-center">申请时间</th>
                                 <th class="text-center">参考价格</th>
@@ -79,7 +79,7 @@
                                 <td class="text-center">{{purchaseApply.applyOrderId}}</td>
                                 <td class="text-center">{{purchaseApply.userName}}</td>
                                 <td class="text-center">{{purchaseApply.endUserName}}</td>
-                                <td class="text-center">{{purchaseApply.endUserTel}}</td>
+                                <!-- <td class="text-center">{{purchaseApply.endUserTel}}</td> -->
                                 <td class="text-center">{{purchaseApply.resourceNames}}</td>
                                 <td class="text-center">{{purchaseApply.createTime}}</td>
                                 <td class="text-center">{{purchaseApply.totalPrice}}</td>