Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -116,11 +116,12 @@ export default {
               return item.bdcdyid == val.bdcdyid;
             });
             this.activeName = index;
-
+            
             // this.setstyle(index, 0, this.iskey);
           } else {
             this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
             this.activeName = this.sfqdata.length - 1;
+            this.isActive=""
             // this.$nextTick(() => {
             //   this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
             // })
@@ -217,7 +218,6 @@ export default {
      * @author: renchao
      */
     loadComponent(form) {
-      console.log(form, "form");
       this.componentTag = (r) =>
         require.ensure([], () => r(require("@/views/registerBook/" + form)));
     },

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-09-18 13:39:51
+-->
+<template>
+  <div class="content">
+    自然幢列表（待开发）
+  </div>
+</template>
+<script>
+import { getBdcqljqtsx } from "@/api/djbDetail.js";
+import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
+export default {
+  data() {
+    return {
+    }
+  },
+
+  mounted() {
+
+  },
+  methods: {
+
+  },
+};
+</script>
+<style scoped lang="scss">
+
+</style>

@@ -371,7 +371,18 @@
         this.$popup("登记簿详情", "registerBook/djbFrame", {
           formData: param
         })
-      }
+      },
+    dzlist (row) {
+         var param = {
+          bdcdyid: row.bdcdyid,
+          qllx: row.qllx,
+          bdcdyh: row.bdcdyh,
+          bsmQlxx: row.bsmQlxx,
+        };
+        this.$popup("自然幢列表", "registerBook/dzlist", {
+          formData: param
+        })
+      },
     }
   }
 </script>

@@ -244,7 +244,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>自然幢</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.dzlist(scope.row) }}>自然幢</el-button>
             </div>
           )
         }