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) {

src/views/pages/caijisuccess.vue

@@ -76,37 +76,37 @@ export default {
     let query = this.$route.query
     this.formData = query.formData
 
-    this.formData = {
-      shequName: '清江路社区',
-      address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123",
-      buildId: "1494482424728395778",
-      buildName: "花好月圆",
-      customerId: "45687aa479955f9d06204d415238f7cc",
-      homeId: "other",
-      homeName: "3123123",
-      houseHolderName: "张三",
-      houseType: "1",
-      memberList: [
-        {
-          customerId: "45687aa479955f9d06204d415238f7cc",
-          domicilePlace: "23123",
-          heSuanCount: "2",
-          idNum: "312312",
-          mobile: "15111111111",
-          name: "张三",
-        },
-        {
-          customerId: "45687aa479955f9d06204d415238f7cc",
-          domicilePlace: "123123",
-          heSuanCount: null,
-          idNum: "王二麻",
-          mobile: "3123123123",
-          name: "李四",
-        }
-      ]
-
-    }
-    console.log(this.formData)
+    // this.formData = {
+    //   shequName: '清江路社区',
+    //   address: "金玉良缘1花好月圆1单元3123123金玉良缘1花好月圆1单元3123123",
+    //   buildId: "1494482424728395778",
+    //   buildName: "花好月圆",
+    //   customerId: "45687aa479955f9d06204d415238f7cc",
+    //   homeId: "other",
+    //   homeName: "3123123",
+    //   houseHolderName: "张三",
+    //   houseType: "1",
+    //   memberList: [
+    //     {
+    //       customerId: "45687aa479955f9d06204d415238f7cc",
+    //       domicilePlace: "23123",
+    //       heSuanCount: "2",
+    //       idNum: "312312",
+    //       mobile: "15111111111",
+    //       name: "张三",
+    //     },
+    //     {
+    //       customerId: "45687aa479955f9d06204d415238f7cc",
+    //       domicilePlace: "123123",
+    //       heSuanCount: null,
+    //       idNum: "王二麻",
+    //       mobile: "3123123123",
+    //       name: "李四",
+    //     }
+    //   ]
+
+    // }
+    // console.log(this.formData)
 
   },