From 950704ac8c2b681d67f5392836d2003c1d39e9d1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 30 Nov 2020 12:37:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=94=E5=BA=94=E4=B8=8D?=
 =?UTF-8?q?=E6=B8=85=E6=99=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/simplifyCarFee/simplifyCarFee.js |  3 +-
 .../simplifyRoomFee/simplifyRoomFee.js        |  3 +-
 .../property/viewMainFee/viewMainFee.js       |  4 +-
 .../property/payFeeOrder/payFeeOrder.html     |  4 +-
 .../pages/property/payFeeOrder/payFeeOrder.js | 55 ++++++++++++++-----
 public/print.html                             |  2 +-
 6 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/public/components/property/simplifyCarFee/simplifyCarFee.js b/public/components/property/simplifyCarFee/simplifyCarFee.js
index cabc63da7..13bf0842e 100644
--- a/public/components/property/simplifyCarFee/simplifyCarFee.js
+++ b/public/components/property/simplifyCarFee/simplifyCarFee.js
@@ -76,7 +76,8 @@
             },
             _simplifyCarPayFee: function (_fee) {
                 _fee.roomName = vc.component.simplifyCarFeeInfo.carNum;
-                vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
+                //vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
+                vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?feeId=' + _fee.feeId);
             },
             _simplifyCarPayFeeHis: function (_fee) {
                 vc.jumpToPage('/admin.html#/pages/property/propertyFee?' + vc.objToGetParam(_fee));
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
index 5c3c45b49..6e6879da3 100644
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
@@ -127,7 +127,8 @@
             _payFee:function(_fee){
                 _fee.roomName=$that.simplifyRoomFeeInfo.roomName;
                 _fee.builtUpArea=$that.simplifyRoomFeeInfo.builtUpArea;
-               vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
+               //vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?'+vc.objToGetParam(_fee));
+               vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?feeId='+_fee.feeId);
             },
             _editFee:function(_fee){
                 vc.emit('editFee', 'openEditFeeModal',_fee);
diff --git a/public/components/property/viewMainFee/viewMainFee.js b/public/components/property/viewMainFee/viewMainFee.js
index cc26f6e9a..862aaa487 100644
--- a/public/components/property/viewMainFee/viewMainFee.js
+++ b/public/components/property/viewMainFee/viewMainFee.js
@@ -42,7 +42,7 @@
             //加载 业主信息
             var _feeId = vc.getParam('feeId')
 
-            $that.mainFeeInfo.builtUpArea = vc.getParam('builtUpArea')
+            //$that.mainFeeInfo.builtUpArea = vc.getParam('builtUpArea')
 
             if (vc.notNull(_feeId)) {
                 vc.component.loadMainFeeInfo({
@@ -166,6 +166,8 @@
 
                         $that.mainFeeInfo.payerObjName = _payerObjName;
 
+                        $that.mainFeeInfo.builtUpArea = _room.builtUpArea;
+
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 3fee6281d..c539b5510 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -3,7 +3,7 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>订单收费</h5>
+                    <h5>订单收费({{payFeeOrderInfo.payerObjName}})</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                             v-on:click="_goBack()">
@@ -145,7 +145,7 @@
                 <div class="modal-body">
                     <div class="row" >
                         <label class="col-sm-3 col-form-label">付费对象：</label>
-                        <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.roomName}}</label>
+                        <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.payerObjName}}</label>
                     </div>
                     <div class="row" v-if="payFeeOrderInfo.feeFlag != '2006012' && payFeeOrderInfo.showEndTime != ''">
                         <label class="col-sm-3 col-form-label" >缴费时间段：</label>
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index 5c1a09f5f..9fcd6dd2b 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -16,7 +16,7 @@
                 totalFeePrice: 0.00,
                 receivedAmount: '',
                 communityId: vc.getCurrentCommunity().communityId,
-                roomName: '',
+                payerObjName: '',
                 squarePrice: '',
                 remark: '',
                 builtUpArea: 0.0,
@@ -25,7 +25,7 @@
                 receiptId: '',
                 showEndTime: '',
                 selectDiscount: [],
-                totalDiscountMoney:0.0
+                totalDiscountMoney: 0.0
             }
         },
         _initMethod: function () {
@@ -36,23 +36,22 @@
                 vc.component.payFeeOrderInfo.endTime = vc.getParam('endTime').replace(/%3A/g, ':');
                 vc.component.payFeeOrderInfo.feePrice = vc.getParam('feePrice');
                 $that.payFeeOrderInfo.feeFlag = vc.getParam('feeFlag');
-                $that.payFeeOrderInfo.roomName = vc.getParam('roomName');
+                $that.payFeeOrderInfo.payerObjName = vc.getParam('payerObjName');
                 $that.payFeeOrderInfo.squarePrice = vc.getParam('squarePrice');
                 $that.payFeeOrderInfo.additionalAmount = vc.getParam('additionalAmount');
-                $that.payFeeOrderInfo.builtUpArea = vc.getParam('builtUpArea');
+                //$that.payFeeOrderInfo.builtUpArea = vc.getParam('builtUpArea');
                 $that.payFeeOrderInfo.squarePrice = vc.getParam('squarePrice');
                 $that.payFeeOrderInfo.additionalAmount = vc.getParam('additionalAmount');
                 $that.payFeeOrderInfo.paymentCycles = [];
                 for (let _index = 1; _index < 7; _index++) {
                     $that.payFeeOrderInfo.paymentCycles.push(_index * vc.getParam('paymentCycle'))
                 }
+
+                $that.listPayFeeOrderRoom();
             };
 
             vc.component.payFeeOrderInfo.totalFeePrice = $that._mathCeil(vc.component.payFeeOrderInfo.feePrice);
             vc.component.payFeeOrderInfo.receivedAmount = vc.component.payFeeOrderInfo.totalFeePrice;
