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

@@ -6,8 +6,16 @@
 <template>
 <template>
   <div class="content loadingtext">
   <div class="content loadingtext">
     <div class="left">
     <div class="left">
-      <el-tree ref="tree" :data="treedata" :props="defaultProps" @node-click="handleNodeClick"
-        :default-expand-all="true" :expand-on-click-node="false" node-key="id" :default-checked-keys="[showTab]">
+      <el-tree
+        ref="tree"
+        :data="treedata"
+        :props="defaultProps"
+        @node-click="handleNodeClick"
+        :default-expand-all="true"
+        :expand-on-click-node="false"
+        node-key="id"
+        :default-checked-keys="[showTab]"
+      >
       </el-tree>
       </el-tree>
     </div>
     </div>
     <div class="right">
     <div class="right">
@@ -16,20 +24,16 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
-  import { loadTreeData, getNode } from "./djbFrameData.js";
-  // import { searchTaskToDo } from "@/api/workflow/search.js";
-  import { getDjbBysearch } from "@/api/search.js";
-  import {
+import { getBdcqljqtsx } from "@/api/djbDetail.js";
+import { loadTreeData, getNode } from "./djbFrameData.js";
+// import { searchTaskToDo } from "@/api/workflow/search.js";
+import { getDjbBysearch } from "@/api/search.js";
+import {
   leftMenu
   leftMenu
-  } from "@/api/workFlow.js";
-  export default {
+} from "@/api/workFlow.js";
+export default {
   data () {
   data () {
     return {
     return {
-        //接收参数
-        // propsParam: this.$attrs,
-        //左侧目录
-        catalog: {},
       //选择加载哪一个组件
       //选择加载哪一个组件
       componentTag: "",
       componentTag: "",
       //子组件接收参数
       //子组件接收参数
@@ -46,6 +50,10 @@
         label: "label",
         label: "label",
       },
       },
       showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
       showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
+         bdcdyid:"",
+        bdcdyh: "",
+        qllx: "",
+        bsmQlxx: "",
     };
     };
   },
   },
   mounted () {
   mounted () {
@@ -74,32 +82,6 @@
         bdcdyh: this.getCaption(window.location.href)
         bdcdyh: this.getCaption(window.location.href)
 
 
       }
       }
-
-        // if (this.getCaption(window.location.href)) {
-        //    this.$startLoading();
-        //   searchTaskToDo({
-        //     ...this.queryForm,
-        //   }).then((res) => {
-        //     if (res.code === 200) {
-        //      this.$endLoading();
-        //       let { records } = res.result;
-        //       if(records.length){
-        //         console.log("true",records.length);
-        //        this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
-
-        //       }else{
-        //         console.log("false",records.length);
-        //          this.treedata=[]
-
-
-        //       }
-
-        //     }
-        //   });
-        // }else{
-        //    this.treedata=[]
-        // }
-
       if (this.getCaption(window.location.href)) {
       if (this.getCaption(window.location.href)) {
          this.$startLoading();
          this.$startLoading();
         getDjbBysearch({
         getDjbBysearch({
@@ -110,13 +92,14 @@
             let { records } = res.result;
             let { records } = res.result;
             if(records.length){
             if(records.length){
               console.log("true",records.length);
               console.log("true",records.length);
-               this.loadBdcdylist(records[0].bdcdyh, records[0].bdcdyid);
-
+                this.bdcdyid=records[0].bdcdyid
+                this.bdcdyh=records[0].bdcdyh
+                this.qllx=records[0].qllx
+                this.bsmQlxx=records[0].bsmQlxx
+                this.loadData()
             }else{
             }else{
               console.log("false",records.length);
               console.log("false",records.length);
                this.treedata=[]
                this.treedata=[]
-
-
             }
             }
 
 
           }
           }
@@ -134,42 +117,42 @@
      * @param {*} b
      * @param {*} b
      * @author: renchao
      * @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();
-            }
-          }
-        });
-      },
+    // 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();
+    //       }
+    //     }
+    //   });
+    // },
     /**
     /**
      * @description: loadData
      * @description: loadData
      * @author: renchao
      * @author: renchao
      */
      */
     loadData () {
     loadData () {
       getBdcqljqtsx({
       getBdcqljqtsx({
-          bdcdyid: this.currentSelectProps.bdcdyid,
-          bdcdyh: this.currentSelectProps.bdcdyh,
+        bdcdyid: this.bdcdyid,
+        bdcdyh: this.bdcdyh,
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
-            this.treedata = loadTreeData(res.result, this.currentSelectProps.bdcdyh);
+          this.treedata = loadTreeData(res.result, this.bdcdyh);
           this.$nextTick(function () {
           this.$nextTick(function () {
-              this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
+            this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
             this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
             this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
             this.loadComponent(this.defaultNode.form);
             this.loadComponent(this.defaultNode.form);
           });
           });
         }
         }
       });
       });
       this.currentSelectProps = {
       this.currentSelectProps = {
-          bdcdyid: this.currentSelectProps.bdcdyid,
-          bdcdyh: this.currentSelectProps.bdcdyh,
-          qllx: this.currentSelectProps.qllx,
-          bsmQlxx: this.currentSelectProps.bsmQlxx,
+        bdcdyid: this.bdcdyid,
+        bdcdyh: this.bdcdyh,
+        qllx: this.qllx,
+        bsmQlxx: this.bsmQlxx,
       };
       };
     },
     },
     /*
     /*
@@ -195,14 +178,14 @@
         require.ensure([], () => r(require("@/views/registerBook/" + form)));
         require.ensure([], () => r(require("@/views/registerBook/" + form)));
     },
     },
   },
   },
-  };
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  /deep/.rollTable {
+/deep/.rollTable {
   height: calc(120vh - 254px) !important;
   height: calc(120vh - 254px) !important;
-  }
+}
 
 
-  .content {
+.content {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   display: flex;
   display: flex;
@@ -223,31 +206,31 @@
     background-color: #f5f5f5;
     background-color: #f5f5f5;
     border: 1px solid rgb(228, 228, 228);
     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;
   visibility: hidden;
-  }
+}
 
 
-  /deep/ .el-tree-node__content {
+/deep/ .el-tree-node__content {
   border: 1px solid rgb(228, 228, 228);
   border: 1px solid rgb(228, 228, 228);
   height: 45px;
   height: 45px;
-  }
+}
 
 
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
+/deep/ .el-tree-node:focus > .el-tree-node__content {
   background-color: #f5f5f5;
   background-color: #f5f5f5;
   color: #0079fe;
   color: #0079fe;
   border-right: 4px solid #0079fe;
   border-right: 4px solid #0079fe;
-  }
+}
 
 
-  /deep/.el-tree-node {
+/deep/.el-tree-node {
   white-space: pre-wrap;
   white-space: pre-wrap;
-  }
+}
 
 
-  /deep/ .is-current > .el-tree-node__content {
+/deep/ .is-current > .el-tree-node__content {
   background-color: #f5f5f5;
   background-color: #f5f5f5;
   color: #0079fe;
   color: #0079fe;
   border-right: 4px solid #0079fe;
   border-right: 4px solid #0079fe;
-  }
+}
 </style>
 </style>