Merge branch 'dev'

@@ -53,11 +53,9 @@
     },
     watch: {
       isShow (newValue) {
+        this.$nextTick(() => {
           this.editItem = this.loadViewFn(this.editItem)
           document.body.appendChild(this.$el);
-        this.$nextTick(() => {
-          // this.editItem = this.loadViewFn(this.editItem)
-          // document.body.appendChild(this.$el);
           this.myShow = newValue
         })
       }

@@ -8,6 +8,7 @@
         margin: 0 auto;
         display: flex;
         flex-wrap: wrap;
+        height: 100%;
 
         .title {
             width: 100%;
@@ -259,7 +260,8 @@
         .rollTable {
             margin-top: -2px;
             display: block;
-            height: calc(100vh - 185px);
+            height: 100%;
+            // height: calc(100vh - 185px);
             overflow-y: scroll;
             margin-left: 2px;
         }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 13:39:51
+ * @LastEditTime: 2023-10-13 14:30:26
 -->
 <template>
   <div class="content">
@@ -14,8 +14,7 @@
         :default-expand-all="true"
         :expand-on-click-node="false"
         node-key="id"
-        :default-checked-keys="[showTab]"
-      >
+        :default-checked-keys="[showTab]">
       </el-tree>
       <el-collapse v-model="activeName" accordion>
         <el-collapse-item
@@ -23,8 +22,7 @@
           ref="sfq"
           v-for="(item, index) in sfqdata"
           :key="index"
-          :name="index"
-        >
+          :name="index">
           <template slot="title">
             <span class="text" @click="tap(item, index)">
               <span> {{ item.label }}</span>
@@ -35,8 +33,7 @@
             :re="item"
             :key="index"
             :class="[isActive == index ? activeCls : '', errorCls]"
-            @click="taplist(item, index)"
-          >
+            @click="taplist(item, index)">
             <span>
               {{ item.label }}
             </span>
@@ -51,16 +48,15 @@
       <component
         :is="componentTag"
         @getBdcdyh="getBdcdyh"
-        v-bind="currentSelectProps"
-      />
+        v-bind="currentSelectProps" />
     </div>
   </div>
 </template>
 <script>
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
-import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
-export default {
-  data() {
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
+  export default {
+    data () {
       return {
         activeName: 0,
         //接收参数
@@ -89,7 +85,7 @@ export default {
       };
     },
     props: ["formData"],
-  mounted() {
+    mounted () {
       this.loadData(this.formData.bdcdyh);
     },
     methods: {
@@ -98,14 +94,14 @@ export default {
        * @author: miaofang
        * 点击不动产单元号事件
        */
-    getBdcdyh(val) {
+      getBdcdyh (val) {
         this.addloadData(val);
       },
       /**
        * @description: addloadData
        * @author: miaofang
        */
-    addloadData(val) {
+      addloadData (val) {
         getBdcqljqtsx({
           bdcdyid: val.bdcdyid,
           bdcdyh: val.bdcdyh,
@@ -121,7 +117,7 @@ export default {
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
-            this.isActive=""
+              this.isActive = ""
               // this.$nextTick(() => {
               //   this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
               // })
@@ -139,7 +135,7 @@ export default {
        * @description: loadData
        * @author: renchao
        */
-    loadData(val) {
+      loadData (val) {
         getBdcqljqtsx({
           bdcdyid: this.formData.bdcdyid,
           bdcdyh: val,
@@ -177,7 +173,7 @@ export default {
        * @param {*} data
        * @author: renchao
        */
-    handleNodeClick(data) {
+      handleNodeClick (data) {
         this.loadComponent(data.form);
       },
       // setstyle(newindex, index, key) {
@@ -205,10 +201,10 @@ export default {
        * @author: renchao
        * 新增列表功能
        */
-    tap(data, index) {
+      tap (data, index) {
         this.loadComponent(data.form);
       },
-    taplist(data, index) {
+      taplist (data, index) {
         this.loadComponent(data.form);
         this.isActive = index;
       },
@@ -217,19 +213,19 @@ export default {
        * @param {*} form
        * @author: renchao
        */
-    loadComponent(form) {
+      loadComponent (form) {
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-/deep/.rollTable {
-  height: calc(100vh - 300px) !important;
-}
+  // /deep/.rollTable {
+  //   height: calc(100vh - 300px) !important;
+  // }
 
-.content {
+  .content {
     width: 100%;
     height: 100%;
     display: flex;
@@ -251,35 +247,35 @@ export default {
       background-color: #f5f5f5;
       border: 1px solid rgb(228, 228, 228);
     }
-}
+  }
 
-/deep/ .expanded.el-tree-node__expand-icon,
-/deep/ .el-tree-node__expand-icon {
+  /deep/ .expanded.el-tree-node__expand-icon,
+  /deep/ .el-tree-node__expand-icon {
     visibility: hidden;
-}
+  }
 
-/deep/ .el-tree-node__content {
+  /deep/ .el-tree-node__content {
     border: 1px solid rgb(228, 228, 228);
     height: 45px;
-}
+  }
 
-/deep/ .el-tree-node:focus > .el-tree-node__content {
+  /deep/ .el-tree-node:focus > .el-tree-node__content {
     // background-color: #f5f5f5;
     // color: #0079fe;
     // border-right: 4px solid #0079fe;
-}
+  }
 
-/deep/.el-tree-node {
+  /deep/.el-tree-node {
     white-space: pre-wrap;
-}
+  }
 
-/deep/ .is-current > .el-tree-node__content {
+  /deep/ .is-current > .el-tree-node__content {
     // background-color: #f5f5f5;
     // color: #0079fe;
     // border-right: 4px solid #0079fe;
-}
+  }
 
-/deep/.el-collapse-item__header {
+  /deep/.el-collapse-item__header {
     width: 100%;
     cursor: pointer;
     position: relative;
@@ -304,11 +300,11 @@ export default {
     display: inline-block;
     line-height: 45px;
     border: 1px solid rgb(228, 228, 228);
-}
-/deep/.el-collapse-item__content {
+  }
+  /deep/.el-collapse-item__content {
     padding-bottom: 5px;
-}
-/deep/.unselected {
+  }
+  /deep/.unselected {
     // white-space: wrap;
     border: none;
     cursor: pointer;
@@ -325,9 +321,9 @@ export default {
       justify-content: center;
       align-items: center;
     }
-}
+  }
 
-.select {
+  .select {
     border: none;
     cursor: pointer;
     width: 250px;
@@ -344,5 +340,5 @@ export default {
       justify-content: center;
       align-items: center;
     }
-}
+  }
 </style>

@@ -8,6 +8,7 @@
         margin: 0 auto;
         display: flex;
         flex-wrap: wrap;
+        height: 100%;
 
         .title {
             width: 100%;
@@ -258,7 +259,8 @@
         .rollTable {
             margin-top: -2px;
             display: block;
-            height: calc(100vh - 185px);
+            height: calc(100% - 60px);
+            // height: calc(100vh - 185px);
             overflow-y: scroll;
             margin-left: 2px;
         }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 10:37:29
+ * @LastEditTime: 2023-10-13 13:38:21
 -->
 <template>
   <div>
@@ -196,7 +196,7 @@
         qlxxCol: datas.qlxxCol(),
       };
     },
-    mounted () {
+    created () {
       sendThis(this)
       this.init()
     },