From e3339972ed8b7103b6ef5294e6078577ccd99e7a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 25 Apr 2022 19:02:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=A5=BC=E5=B1=82=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=20=E5=AD=97=E6=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/property/addRoomView/addRoomView.js | 14 ++++----------
 .../property/deleteFloor/deleteFloor.html          | 12 +++++++-----
 public/components/property/editRoom/editRoom.html  |  4 ++--
 public/components/property/editRoom/editRoom.js    | 14 ++++----------
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/public/components/property/addRoomView/addRoomView.js b/public/components/property/addRoomView/addRoomView.js
index 9693cf9f9..4b559bb5b 100755
--- a/public/components/property/addRoomView/addRoomView.js
+++ b/public/components/property/addRoomView/addRoomView.js
@@ -66,16 +66,10 @@
                         },
                     ],
                     'addRoomViewInfo.layer': [{
-                            limit: "required",
-                            param: "",
-                            errInfo: "房屋楼层不能为空"
-                        },
-                        {
-                            limit: "num",
-                            param: "",
-                            errInfo: "房屋楼层高度必须为数字"
-                        },
-                    ],
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋楼层不能为空"
+                    }],
                     'addRoomViewInfo.apartment': [{
                             limit: "required",
                             param: "",
diff --git a/public/components/property/deleteFloor/deleteFloor.html b/public/components/property/deleteFloor/deleteFloor.html
index 909bf0226..1d154ff7d 100755
--- a/public/components/property/deleteFloor/deleteFloor.html
+++ b/public/components/property/deleteFloor/deleteFloor.html
@@ -2,18 +2,20 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel"><vc:i18n name="请确认您的操作" namespace="deleteFloor"></vc:i18n>!</h5>
+                <h5 class="modal-title" id="exampleModalLabel"><span><vc:i18n name="请确认您的操作" namespace="deleteFloor"></vc:i18n></span>!</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <tr align="center"><th><vc:i18n name="确认是否删除" namespace="deleteFloor"></vc:i18n>!</th></tr>
+                <tr align="center">
+                    <th><span><vc:i18n name="确认是否删除" namespace="deleteFloor"></vc:i18n></span>!</th>
+                </tr>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal" ><vc:i18n name="点错了" namespace="deleteFloor"></vc:i18n></button>
-                <button type="button" class="btn btn-primary" v-on:click="deleteFloor()"><vc:i18n name="确认删除" namespace="deleteFloor"></vc:i18n></button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal"><span><vc:i18n name="点错了" namespace="deleteFloor"></vc:i18n></span></button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteFloor()"><span><vc:i18n name="确认删除" namespace="deleteFloor"></vc:i18n></span></button>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html
index 24381b443..df0be504d 100755
--- a/public/components/property/editRoom/editRoom.html
+++ b/public/components/property/editRoom/editRoom.html
@@ -19,7 +19,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><vc:i18n name="房屋楼层" namespace="editRoom"></vc:i18n></label>
-                                <div class="col-sm-10"><input v-model="editRoomInfo.layer" type="number" :placeholder="vc.i18n('必填，请填写房屋楼层','editRoom')" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editRoomInfo.layer" type="text" :placeholder="vc.i18n('必填，请填写房屋楼层','editRoom')" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><vc:i18n name="房屋单元" namespace="editRoom"></vc:i18n></label>
@@ -148,4 +148,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/components/property/editRoom/editRoom.js b/public/components/property/editRoom/editRoom.js
index bd541e84c..ec9510103 100755
--- a/public/components/property/editRoom/editRoom.js
+++ b/public/components/property/editRoom/editRoom.js
@@ -145,16 +145,10 @@
                         },
                     ],
                     'editRoomInfo.layer': [{
-                            limit: "required",
-                            param: "",
-                            errInfo: "房屋楼层高度不能为空"
-                        },
-                        {
-                            limit: "num",
-                            param: "",
-                            errInfo: "房屋楼层高度必须为数字"
-                        }
-                    ],
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋楼层高度不能为空"
+                    }],
                     'editRoomInfo.state': [{
                         limit: "required",
                         param: "",