From b37915c3d7df2f8397c6ac39addf7807e7a44d87 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 1 Sep 2022 22:35:45 +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

---
 .../parkingAreaControlCustomCarInout.html     |  6 ++-
 .../parkingAreaControlFee.html                | 46 +++++++++----------
 .../parkingAreaControlPaymentSummary.html     |  2 +-
 .../parkingAreaControlPaymentSummary.js       |  2 +-
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.html b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.html
index b8388d8e7..5bbadffcd 100644
--- a/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.html
+++ b/public/components/property/parkingAreaControlCustomCarInout/parkingAreaControlCustomCarInout.html
@@ -13,7 +13,11 @@
                                 </div>
                             </div>
                             <div class="form-group row" v-if="parkingAreaControlCustomCarInoutInfo.type != '1101'">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="收费金额" namespace="parkingAreaControlCustomCarInout"></vc:i18n></span></label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="应收金额" namespace="parkingAreaControlCustomCarInout"></vc:i18n></span></label>
+                                <div class="col-sm-10"><input v-model="parkingAreaControlCustomCarInoutInfo.payCharge" disabled type="text" :placeholder="vc.i18n('必填，请填写收费金额','parkingAreaControlCustomCarInout')" class="form-control"></div>
+                            </div>
+                            <div class="form-group row" v-if="parkingAreaControlCustomCarInoutInfo.type != '1101'">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="实收金额" namespace="parkingAreaControlCustomCarInout"></vc:i18n></span></label>
                                 <div class="col-sm-10"><input v-model="parkingAreaControlCustomCarInoutInfo.amount" type="text" :placeholder="vc.i18n('必填，请填写收费金额','parkingAreaControlCustomCarInout')" class="form-control"></div>
                             </div>
                             <div class="form-group row" v-if="parkingAreaControlCustomCarInoutInfo.type != '1101'">
diff --git a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.html b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.html
index cb369b67a..0a04d16cc 100644
--- a/public/components/property/parkingAreaControlFee/parkingAreaControlFee.html
+++ b/public/components/property/parkingAreaControlFee/parkingAreaControlFee.html
@@ -6,53 +6,53 @@
         <div>
             <h3><span><vc:i18n name="收费信息" namespace="parkingAreaControlFee"></vc:i18n></span></h3>
         </div>
-        <div class="form-group row margin-top">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="车辆" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group  margin-top margin-bottom-xs">
+            <label class="col-form-label"><span><vc:i18n name="车辆" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <input v-model="parkingAreaControlFeeInfo.carNum" disabled="disabled" type="text" :placeholder="vc.i18n('车牌号','parkingAreaControlFee')" class="form-control">
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="停车时间" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class=" col-form-label"><span><vc:i18n name="停车时间" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <input v-model="parkingAreaControlFeeInfo.inOutTime" disabled="disabled" type="text" :placeholder="vc.i18n('停车时间','parkingAreaControlFee')" class="form-control">
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="开门" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class=" col-form-label"><span><vc:i18n name="开门" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <input v-model="parkingAreaControlFeeInfo.open" disabled="disabled" type="text" :placeholder="vc.i18n('开门状态','parkingAreaControlFee')" class="form-control">
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="开门说明" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class="col-form-label"><span><vc:i18n name="开门说明" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <textarea v-model="parkingAreaControlFeeInfo.openMsg" disabled="disabled" :placeholder="vc.i18n('开门说明','parkingAreaControlFee')" class="form-control"></textarea>
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="应收" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class=" col-form-label"><span><vc:i18n name="应收" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <input v-model="parkingAreaControlFeeInfo.payCharge" type="text" disabled="disabled" :placeholder="vc.i18n('应收','parkingAreaControlFee')" class="form-control">
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="实收" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class=" col-form-label"><span><vc:i18n name="实收" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <input v-model="parkingAreaControlFeeInfo.pay" type="text" :placeholder="vc.i18n('实收','parkingAreaControlFee')" class="form-control">
             </div>
         </div>
-        <div class="form-group row">
-            <label class="col-sm-2 col-form-label"><span><vc:i18n name="备注" namespace="parkingAreaControlFee"></vc:i18n></span></label>
-            <div class="col-sm-8">
+        <div class="form-group margin-bottom-xs">
+            <label class=" col-form-label"><span><vc:i18n name="备注" namespace="parkingAreaControlFee"></vc:i18n></span></label>
+            <div class="">
                 <textarea v-model="parkingAreaControlFeeInfo.remark" :placeholder="vc.i18n('备注','parkingAreaControlFee')" class="form-control"></textarea>
             </div>
         </div>
-        <div class="form-group text-center">
+        <div class="form-group text-center margin-top">
             <button class="btn btn-primary" type="button" :disabled="parkingAreaControlFeeInfo.pay==0" v-on:click="saveTempFeeInfo()"><span><vc:i18n name="临时车收费" namespace="parkingAreaControlFee"></vc:i18n></span></button>
         </div>
         <!--收费二维码-->
-        <div class="form-group text-center " style="margin-top: 50px;">
+        <div class="form-group text-center " style="margin-top: 20px;">
             <div id="qrcode" style="width:200px; height:200px;margin:0 auto "></div>
             <div class="margin-top"><span><vc:i18n name="场内收费二维码" namespace="parkingAreaControlFee"></vc:i18n></span></div>
         </div>
diff --git a/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.html b/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.html
index 317ae4b64..642fa20b6 100644
--- a/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.html
+++ b/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.html
@@ -7,7 +7,7 @@
             <input v-model="parkingAreaControlPaymentSummaryInfo.endTime" type="text" :placeholder="vc.i18n('请填写开始时间','parkingAreaControlPaymentSummary')" class="form-control paymentSummaryEndTime">
         </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="_qureyParkingAreaControlPaymentSummary()">
                 查询
             </button>
         </div>
diff --git a/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.js b/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.js
index 112cbcae2..ceb8258e7 100644
--- a/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.js
+++ b/public/components/property/parkingAreaControlPaymentSummary/parkingAreaControlPaymentSummary.js
@@ -54,7 +54,7 @@
                     }
                 );
             },
-            _qureyParkingAreaControlPayment: function() {
+            _qureyParkingAreaControlPaymentSummary: function() {
                 $that._loadParkingAreaControlPaymentSummary(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _initPaymentSummaryChart: function(_data) {