From 4757b81024a4c2936027764905298b04d3b4f235 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 26 Aug 2020 23:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/viewMainFee/viewMainFee.html     | 31 +++++++++++++++++--
 .../property/viewMainFee/viewMainFee.js       |  8 ++++-
 .../pages/property/listRoomFee/listRoomFee.js |  1 +
 .../property/propertyFee/propertyFee.html     |  8 +++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/public/components/property/viewMainFee/viewMainFee.html b/public/components/property/viewMainFee/viewMainFee.html
index 17fb632e0..52c0f9f14 100644
--- a/public/components/property/viewMainFee/viewMainFee.html
+++ b/public/components/property/viewMainFee/viewMainFee.html
@@ -51,21 +51,48 @@
                             <label class="">{{mainFeeInfo.stateName}}</label>
                         </div>
                     </div>
+                   
+                </div>
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">面积：</label>
+                            <label class="">{{mainFeeInfo.builtUpArea}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >单价：</label>
+                            <label class="">{{mainFeeInfo.squarePrice}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >附加费：</label>
+                            <label class="">{{mainFeeInfo.additionalAmount}}</label>
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
 
                     <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >费用开始时间：</label>
+                            <label class="col-form-label" >建账时间：</label>
                             <label class="">{{mainFeeInfo.startTime}}</label>
                         </div>
                     </div>
                     <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label" >费用到期时间：</label>
+                            <label class="col-form-label" >计费开始时间：</label>
                             <label class="">{{mainFeeInfo.endTime}}</label>
                         </div>
                     </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >计费结束时间：</label>
+                            <label class="">{{mainFeeInfo.deadlineTime}}</label>
+                        </div>
+                    </div>
                     <div class="col-sm-4">
                         <div class="form-group" v-if="mainFeeInfo.amount != '-1.00'">
                             <label class="col-form-label">费用金额：</label>
diff --git a/public/components/property/viewMainFee/viewMainFee.js b/public/components/property/viewMainFee/viewMainFee.js
index 3446dfd42..5680610b7 100644
--- a/public/components/property/viewMainFee/viewMainFee.js
+++ b/public/components/property/viewMainFee/viewMainFee.js
@@ -27,7 +27,11 @@
                 feeFlagName:'',
                 feeTypeCdName:'',
                 configId:'',
-                stateName:''
+                stateName:'',
+                additionalAmount:0.0,
+                squarePrice:0,
+                builtUpArea:'',
+                deadlineTime:''
 
             }
         },
@@ -35,6 +39,8 @@
              //加载 业主信息
             var _feeId = vc.getParam('feeId')
 
+            $that.mainFeeInfo.builtUpArea = vc.getParam('builtUpArea')
+
             if(vc.notNull(_feeId)){
                 vc.component.loadMainFeeInfo({
                     feeId:_feeId
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index e226a0820..2aeb5b2df 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -64,6 +64,7 @@
                vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
             },
             _payFeeHis:function(_fee){
+                _fee.builtUpArea=$that.listRoomCreateFeeInfo.builtUpArea;
                vc.jumpToPage('/admin.html#/pages/property/propertyFee?'+vc.objToGetParam(_fee));
             },
             _deleteFee:function(_fee){
diff --git a/public/pages/property/propertyFee/propertyFee.html b/public/pages/property/propertyFee/propertyFee.html
index c6427727f..766f953f8 100644
--- a/public/pages/property/propertyFee/propertyFee.html
+++ b/public/pages/property/propertyFee/propertyFee.html
@@ -44,6 +44,8 @@
                             <th data-hide="phone">打折率</th>
                             <th data-hide="phone" >备注</th>
                             <th data-hide="phone">缴费时间</th>
+                            <th data-hide="phone">缴费起始时间</th>
+                            <th data-hide="phone">缴费结束时间</th>
                             <th data-hide="phone">退费标识</th>
                             <th data-hide="phone">操作</th>
                         </tr>
@@ -71,6 +73,12 @@
                             <td>
                                 {{feeDetail.createTime}}
                             </td>
+                            <td>
+                                {{feeDetail.startTime}}
+                            </td>
+                            <td>
+                                {{feeDetail.endTime}}
+                            </td>
                             <td>
                                 {{feeDetail.stateName}}
                             </td>