From 8555b5cd42cfff3ae3bce54593eeacd884fdfd23 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 6 Dec 2024 10:20:20 +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     | 171 +++++++++---------
 .../pages/property/printOweFee/printOweFee.js |   2 +-
 2 files changed, 88 insertions(+), 85 deletions(-)

diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html
index 9569de02c..68a0eccfd 100644
--- a/public/pages/property/printOweFee/printOweFee.html
+++ b/public/pages/property/printOweFee/printOweFee.html
@@ -1,89 +1,92 @@
 <div>
-    <div>
-        <div>
-            <div class=" text-center">
-                <h1>{{printPayFeeInfo.printName}}缴费通知单</h1>
-                <h3></h3>
-            </div>
-            <div class="row margin-top" style="color:#000;font-size:14px">
-                <div class="col-sm-4">
-                    <span><vc:i18n name="业主：" namespace="printOweFee"></vc:i18n></span>{{printPayFeeInfo.ownerName}}
-                </div>
-                <div class="col-sm-4">
-                </div>
-                <div class="col-sm-4">
-                    <span><vc:i18n name="打印时间：" namespace="printOweFee"></vc:i18n></span>{{printPayFeeInfo.feeTime}}
-                </div>
-            </div>
-            <table class="table vc-table-border margin-top" style="color:#000;font-size:14px">
-                <thead>
-                    <tr>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="收费对象" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="项目名称" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="费用期间" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="单位" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="面积/用量" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="单价" namespace="printOweFee"></vc:i18n>
-                        </th>
-                        <th scope="col" class="text-center">
-                            <vc:i18n name="金额" namespace="printOweFee"></vc:i18n>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="(item,index) in printPayFeeInfo.fees" class="vc-table-border">
-                        <td class="text-center">{{item.payerObjName}}</td>
-                        <td class="text-center">{{item.feeName}}</td>
-                        <td class="text-center" v-if="item.preDegrees">
-                            {{vc.dateFormat(item.endTime)}}至{{_getDeadlineTime(item)}}
-                            </br>
-                            {{item.preDegrees}} 至 {{item.curDegrees}}
-                        </td>
-                        <td class="text-center" v-else> {{vc.dateFormat(item.endTime)}}<span>
-                            <vc:i18n name="至" namespace="printOweFee"></vc:i18n></span> {{_getDeadlineTime(item)}}
-                        </td>
-                        <td class="text-center"><span><vc:i18n name="元" namespace="printOweFee"></vc:i18n></span></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 > 0">{{item.mwPrice}}</td>
-                        <td class="text-center" v-else>{{item.squarePrice}}/{{item.additionalAmount}}</td>
-                        <td class="text-center">{{item.feeTotalPrice}}</td>
-                    </tr>
-                    <tr>
-                        <td colspan="1" class="text-center "><span><vc:i18n name="大写人民币" namespace="printOweFee"></vc:i18n></span>（元）</td>
-                        <td colspan="4" class="text-center ">{{vc.changeNumMoneyToChinese(printPayFeeInfo.feePrices)}}
-                        </td>
-                        <td colspan="4" class="text-center ">{{printPayFeeInfo.feePrices}}</td>
-                    </tr>
-                    <tr height="60px" v-if="printPayFeeInfo.content">
-                        <td colspan="3">
-                            <!-- {{printPayFeeInfo.content}} -->
-                            <div style="max-width: 600px;" v-html="printPayFeeInfo.content"></div>
-                        </td>
-                        <td colspan="4">
-                            <img :src="printPayFeeInfo.qrImg" width="150px" height="150px">
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
+
+    <div class=" text-center">
+        <h1>{{printPayFeeInfo.printName}}缴费通知单</h1>
+        <h3></h3>
+    </div>
+    <div class="row margin-top" style="color:#000;font-size:14px">
+        <div class="col-sm-4">
+            业主：{{printPayFeeInfo.ownerName}}
         </div>
-        <div id="print-btn">
-            <button class="btn btn-primary float-right" type="button" v-on:click="_printPurchaseApplyDiv()">
-                <i class="fa fa-check"></i>&nbsp;打印
-            </button>
-            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" v-on:click="_closePage()"><span><vc:i18n name="取消" namespace="printOweFee"></vc:i18n></span>
-            </button>
+        <div class="col-sm-4">
+        </div>
+        <div class="col-sm-4">
+            打印时间：{{printPayFeeInfo.feeTime}}
         </div>
     </div>
+    <table class="table vc-table-border margin-top" style="color:#000;font-size:14px">
+        <thead>
+            <tr>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="收费对象" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="项目名称" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="费用期间" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="单位" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="面积/用量" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="单价" namespace="printOweFee"></vc:i18n>
+                </th>
+                <th scope="col" class="text-center">
+                    <vc:i18n name="金额" namespace="printOweFee"></vc:i18n>
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr v-for="(item,index) in printPayFeeInfo.fees" class="vc-table-border">
+                <td class="text-center">{{item.payerObjName}}</td>
+                <td class="text-center">{{item.feeName}}</td>
+                <td class="text-center" v-if="item.preDegrees">
+                    {{vc.dateFormat(item.endTime)}}至{{_getDeadlineTime(item)}}
+                    </br>
+                    {{item.preDegrees}} 至 {{item.curDegrees}}
+                </td>
+                <td class="text-center" v-else> {{vc.dateFormat(item.endTime)}}至{{_getDeadlineTime(item)}}
+                </td>
+                <td class="text-center">元</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 > 0">{{item.mwPrice}}</td>
+                <td class="text-center" v-else>{{item.squarePrice}}/{{item.additionalAmount}}</td>
+                <td class="text-center">{{item.feeTotalPrice}}</td>
+            </tr>
+            <tr>
+                <td colspan="1" class="text-center ">
+                    <vc:i18n name="大写人民币（元）" namespace="printOweFee"></vc:i18n>
+                </td>
+                <td colspan="4" class="text-center ">{{vc.changeNumMoneyToChinese(printPayFeeInfo.feePrices)}}
+                </td>
+                <td colspan="4" class="text-center ">{{printPayFeeInfo.feePrices}}</td>
+            </tr>
+            <tr height="60px" v-if="printPayFeeInfo.content">
+                <td colspan="3">
+                    <!-- {{printPayFeeInfo.content}} -->
+                    <div style="max-width: 600px;" v-html="printPayFeeInfo.content"></div>
+                </td>
+                <td colspan="4">
+                    <img :src="printPayFeeInfo.qrImg" width="150px" height="150px">
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <div id="print-btn">
+        <button class="btn btn-primary float-right" type="button" v-on:click="_printPurchaseApplyDiv()">
+            <i class="fa fa-check"></i>&nbsp;打印
+        </button>
+        <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+            v-on:click="_closePage()"><span>
+                <vc:i18n name="取消" namespace="printOweFee"></vc:i18n>
+            </span>
+        </button>
+    </div>
+
 </div>
\ No newline at end of file
diff --git a/public/pages/property/printOweFee/printOweFee.js b/public/pages/property/printOweFee/printOweFee.js
index 20fa7a8ea..0476b26ad 100644
--- a/public/pages/property/printOweFee/printOweFee.js
+++ b/public/pages/property/printOweFee/printOweFee.js
@@ -126,7 +126,7 @@
 
             },
             _loadOweFees: function () {
-                var param = {
+                let param = {
                     params: {
                         page: 1,
                         row: 50,