From f2020fe527e86660d329d4560de56e3d81f2b64d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 4 Dec 2022 01:55:23 +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/printOweFee/printOweFee.html     | 20 ++++++++++---------
 .../pages/property/printOweFee/printOweFee.js |  5 +++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html
index 51d33b24d..9d6c48afa 100755
--- a/public/pages/property/printOweFee/printOweFee.html
+++ b/public/pages/property/printOweFee/printOweFee.html
@@ -10,19 +10,19 @@
                     <span>{{printPayFeeInfo.payObjName}}</span>
                 </div>
                 <div class="col-sm-4">
-                    <span></span>
+                    <span><span><vc:i18n name="业主" namespace="printOweFee"></vc:i18n></span>：{{printPayFeeInfo.ownerName}}</span>
                 </div>
                 <div class="col-sm-4">
                     <span><span><vc:i18n name="打印时间" namespace="printOweFee"></vc:i18n></span>：{{printPayFeeInfo.feeTime}}</span>
                 </div>
             </div>
-            <table class="table vc-table-border margin-top">
+            <table class="table vc-table-border margin-top" style="color:#000;font-size:14px">
                 <thead>
-                    <tr>
+                    <tr >
                         <th scope="col" class="text-center"><span><vc:i18n name="项目名称" namespace="printOweFee"></vc:i18n></span></th>
                         <th scope="col" class="text-center"><span><vc:i18n name="费用期间" namespace="printOweFee"></vc:i18n></span></th>
                         <th scope="col" class="text-center"><span><vc:i18n name="单位" namespace="printOweFee"></vc:i18n></span></th>
-                        <th scope="col" class="text-center"><span><vc:i18n name="面积" namespace="printOweFee"></vc:i18n></span></th>
+                        <th scope="col" class="text-center"><span><vc:i18n name="面积/用量" namespace="printOweFee"></vc:i18n></span></th>
                         <th scope="col" class="text-center"><span><vc:i18n name="单价" namespace="printOweFee"></vc:i18n></span></th>
                         <th scope="col" class="text-center"><span><vc:i18n name="金额" namespace="printOweFee"></vc:i18n></span></th>
                     </tr>
@@ -41,8 +41,10 @@
                             {{vc.dateFormat(item.deadlineTime)}}
                         </td>
                         <td class="text-center"><span><vc:i18n name="元" namespace="printOweFee"></vc:i18n></span></td>
-                        <td class="text-center">{{printPayFeeInfo.builtUpArea}}</td>
-                        <td class="text-center">{{item.squarePrice}}/{{item.additionalAmount}}</td>
+                        <td class="text-center" v-if="item.preDegrees">{{(item.curDegrees-item.preDegrees).toFixed(2)}}</td>
+                        <td class="text-center" v-else>{{printPayFeeInfo.builtUpArea}}</td>
+                        <td class="text-center" v-if="item.preDegrees">{{item.mwPrice}}</td>
+                        <td class="text-center" v-else>{{item.squarePrice}}/{{item.additionalAmount}}</td>
                         <td class="text-center">{{item.feePrice}}</td>
                     </tr>
                     <tr>
@@ -53,10 +55,10 @@
                     </tr>
                     <tr height="60px" v-if="printPayFeeInfo.content">
                         <td colspan="3">
-                            <p style="max-width: 600px;">
+                            
                                 <!-- {{printPayFeeInfo.content}} -->
-                                <div v-html="printPayFeeInfo.content"></div>
-                            </p>
+                                <div style="max-width: 600px;" v-html="printPayFeeInfo.content"></div>
+                           
                         </td>
                         <td colspan="4">
                             <img :src="printPayFeeInfo.qrImg" width="100px" height="100px">
diff --git a/public/pages/property/printOweFee/printOweFee.js b/public/pages/property/printOweFee/printOweFee.js
index e55e5fb14..2b685ada5 100755
--- a/public/pages/property/printOweFee/printOweFee.js
+++ b/public/pages/property/printOweFee/printOweFee.js
@@ -14,7 +14,8 @@
                 payObjId: '',
                 builtUpArea: '',
                 payObjType:'',
-                payObjName:''
+                payObjName:'',
+                ownerName:''
             },
             printFlag: '0'
         },
@@ -143,7 +144,7 @@
                         $that.printPayFeeInfo.fees.forEach(item => {
                             //item.feePrice = $that._getFixedNum(item.feePrice);
                             item.receivableAmount = item.feePrice;
-                            item.feePrice = item.feeTotalPrice;
+                            item.feePrice = item.feePrice;
                             _totalAmount += item.feePrice;
                         });
                         _totalAmount = Math.round(_totalAmount * 100) / 100;