Merge branch 'dev'

@@ -81,7 +81,18 @@ export function getBdcqljqtsx (data) {
     params: data
   })
 }
-
+/**
+ * @description: 获取不动产权利及其他事项Bdcdyh
+ * @param {*} data
+ * @author: renchao
+ */
+ export function getBdcqljqtsxBdcdyh (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getBdcqljqtsxBdcdyh',
+    method: 'get',
+    params: data
+  })
+}
 /**
  * @description: 获取土地所有权
  * @param {*} data

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-10-30 09:01:21
+ * @LastEditTime: 2023-11-10 10:34:55
  */
 import { mapGetters } from 'vuex'
 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
@@ -29,7 +29,6 @@ export default {
      */
     handkeyCode (e) {
       if (e.keyCode === 13) {
-        console.log("安");
         this.handleSearch()
       }
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-09 08:45:33
+ * @LastEditTime: 2023-11-10 10:33:47
 -->
 <template>
   <div class="content">
@@ -123,7 +123,7 @@
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
-              this.isActive = ""
+
               this.titleActive = this.activeName
             }
 
@@ -135,6 +135,7 @@
               );
               this.sfqdata[0].children.forEach((item, index) => {
                 if (item.id == this.defaultNode.id) {
+                  this.isActive = index
                   this.loadComponent(item.form);
                 }
               });

+
 /*
  * @Description:
  * @Autor: renchao

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:48:40
+ * @LastEditTime: 2023-11-10 10:36:22
 -->
 <template>
   <div class="content loadingtext">
@@ -55,7 +55,7 @@
   </div>
 </template>
 <script>
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { getBdcqljqtsx, getBdcqljqtsxBdcdyh } from "@/api/djbDetail.js";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
   import { searchTaskToDo } from "@/api/workflow/search.js";
   import { leftMenu } from "@/api/workFlow.js";
@@ -92,7 +92,7 @@
       };
     },
     mounted () {
-      this.getdata();
+      this.loadData(this.getCaption(window.location.href));
     },
     methods: {
       // 截取字符的方法
@@ -111,30 +111,30 @@
        * @description: 通过不动产业务号获取参数
        * @author: renchao
        */
-      getdata () {
-        this.queryForm = {
-          bdcdyh: this.getCaption(window.location.href),
-          currentPage: 1,
-          djlx: "",
-          pageSize: 10,
-          qllx: "",
-          ywh: "",
-          ywly: "",
-        };
-        if (this.queryForm) {
-          this.$startLoading();
-          searchTaskToDo({
-            ...this.queryForm,
-          }).then((res) => {
-            if (res.code === 200) {
-              let { records } = res.result;
+      // getdata () {
+      //   this.queryForm = {
+      //     bdcdyh: this.getCaption(window.location.href),
+      //     currentPage: 1,
+      //     djlx: "",
+      //     pageSize: 10,
+      //     qllx: "",
+      //     ywh: "",
+      //     ywly: "",
+      //   };
+      //   if (this.queryForm) {
+      //     this.$startLoading();
+      //     searchTaskToDo({
+      //       ...this.queryForm,
+      //     }).then((res) => {
+      //       if (res.code === 200) {
+      //         let { records } = res.result;
 
-              this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
-              this.$endLoading();
-            }
-          });
-        }
-      },
+      //         this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
+      //         this.$endLoading();
+      //       }
+      //     });
+      //   }
+      // },
 
       // 获取不动产信息
       /**
@@ -143,19 +143,19 @@
        * @param {*} b
        * @author: renchao
        */
-      loadBdcdylist (a, b) {
-        var formdata = new FormData();
-        formdata.append("bsmSlsq", a);
-        formdata.append("bestepid", b);
-        leftMenu(formdata).then((res) => {
-          if (res.code === 200) {
-            if (res.result) {
-              this.currentSelectProps = res.result[0];
-              this.loadData(this.currentSelectProps.bdcdyh);
-            }
-          }
-        });
-      },
+      // loadBdcdylist (a, b) {
+      //   var formdata = new FormData();
+      //   formdata.append("bsmSlsq", a);
+      //   formdata.append("bestepid", b);
+      //   leftMenu(formdata).then((res) => {
+      //     if (res.code === 200) {
+      //       if (res.result) {
+      //         this.currentSelectProps = res.result[0];
+      //         this.loadData(this.currentSelectProps.bdcdyh);
+      //       }
+      //     }
+      //   });
+      // },
 
       /**
        * @description: getBdcdyh
@@ -179,7 +179,7 @@
               let index = this.sfqdata.findIndex((item) => {
                 return item.bdcdyid == val.bdcdyid;
               });
-              this.activeName = index
+              this.activeName = index;
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
@@ -198,18 +198,15 @@
        * @author: renchao
        */
       loadData (val) {
-        getBdcqljqtsx({
-          bdcdyid: this.currentSelectProps.bdcdyid,
+        getBdcqljqtsxBdcdyh({
           bdcdyh: val,
         }).then((res) => {
           if (res.code === 200) {
             this.treedata = loadTreeData(val);
-            this.sfqdata.push(
-              loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
-            );
+            this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid));
             this.$nextTick(function () {
               this.defaultNode = getNode(
-                this.currentSelectProps.qllx,
+                res.result.ztqllx,
                 { linShi: 0, xianShi: 0, liShi: 0 },
                 res.result.bdcdylx || ""
               );
@@ -218,32 +215,17 @@
                   this.loadComponent(item.form);
                   this.isActive = index;
                 }
-              })
-              // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
-              // this.loadComponent(this.defaultNode.form);
-
-              // this.setstyle(0, 0, this.iskey);
-
-              // this.setstyle(0, 0, this.iskey);
-            });
-          }
               });
               this.currentSelectProps = {
-          bdcdyid: this.currentSelectProps.bdcdyid,
-          bdcdyh: this.currentSelectProps.bdcdyh,
-          qllx: this.currentSelectProps.qllx,
+                bdcdyid: res.result.bdcdyid,
+                bdcdyh: val,
+                qllx: res.result.qllx,
                 bsmQlxx: this.currentSelectProps.bsmQlxx,
               };
+            })
+          }
+        })
       },
-      /*
-          点击登记簿菜单
-         */
-      handleNodeClick (data) {
-        this.loadComponent(data.form);
-      },
-    /*
-        点击登记簿菜单
-       */
       /**
        * @description: 点击登记簿菜单
        * @param {*} data
@@ -275,7 +257,7 @@
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
       }
     }
-  };
+  }
 </script>
 <style scoped lang="scss">
   /deep/.rollTable {
@@ -315,8 +297,6 @@
     height: 45px;
   }
 
-
-
   /deep/.el-tree-node {
     white-space: pre-wrap;
   }
@@ -341,6 +321,9 @@
         display: inline-block;
         line-height: 15px;
       }
+      height: 45px;
+      border: 1px solid rgb(228, 228, 228);
+      border-right: 4px solid #f5f5f5;
     }
     height: 45px;
     display: inline-block;
@@ -367,9 +350,6 @@
       justify-content: center;
       align-items: center;
     }
-    height: 45px;
-    border: 1px solid rgb(228, 228, 228);
-    border-right: 4px solid #f5f5f5;
   }
 
   .select {

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:49:37
+ * @LastEditTime: 2023-11-10 10:28:56
 -->
 <template>
   <div class="djxxTable">
@@ -32,7 +32,7 @@
         render: false
       };
     },
-    created () {
+    mounted () {
       this.loadData();
     },
     methods: {