Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -591,7 +591,8 @@
                                             bsm: res.processInstance.title,
                                             bsm: res.processInstance.title,
                                             source: 2,
                                             source: 2,
                                             auth:'2',
                                             auth:'2',
-                                            workitemInstanceId:res.workitemInstance.id
+                                            workitemInstanceId:res.workitemInstance.id,
+                                            ywbsm:res.processInstance.businessId
                                         }
                                         }
                                     });
                                     });
                                 } else {
                                 } else {

@@ -94,7 +94,8 @@ export default {
         return{
         return{
             getRightTree: this.getRightTree,
             getRightTree: this.getRightTree,
 			getTreeByBsm:this.getTreeByBsm,
 			getTreeByBsm:this.getTreeByBsm,
-			getTreeByS:this.getTreeByS
+			getTreeByS:this.getTreeByS,
+			getTreeList:this.getTreeList
 		}
 		}
 	},
 	},
 	data() {
 	data() {

@@ -60,7 +60,7 @@
 
 
     export default {
     export default {
         name: "",
         name: "",
-        inject:['getRightTree','getTreeByBsm'],
+        inject:['getRightTree','getTreeByBsm','getTreeList'],
         components: {SearchHead},
         components: {SearchHead},
         props: {},
         props: {},
         data() {
         data() {
@@ -81,6 +81,7 @@
             this.queryData.pageSize=this.pageSize;
             this.queryData.pageSize=this.pageSize;
             this.queryData.pageNo=this.pageNo;
             this.queryData.pageNo=this.pageNo;
             this.getData(this.queryData);
             this.getData(this.queryData);
+            this.getTreeList();
             this.$nextTick(()=>{
             this.$nextTick(()=>{
 			    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 332;
 			    this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 332;
             })
             })