From 2ef8953aeecc4e092d47a5cb42c047529b72d8bb Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 7 Dec 2022 12:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=94=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/printOweFee/printOweFee.html |  6 +++---
 public/pages/property/printOweFee/printOweFee.js   | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html
index 9d6c48afa..47e1224b5 100755
--- a/public/pages/property/printOweFee/printOweFee.html
+++ b/public/pages/property/printOweFee/printOweFee.html
@@ -33,12 +33,12 @@
                         <td class="text-center" v-if="item.preDegrees">
                             {{vc.dateFormat(item.endTime)}}<span>
                                 <vc:i18n name="至" namespace="printOweFee"></vc:i18n></span>
-                                {{vc.dateFormat(item.deadlineTime)}}</br>
+                                {{_getDeadlineTime(item)}}</br>
                             {{item.preDegrees}} 至 {{item.curDegrees}}
                         </td>
-                        <td class="text-center" v-else>{{vc.dateFormat(item.endTime)}}<span>
+                        <td class="text-center" v-else> {{vc.dateFormat(item.endTime)}}<span>
                             <vc:i18n name="至" namespace="printOweFee"></vc:i18n></span>
-                            {{vc.dateFormat(item.deadlineTime)}}
+                            {{_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>
diff --git a/public/pages/property/printOweFee/printOweFee.js b/public/pages/property/printOweFee/printOweFee.js
index 2b685ada5..6c9e34909 100755
--- a/public/pages/property/printOweFee/printOweFee.js
+++ b/public/pages/property/printOweFee/printOweFee.js
@@ -154,6 +154,16 @@
                     }
                 );
             },
+            _getDeadlineTime: function (_fee) {
+                if (_fee.amountOwed == 0 && _fee.endTime == _fee.deadlineTime) {
+                    return "-";
+                }
+                if (_fee.state == '2009001') {
+                    return "-";
+                }
+                //return vc.dateSub(_fee.deadlineTime, _fee.feeFlag);
+                return vc.dateSubOneDay(_fee.startTime, _fee.deadlineTime, _fee.feeFlag);
+            },
         }
     });