From 0514d3af4e86475209f95ac27499586ca2eef2b5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 11 Sep 2023 15:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A8=E6=80=81=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addFeeConfig/addFeeConfig.js      |  6 +++---
 .../simplifyFeeReceipt/simplifyFeeReceipt.html | 11 ++++++++++-
 .../simplifyFeeReceipt/simplifyFeeReceipt.js   |  5 ++++-
 .../simplifyOwnerAccessContol.html             | 18 +++++++++---------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/public/components/property/addFeeConfig/addFeeConfig.js b/public/components/property/addFeeConfig/addFeeConfig.js
index 574ebcb1c..b3b00dd34 100644
--- a/public/components/property/addFeeConfig/addFeeConfig.js
+++ b/public/components/property/addFeeConfig/addFeeConfig.js
@@ -206,9 +206,9 @@
                             errInfo: "计费单价不能为空"
                         },
                         {
-                            limit: "money",
+                            limit: "moneyModulus",
                             param: "",
-                            errInfo: "计费单价格式错误"
+                            errInfo: "计费单价格式错误，如1.5000"
                         }
                     ],
                     'addFeeConfigInfo.additionalAmount': [
@@ -218,7 +218,7 @@
                             errInfo: "附加费用不能为空"
                         },
                         {
-                            limit: "money",
+                            limit: "moneyModulus",
                             param: "",
                             errInfo: "附加费用格式错误"
                         }
diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
index aa4e626f1..73810382a 100644
--- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
+++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.html
@@ -33,9 +33,18 @@
                 </option>
             </select>
         </div>
+        <div class="col-lg-1 padding-right-xs padding-left-xl input-group-sm">
+            <input v-model="simplifyFeeReceiptInfo.receiptCode" type="text"  
+                   :placeholder="vc.i18n('收据编号','simplifyFeeReceipt')" class="form-control ">
+        </div>
+        <div class="col-lg-1 padding-right-xs padding-left-xl">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                   v-on:click="_queryFeeReceiptMethod()">查询
+            </button>
+        </div>
         <div class="col-lg-2 padding-right-xs padding-left-xl" v-if="simplifyFeeReceiptInfo.objType != '6666' ">
         </div>
-        <div class="col-lg-6 text-right padding-right-lg">
+        <div class="col-lg-4 text-right padding-right-lg">
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeReceipt()">打印
             </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_printFeeSmallReceipt()">打印小票
diff --git a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js
index a77604e79..74d1a4073 100644
--- a/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js
+++ b/public/components/property/simplifyFeeReceipt/simplifyFeeReceipt.js
@@ -13,6 +13,7 @@
                 payObjId: '',
                 roomId: '',
                 carId: '',
+                receiptCode:'',
                 total: '',
                 records: '',
                 ownerId: '',
@@ -71,12 +72,13 @@
                 } else {
                     _objId = $that.simplifyFeeReceiptInfo.contractId
                 }
-                var param = {
+                let param = {
                     params: {
                         page: _page,
                         row: _rows,
                         objType: $that.simplifyFeeReceiptInfo.objType,
                         objId: _objId,
+                        receiptCode:$that.simplifyFeeReceiptInfo.receiptCode,
                         communityId: vc.getCurrentCommunity().communityId
                     }
                 };
@@ -158,6 +160,7 @@
                     objId: '',
                     roomId: '',
                     carId: '',
+                    receiptCode:'',
                     total: '',
                     records: '',
                     ownerId: '',
diff --git a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
index 86cf2212c..96f622281 100644
--- a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
+++ b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
@@ -4,31 +4,31 @@
             <thead>
             <tr>
                 <th class="text-center">
-                    <span><vc:i18n name="设备编码" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="设备编码" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="设备名称" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="设备名称" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="对象类型" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="对象类型" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="对象名称" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="对象名称" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="指令" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="指令" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="状态" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="状态" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="说明" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="说明" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="同步时间" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="同步时间" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <span><vc:i18n name="操作" namespace="simplifyOwnerAccessContol"></vc:i18n></span>
+                    <vc:i18n name="操作" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
             </tr>
             </thead>