Merge branch 'dev-220411' into test

src/views/components/editResi.vue

@@ -75,6 +75,7 @@
                     <el-form-item prop="HOME_ID">
                       <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
                       clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle"
+                      @change="handleChangeH"
                       >
                         <el-option
                           v-for="item in optionsH"
@@ -611,6 +612,14 @@ export default {
       this.form.HOME_ID = ''
       this.getHouseList()
     },
+    // 为了实现根据房屋类型改版是否租户的需求
+    handleChangeH(val){
+      let item = this.optionsH.find(item => item.value === val);
+      if(item && item.type == '1'){
+        this.form.IS_TENANT = '1'
+        console.log('item-----', item)
+      } else this.form.IS_TENANT = '0'
+    },
     handlerMuscForm () {
       let arr = []
       this.addList.forEach(item => {

src/views/components/resiForm.vue

@@ -554,10 +554,11 @@ export default {
     },
     // 为了实现根据房屋类型改版是否租户的需求
     handleChangeH(val){
-      let item = this.optionsH.find(item => item.value===val);
-      if(item){
-        // this.form.IS_TENANT = '1';
-      }
+      let item = this.optionsH.find(item => item.value === val);
+      if(item && item.type == '1'){
+        this.form.IS_TENANT = '1'
+        console.log('item-----', item)
+      } else this.form.IS_TENANT = '0'
     },
     // 监听基础form
     handleChangeForm (val) {