-
-
-
         },
         _initEvent: function () {
             vc.on('payFeeOrder', 'changeDiscountPrice', function (_param) {
@@ -61,19 +60,24 @@
                 if (_totalFeePrice < 0) {
                     return;
                 }
-
                 let _totalDiscountMoney = _param.totalDiscountMoney;
-
                 //如果应收小区 优惠金额 则不优惠
                 if (_totalFeePrice < _totalDiscountMoney) {
                     return;
                 }
-
                 $that.payFeeOrderInfo.selectDiscount = _param.selectDiscount;
-
                 $that.payFeeOrderInfo.totalDiscountMoney = _totalDiscountMoney;
-
                 $that.payFeeOrderInfo.receivedAmount = _totalFeePrice - _totalDiscountMoney;
+            });
+
+            vc.on('payFeeOrder', 'initData', function (_param) {
+                $that.payFeeOrderInfo.paymentCycles = [];
+                for (let _index = 1; _index < 7; _index++) {
+                    $that.payFeeOrderInfo.paymentCycles.push(_index * _param.paymentCycle);
+                }
+
+                $that.payFeeOrderInfo.totalFeePrice = $that._mathCeil(vc.component.payFeeOrderInfo.feePrice);
+                $that.payFeeOrderInfo.receivedAmount =  $that.payFeeOrderInfo.totalFeePrice;
             })
         },
         methods: {
@@ -227,7 +231,32 @@
             },
             _mathCeil: function (_price) {
                 return Math.ceil(_price);
-            }
+            },
+            listPayFeeOrderRoom: function () {
+                if (!vc.notNull($that.payFeeOrderInfo.feeId)) {
+                    return;
+                }
+                let param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        feeId: $that.payFeeOrderInfo.feeId,
+                        page: 1,
+                        row: 1
+                    }
+                };
+
+                //发送get请求
+                vc.http.apiGet('/feeApi/listFeeObj',
+                    param,
+                    function (json, res) {
+                        let listRoomData = JSON.parse(json);
+                        vc.copyObject(listRoomData.data, $that.payFeeOrderInfo);
+                        vc.emit('payFeeOrder', 'initData',listRoomData.data);
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
 
     });
diff --git a/public/print.html b/public/print.html
index 251099943..543e0151d 100644
--- a/public/print.html
+++ b/public/print.html
@@ -47,7 +47,7 @@
 <body class="vc-body">
     <vc:create path="frame/bodyTop"></vc:create>
     <div class="vc">
-        <div id="vc-page" style="margin-left: 0;" class="gray-bg dashbard-1 vc-page-height">
+        <div id="vc-page" style="margin-left: 0;background-color: #FFF;" class="gray-bg dashbard-1 vc-page-height">
             <!--  -->
             <div id="component" class="vc-wrapper vc-content animated fadeInRight"
                 vc-path="/common/chooseEnterCommunity">