From 5749cda8cf3a1f8c7d531ca556977ea4d629dd2a Mon Sep 17 00:00:00 2001
From: 92895 <928953915>
Date: Mon, 7 Dec 2020 16:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=89=93=E7=A5=A8=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/printPayFees/printPayFees.html | 15 ++++++++++++---
 .../pages/property/printPayFees/printPayFees.js   | 11 +++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/public/pages/property/printPayFees/printPayFees.html b/public/pages/property/printPayFees/printPayFees.html
index 9850d0109..28be14c53 100644
--- a/public/pages/property/printPayFees/printPayFees.html
+++ b/public/pages/property/printPayFees/printPayFees.html
@@ -11,6 +11,11 @@
                 <div class="col-sm-2">
                     <span>房号:{{printPayFeeInfo.roomName}}</span>
                 </div>
+                <!-- <div  v-if="printPayFeeInfo.type== 3 && printPayFeeInfo.carNum!=null  && printPayFeeInfo.carNum!='' " class="col-sm-2">
+                    <span>车牌号码:{{printPayFeeInfo.carNum}}</span>
+                </div>
+                <div  v-if="printPayFeeInfo.type != 3 || printPayFeeInfo.carNum==null | printPayFeeInfo.carNum=='' " class="col-sm-2">
+                </div> -->
                 <div class="col-sm-2">
                 </div>
                 <div class="col-sm-2">
@@ -54,8 +59,9 @@
                         <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}}{{item.carNum}}</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> -->
@@ -65,7 +71,10 @@
                         <!-- <td colspan="1" class="text-center ">合计（小写）</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>
+                        <!-- <td colspan="4" class="text-center "></td> -->
+
+                        <td v-if="printPayFeeInfo.type== 3 && printPayFeeInfo.carNum!=null  && printPayFeeInfo.carNum!=''" colspan="4" class="text-center ">车牌号：{{printPayFeeInfo.carNum}}</td>
+                        <td v-if="printPayFeeInfo.type != 3 || printPayFeeInfo.carNum==null | printPayFeeInfo.carNum=='' "  colspan="4" class="text-center "></td>
 
                     </tr>
                     <!-- <tr height="60px">
diff --git a/public/pages/property/printPayFees/printPayFees.js b/public/pages/property/printPayFees/printPayFees.js
index 045311a46..4a3678594 100644
--- a/public/pages/property/printPayFees/printPayFees.js
+++ b/public/pages/property/printPayFees/printPayFees.js
@@ -15,7 +15,8 @@
                 feeTime: '',
                 wechatName:'',
                 content:'',
-                qrImg:''
+                qrImg:'',
+                carNum:''
             },
             printFlag: '0'
         },
@@ -29,9 +30,10 @@
             $that.printPayFeeInfo.qstartTime = vc.getParam('qstartTime');
             $that.printPayFeeInfo.qendTime = vc.getParam('qendTime');
             //$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
-
             $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;
 
+           
+
             $that._loadReceipt();
 
             $that._loadPrintSpec();
@@ -78,6 +80,11 @@
 
                         for(var i =0 ; i<_feeReceiptManageInfo.data.length; i++){
                             $that.printPayFeeInfo.amount += parseFloat(_feeReceiptManageInfo.data[i].amount)*1000000000000;
+                            if(vc.getParam('type')==3){
+                                if( _feeReceiptManageInfo.data[i].carNum != null && _feeReceiptManageInfo.data[i].carNum != '' ){
+                                    $that.printPayFeeInfo.carNum += _feeReceiptManageInfo.data[i].carNum+" ";
+                                }
+                            }
                         }
                         $that.printPayFeeInfo.amount = $that.printPayFeeInfo.amount/1000000000000;
                         $that.printPayFeeInfo.fees  = _feeReceiptManageInfo.data;