From cebc50ae8295dd24e2fd5ba0d4d236459a5190a3 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 02 六月 2019 22:59:35 +0800
Subject: [PATCH] 修改物业收费js

---
 WebService/src/main/resources/components/property-pay/propertyPay.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/resources/components/property-pay/propertyPay.js b/WebService/src/main/resources/components/property-pay/propertyPay.js
index 03975af..e7329a8 100644
--- a/WebService/src/main/resources/components/property-pay/propertyPay.js
+++ b/WebService/src/main/resources/components/property-pay/propertyPay.js
@@ -10,14 +10,17 @@
                 feeId:'',
                 builtUpArea:'',
                 squarePrice:'',
-                additionalAmount:''
+                additionalAmount:'',
+                communityId:''
             }
         },
         watch:{
             "propertyPayInfo.cycles":{//娣卞害鐩戝惉锛屽彲鐩戝惉鍒板璞°�佹暟缁勭殑鍙樺寲
                 handler(val, oldVal){
-                    vc.component.propertyPayInfo.receivableAmount = builtUpArea* squarePrice + additionalAmount;
-                    vc.component.propertyPayInfo.receivedAmount = builtUpArea* squarePrice + additionalAmount;
+                    vc.component.propertyPayInfo.receivableAmount = (parseFloat(vc.component.propertyPayInfo.builtUpArea)
+                                                                    * parseFloat(vc.component.propertyPayInfo.squarePrice)
+                                                                    + parseFloat(vc.component.propertyPayInfo.additionalAmount)) * parseFloat(val);
+                    vc.component.propertyPayInfo.receivedAmount = vc.component.propertyPayInfo.receivableAmount;
                 },
                 deep:true
             }
@@ -31,7 +34,8 @@
 
                 $('#propertyPayModel').modal('show');
                 vc.component.propertyPayInfo.feeId = _params.feeId;
-                vc.component.addRoomInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.component.propertyPayInfo.builtUpArea = _params.builtUpArea;
+                vc.component.propertyPayInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
         methods:{
@@ -127,7 +131,8 @@
                                              builtUpArea:'',
                                              feeId:'',
                                              squarePrice:'',
-                                             additionalAmount:''
+                                             additionalAmount:'',
+                                             communityId:''
                                          };
                 vc.component.loadPropertyConfigFee();
 

--
Gitblit v1.8.0