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

@@ -18,7 +18,8 @@
 <script>
 <script>
   import { getBdcqljqtsx } from "@/api/djbDetail.js";
   import { getBdcqljqtsx } from "@/api/djbDetail.js";
   import { loadTreeData, getNode } from "./djbFrameData.js";
   import { loadTreeData, getNode } from "./djbFrameData.js";
-  import { searchTaskToDo } from "@/api/workflow/search.js";
+  // import { searchTaskToDo } from "@/api/workflow/search.js";
+  import { getDjbBysearch } from "@/api/search.js";
   import {
   import {
     leftMenu
     leftMenu
   } from "@/api/workFlow.js";
   } from "@/api/workFlow.js";
@@ -70,31 +71,52 @@
        */
        */
       getdata () {
       getdata () {
         this.queryForm = {
         this.queryForm = {
-          bdcdyh: this.getCaption(window.location.href),
-          currentPage: 1,
-          djlx: "",
-          pageSize: 10,
-          qllx: "",
-          ywh: "",
-          ywly: ""
+          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();
-          searchTaskToDo({
+          getDjbBysearch({
             ...this.queryForm,
             ...this.queryForm,
           }).then((res) => {
           }).then((res) => {
             if (res.code === 200) {
             if (res.code === 200) {
-
+             this.$endLoading();
               let { records } = res.result;
               let { records } = res.result;
-              console.log("records",records);
-              if(records){
-                console.log("false");
-               this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
-               this.$endLoading();
+              if(records.length){
+                console.log("true",records.length);
+               this.loadBdcdylist(records[0].bdcdyh, records[0].bdcdyid);
+
               }else{
               }else{
-                this.$endLoading();
-                this.treedata=[]
+                console.log("false",records.length);
+                 this.treedata=[]
+
+
               }
               }
 
 
             }
             }