From 03c8ab8c0d0b74a63ca325c0b120260338df9ddb Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: Wed, 25 Nov 2020 15:27:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E6=89=93=E7=A5=A8=E6=8D=AE?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E4=BB=B7=E5=B0=8F=E6=95=B0=E7=82=B9=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/printPayFees/printPayFees.html   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/pages/property/printPayFees/printPayFees.html b/public/pages/property/printPayFees/printPayFees.html
index 1b6708d62..fbcd0488c 100644
--- a/public/pages/property/printPayFees/printPayFees.html
+++ b/public/pages/property/printPayFees/printPayFees.html
@@ -28,7 +28,8 @@
                 <thead>
                     <tr>
                         <th scope="col" class="text-center">收费项目</th>
-                        <th v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 " scope="col" class="text-center">车牌号码</th>
+                        <!-- <th v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 " scope="col" class="text-center">车牌号码</th> -->
+                        <th v-if=" printPayFeeInfo.type==4 " scope="col" class="text-center">车牌号码</th>
                         <th scope="col" class="text-center">数量</th>
                         <th scope="col" class="text-center">单价</th>
                         <th colspan="2" scope="col" class="text-center">计费起止时间</th>
@@ -40,7 +41,8 @@
                     <tr v-for="(item,index) in printPayFeeInfo.fees" class="vc-table-border">
                         <!-- <th scope="row" class="text-center">{{index +1}}</th> -->
                         <td class="text-center">{{item.feeName}}</td>
-                        <td v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 " scope="col" class="text-center">{{item.carNum}}</td>
+                        <!-- <td v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 " scope="col" class="text-center">{{item.carNum}}</td> -->
+                        <td v-if=" printPayFeeInfo.type==4 " scope="col" class="text-center">{{item.carNum}}</td>
                         <td v-if= "printPayFeeInfo.type== 5 " class="text-center">{{item.cycle}}</td>
                         <td v-if= "item.feeName != '水费' && item.feeName != '电费' && printPayFeeInfo.type != 5" class="text-center">{{item.num}}</td>
                         <td v-if= "item.feeName == '水费' || item.feeName == '电费'" class="text-center"></td> 
@@ -52,7 +54,8 @@
                         <td v-if="printPayFeeInfo.type == 5" class="text-center">{{item.startTime!=null?vc.dateFormat(item.startTime):''}}</td>
                         <td v-if="printPayFeeInfo.type == 5" class="text-center">{{item.endTime!=null?vc.dateFormat(item.endTime):''}}</td>
                         <td class="text-center">{{item.amount}}</td>
-                        <td class="text-center">{{item.remark}}</td>
+                        <td v-if="printPayFeeInfo.type!== 3"  class="text-center">{{item.remark}}</td>
+                        <td v-if="printPayFeeInfo.type== 3" class="text-center">{{item.remark}}{{item.carNum}}</td>
                     </tr>
                     <tr >
                         <!-- <td colspan="1" class="text-center ">大写人民币（元）</td> -->
@@ -60,8 +63,8 @@
                         </td>
                         <!-- <td v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 "  colspan="1" class="text-center "></td> -->
                         <!-- <td colspan="1" class="text-center ">合计（小写）</td> -->
-                        <td v-if="printPayFeeInfo.type== 3 || printPayFeeInfo.type==4 " colspan="4" class="text-center ">合计（小写）: {{printPayFeeInfo.amount}}</td>
-                        <td v-if="printPayFeeInfo.type!= 3 && printPayFeeInfo.type!=4 " colspan="3" class="text-center ">合计（小写）: {{printPayFeeInfo.amount}}</td>
+                        <td v-if=" printPayFeeInfo.type==4 " colspan="4" class="text-center ">合计（小写）: {{printPayFeeInfo.amount}}</td>
+                        <td v-if=" printPayFeeInfo.type!=4 " colspan="3" class="text-center ">合计（小写）: {{printPayFeeInfo.amount}}</td>
                         <td colspan="4" class="text-center "></td>
 
                     </tr>

From 4f3b3bb38c2a5416ba5cc2b681e09da667e5f9c4 Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: Wed, 25 Nov 2020 15:36:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E6=89=93=E7=A5=A8=E6=8D=AE?=
 =?UTF-8?q?=E3=80=81=E5=8D=95=E4=BB=B7=E5=B0=8F=E6=95=B0=E7=82=B9=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/printPayFees/printPayFees.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/pages/property/printPayFees/printPayFees.html b/public/pages/property/printPayFees/printPayFees.html
index fbcd0488c..841f4893f 100644
--- a/public/pages/property/printPayFees/printPayFees.html
+++ b/public/pages/property/printPayFees/printPayFees.html
@@ -54,7 +54,7 @@
                         <td v-if="printPayFeeInfo.type == 5" class="text-center">{{item.startTime!=null?vc.dateFormat(item.startTime):''}}</td>
                         <td v-if="printPayFeeInfo.type == 5" class="text-center">{{item.endTime!=null?vc.dateFormat(item.endTime):''}}</td>
                         <td class="text-center">{{item.amount}}</td>
-                        <td v-if="printPayFeeInfo.type!== 3"  class="text-center">{{item.remark}}</td>
+                        <td v-if="printPayFeeInfo.type!= 3"  class="text-center">{{item.remark}}</td>
                         <td v-if="printPayFeeInfo.type== 3" class="text-center">{{item.remark}}{{item.carNum}}</td>
                     </tr>
                     <tr >