Merge remote-tracking branch 'origin/dev' into dev

@@ -68,7 +68,6 @@ export function loadTreeData(qlxxData, bdcdyh) {
 
 
 //获取权利类型、不动产单元类型对应的树形节点信息
 //获取权利类型、不动产单元类型对应的树形节点信息
 export function getNode(qllx, qlxx, bdcdylx) {
 export function getNode(qllx, qlxx, bdcdylx) {
-  console.log("qllx",qllx,"bdcdylx",bdcdylx);
     let node;
     let node;
     for (var i = 0; i < qlxxPage.length; i++) {
     for (var i = 0; i < qlxxPage.length; i++) {
         if (qlxxPage[i].qllx == qllx) {
         if (qlxxPage[i].qllx == qllx) {

@@ -106,18 +106,20 @@ export default {
     };
     };
   },
   },
   mounted() {
   mounted() {
+     this.getleftMenubl();
     this.loadBdcdylist();
     this.loadBdcdylist();
+
   },
   },
   computed: {
   computed: {
-    ...mapGetters(["isRefresh"]),
+    // ...mapGetters(["isRefresh"]),
   },
   },
   watch: {
   watch: {
-    isRefresh: {
-      handler(newVal, oldVal) {
-        if (newVal) this.loadBdcdylist();
-      },
-      immediate: true,
-    },
+    // isRefresh: {
+    //   handler(newVal, oldVal) {
+    //     if (newVal) this.loadBdcdylist();
+    //   },
+    //   immediate: true,
+    // },
   },
   },
   methods: {
   methods: {
     //读取申请单元信息
     //读取申请单元信息
@@ -128,19 +130,25 @@ export default {
       leftMenu(formdata).then((res) => {
       leftMenu(formdata).then((res) => {
         if (res.code === 200 && res.result) {
         if (res.code === 200 && res.result) {
           this.currentSelectProps = res.result[0];
           this.currentSelectProps = res.result[0];
+          if(this.supplementarylist.length>0){
+            this.unitClick(0)
+          }
           this.$emit("getCurrentSelectProps", this.currentSelectProps);
           this.$emit("getCurrentSelectProps", this.currentSelectProps);
           if(add){
           if(add){
             this.$parent.getQllxByBdcdyid()
             this.$parent.getQllxByBdcdyid()
           }
           }
         }
         }
       });
       });
-      this.getleftMenubl();
+
     },
     },
     // 获取右侧菜单
     // 获取右侧菜单
     getleftMenubl(row) {
     getleftMenubl(row) {
        leftMenubl(this.bsmSlsq).then((res) => {
        leftMenubl(this.bsmSlsq).then((res) => {
         this.supplementarylist = res.result;
         this.supplementarylist = res.result;
         console.log("this.supplementarylist",this.supplementarylist);
         console.log("this.supplementarylist",this.supplementarylist);
+        if(this.supplementarylist.length>0){
+          this.unitClick(0)
+        }
         if(row){
         if(row){
           this.supplementarylist.forEach((item,index) => {
           this.supplementarylist.forEach((item,index) => {
             if(item.bsmRepair==row.bsmRepair){
             if(item.bsmRepair==row.bsmRepair){
@@ -265,6 +273,11 @@ export default {
 }
 }
 .menus {
 .menus {
   background-color: #e7f4fe;
   background-color: #e7f4fe;
+  div{
+     font-size: 16px;
+     font-weight: 600;
+  }
+
 }
 }
 .blxx {
 .blxx {
   border: #b0d9f8 solid 1px;
   border: #b0d9f8 solid 1px;

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-05-09 09:20:10
  * @LastEditTime: 2023-05-09 09:20:10
 -->
 -->
 <template>
 <template>
-  <dialogBox title="新建材料信息1111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
+  <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
     :isFullscreen="false">
     :isFullscreen="false">
     <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
     <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
       <el-row>
       <el-row>

@@ -73,6 +73,7 @@
 <script>
 <script>
 import WorkFlow from "./mixin/index";
 import WorkFlow from "./mixin/index";
 import { getForm } from "./flowform";
 import { getForm } from "./flowform";
+import { getStepFormInfo } from "@/api/fqsq.js"
 import NoticeBar from "@/components/NoticeBar/index";
 import NoticeBar from "@/components/NoticeBar/index";
 import ProcessViewer from "./components/processViewer.vue";
 import ProcessViewer from "./components/processViewer.vue";
 // 引入左侧菜单
 // 引入左侧菜单
@@ -126,9 +127,22 @@ export default {
       defaultNode: {},
       defaultNode: {},
     };
     };
   },
   },
-  mounted() {},
+  mounted() {
+
+  },
 
 
   methods: {
   methods: {
+      // 获取表单
+      stepForm () {
+        this.currentSelectProps.batchOperation=false
+        getStepFormInfo(this.currentSelectProps).then((res) => {
+          if (res.code === 200) {
+        console.log("ressssssssssss",res);
+          }
+        })
+      },
+
+
     getQllxByBdcdyid() {
     getQllxByBdcdyid() {
       if(this.currentSelectProps.bdcdyid){
       if(this.currentSelectProps.bdcdyid){
            getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
            getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
@@ -144,11 +158,14 @@ export default {
     },
     },
     // 获取右侧选项卡
     // 获取右侧选项卡
     getCurrentSelectProps(val) {
     getCurrentSelectProps(val) {
+      console.log("vallllllllllllllllll",val);
       this.currentSelectProps = val;
       this.currentSelectProps = val;
       if (this.currentSelectProps.bsmRepair) {
       if (this.currentSelectProps.bsmRepair) {
         this.tabset(val);
         this.tabset(val);
       } else {
       } else {
+        console.log("jin");
         this.getdjblist();
         this.getdjblist();
+        this.stepForm ()
       }
       }
     },
     },
     // 获取渲染登记簿列表
     // 获取渲染登记簿列表