Merge branch 'dev'

@@ -65,11 +65,19 @@
             prop: "fwxzmc",
             label: "房屋性质"
           },
+           {
+            prop: "sjc",
+            label: "层号"
+          },
           {
             prop: "jzmj",
             label: "建筑面积"
           },
           {
+            prop: "fwlxmc",
+            label: "房屋类型"
+          },
+          {
             prop: "showfwyt",
             label: "房屋用途"
           },

@@ -71,8 +71,9 @@
             </el-col>
             <!-- <div class="triangle"></div> -->
           </el-row>
-        </div>
-        <cfBdcdyTable :tableData="ruleForm.qlxxList" />
+        </div>       
+        <qjhTable :tableData="ruleForm.hlist" v-if="ruleForm.slsq.djywbm.includes('100')"/>
+        <cfBdcdyTable :tableData="ruleForm.qlxxList"  v-if="ruleForm.slsq.djywbm.includes('400')"/>
         <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
           权利人信息
           <div class="triangle"></div>
@@ -157,6 +158,7 @@
 <script>
   import ywmix from "@/views/ywbl/mixin/index";
   import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
+   import qjhTable from "@/views/workflow/components/qjhTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import {
     BatchInit,
@@ -170,7 +172,7 @@
     computed: {
       ...mapGetters(["dictData", "flag"])
     },
-    components: { qlrCommonTable, cfBdcdyTable },
+    components: { qlrCommonTable, cfBdcdyTable,qjhTable},
     data () {
       return {
         isSave: true,