From 74a4b203a7113a2f3976600b34b6086188780b5c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 26 Aug 2022 15:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parkingAreaControlInCar.html                      |  1 -
 .../parkingAreaControlPayment.html                    | 11 ++++++-----
 .../parkingAreaControlVideo.html                      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html
index b9cb7ac4d..4dbfdcb3e 100644
--- a/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html
+++ b/public/components/property/parkingAreaControlInCar/parkingAreaControlInCar.html
@@ -44,7 +44,6 @@
                     <td class="text-center">{{carIn.inoutId}}</td>
                     <td class="text-center">{{carIn.stateName}}</td>
                     <td class="text-center">{{carIn.carNum}}</td>
-                    <td class="text-center">{{carIn.carNum}}</td>
                     <td class="text-center">{{carIn.carType == '1001'?'月租车':'临时车'}}</td>
                     <td class="text-center">{{carIn.inTime}}</td>
                     <td class="text-center">{{carIn.hours}}<span><vc:i18n name="小时" namespace="parkingAreaControlInCar"></vc:i18n></span>{{carIn.min}}<span><vc:i18n name="分" namespace="parkingAreaControlInCar"></vc:i18n></span></td>
diff --git a/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.html b/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.html
index ab83824ac..84fe27a09 100644
--- a/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.html
+++ b/public/components/property/parkingAreaControlPayment/parkingAreaControlPayment.html
@@ -1,8 +1,7 @@
 <div class="margin-top">
     <div class="row margin-top-lg">
         <div class="col-lg-3 padding-right-xs padding-left-xl">
-            <input v-model="parkingAreaControlPaymentInfo.carNum" type="text" :placeholder="vc.i18n('必填，请填写车牌号','parkingAreaControlPayment')"
-                class="form-control">
+            <input v-model="parkingAreaControlPaymentInfo.carNum" type="text" :placeholder="vc.i18n('必填，请填写车牌号','parkingAreaControlPayment')" class="form-control">
 
         </div>
         <div class="col-lg-3 padding-right-xs padding-left-xl">
@@ -22,8 +21,7 @@
 
         </div>
         <div class="col-lg-2 padding-right-xs padding-right-xl text-right">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
-                v-on:click="_qureyParkingAreaControlPayment()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyParkingAreaControlPayment()">
                 查询
             </button>
         </div>
@@ -39,6 +37,7 @@
                     <th class="text-center"><span><vc:i18n name="收费类型" namespace="parkingAreaControlPayment"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="应收金额" namespace="parkingAreaControlPayment"></vc:i18n></span></th>
                     <th class="text-center"><span><vc:i18n name="实收金额" namespace="parkingAreaControlPayment"></vc:i18n></span></th>
+                    <th class="text-center"><span><vc:i18n name="支付时间" namespace="parkingAreaControlPayment"></vc:i18n></span></th>
                 </tr>
             </thead>
             <tbody>
@@ -50,6 +49,8 @@
                     <td class="text-center">{{carIn.payTypeName}}</td>
                     <td class="text-center">{{carIn.payCharge}}</td>
                     <td class="text-center">{{carIn.realCharge}}</td>
+                    <td class="text-center">{{carIn.createTime}}</td>
+
 
                 </tr>
             </tbody>
@@ -64,4 +65,4 @@
         <!-- 分页 -->
         <vc:create path="frame/paginationPlus" namespace="parkingAreaControlPayment"></vc:create>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html
index 20f7a06dc..22e024dbb 100644
--- a/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html
+++ b/public/components/property/parkingAreaControlVideo/parkingAreaControlVideo.html
@@ -4,7 +4,7 @@
             <div class="row">
                 <div class="col-md-6">
                     <div class="form-group row">
-                        <label class="col-sm-4 col-form-label text-right"><span><vc:i18n name="入场视频" namespace="parkingAreaControlVideo"></vc:i18n></span></label>
+                        <label class="col-sm-4 col-form-label text-right"><span><vc:i18n name="入场" namespace="parkingAreaControlVideo"></vc:i18n></span></label>
                         <div class="col-sm-8 padding-0">
                             <select class="custom-select" v-model="parkingAreaControlVideoInfo.inMachineId" @change="_swatchVedio()">
                                 <option selected disabled value="">{{vc.i18n('请选择入场摄像头','parkingAreaControlVideo')}}</option>
@@ -40,7 +40,7 @@
             <div class="row">
                 <div class="col-md-6">
                     <div class="form-group row">
-                        <label class="col-sm-4 col-form-label text-right"><span><vc:i18n name="出场视频" namespace="parkingAreaControlVideo"></vc:i18n></span></label>
+                        <label class="col-sm-4 col-form-label text-right"><span><vc:i18n name="出场" namespace="parkingAreaControlVideo"></vc:i18n></span></label>
                         <div class="col-sm-8 padding-0">
                             <select class="custom-select" v-model="parkingAreaControlVideoInfo.outMachineId" @change="_swatchOutVedio()">
                                 <option selected disabled value="">{{vc.i18n('请选择出场摄像头','parkingAreaControlVideo')}}</option>