From 0a0343ebf55ae702a1ce920494d283007c5f0987 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 29 Apr 2023 05:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E5=90=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/contractDetailFee/contractDetailFee.html |  9 ++++++++-
 .../contract/contractDetailFee/contractDetailFee.js   |  8 +++++++-
 .../contractDetailRoomFee/contractDetailRoomFee.html  | 11 ++++++++++-
 .../contractDetailRoomFee/contractDetailRoomFee.js    |  8 +++++++-
 .../property/simplifyRoomFee/simplifyRoomFee.html     |  6 ++----
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/public/components/contract/contractDetailFee/contractDetailFee.html b/public/components/contract/contractDetailFee/contractDetailFee.html
index b7e6c46f2..407127e07 100644
--- a/public/components/contract/contractDetailFee/contractDetailFee.html
+++ b/public/components/contract/contractDetailFee/contractDetailFee.html
@@ -148,7 +148,14 @@
                 <div> 注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束</div>
                 <div>应收金额为-1 一般为费用项公式设置出错请检查</div>
             </div>
-            <div class="col-sm-8">
+            <div class="col-sm-2">
+                <span>
+                    <span>
+                            <vc:i18n name="欠费小计：" namespace="contractDetailRoomFee"></vc:i18n>
+                    </span>{{contractDetailRoomFeeInfo.totalAmount}}
+                </span>
+            </div>
+            <div class="col-sm-6">
                 <vc:create namespace="contractDetailFee" path="frame/paginationPlus"></vc:create>
             </div>
         </div>
diff --git a/public/components/contract/contractDetailFee/contractDetailFee.js b/public/components/contract/contractDetailFee/contractDetailFee.js
index 757425d80..51d0f4698 100644
--- a/public/components/contract/contractDetailFee/contractDetailFee.js
+++ b/public/components/contract/contractDetailFee/contractDetailFee.js
@@ -10,7 +10,8 @@
                 rooms: [],
                 contractId: '',
                 roomNum: '',
-                allOweFeeAmount: '0'
+                allOweFeeAmount: '0',
+                totalAmount:0,
             }
         },
         _initMethod: function () {
@@ -50,6 +51,11 @@
                             total: _feeConfigInfo.records,
                             currentPage: _page
                         });
+                        let _totalAmount = 0.0;
+                        _feeConfigInfo.fees.forEach(item => {
+                            _totalAmount += parseFloat(item.amountOwed);
+                        })
+                        $that.contractDetailFeeInfo.totalAmount = _totalAmount.toFixed(2);
                         $that.$forceUpdate();
                     },
                     function() {
diff --git a/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.html b/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.html
index a659cb2a1..e4c95cfd0 100644
--- a/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.html
+++ b/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.html
@@ -163,7 +163,16 @@
                 <div> 注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束</div>
                 <div>应收金额为-1 一般为费用项公式设置出错请检查</div>
             </div>
-            <div class="col-sm-8">
+            <div class="col-sm-2">
+                <span>
+                    <span>
+                        <span>
+                            <vc:i18n name="欠费小计" namespace="contractDetailRoomFee"></vc:i18n>
+                        </span>
+                    </span>：{{contractDetailRoomFeeInfo.totalAmount}}
+                </span>
+            </div>
+            <div class="col-sm-6">
                 <vc:create namespace="contractDetailRoomFee" path="frame/paginationPlus"></vc:create>
             </div>
         </div>
diff --git a/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.js b/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.js
index d2fa31bb9..13784ca91 100644
--- a/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.js
+++ b/public/components/contract/contractDetailRoomFee/contractDetailRoomFee.js
@@ -14,7 +14,8 @@
                 payObjs:[],
                 payerObjIds: [],
                 ownerId:'',
-                state:'2008001'
+                state:'2008001',
+                totalAmount:0,
             }
         },
         _initMethod: function () {
@@ -57,6 +58,11 @@
                             total: _feeConfigInfo.records,
                             currentPage: _page
                         });
+                        let _totalAmount = 0.0;
+                        _feeConfigInfo.fees.forEach(item => {
+                            _totalAmount += parseFloat(item.amountOwed);
+                        })
+                        $that.contractDetailRoomFeeInfo.totalAmount = _totalAmount.toFixed(2);
                         $that.$forceUpdate();
                     },
                     function() {
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
index 002c47e29..30ecc0e34 100755
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
@@ -162,10 +162,8 @@
                         </div>
                         <div>
                             <span>
-                                <span>
-                                    <vc:i18n name="单价" namespace="simplifyRoomFee"></vc:i18n>
-                                </span>
-                            </span>：{{fee.squarePrice}}
+                                    <vc:i18n name="单价：" namespace="simplifyRoomFee"></vc:i18n>
+                            </span>{{fee.squarePrice}}
                         </div>
                         <div>
                             <span>