Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppMonitoringObject/Add.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="form" v-show="current == 0 || isEdit">
       <div class="form-group">
-        <div class="form-item">
+        <!-- <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
               <i>*</i>
@@ -15,7 +15,7 @@
               <AiSelect dict="fpHouseType" v-model="form.houseType"></AiSelect>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="form-item" v-if="!isEdit">
           <div class="form-item__wrapper">
             <div class="left">
@@ -588,7 +588,7 @@ export default {
   methods: {
     rules() {
       return {
-        houseType: '请选择户类型',
+        // houseType: '请选择户类型',
         objectType: '请选择监测对象类型',
         name: '请输入户主姓名',
         idNumber: '请输入身份证号',
@@ -630,8 +630,6 @@ export default {
         }
       }
 
-     
-
       if (!this.form.idNumber) {
         return this.$u.toast('请输入身份证号')
       }