Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/manager/projectinfo/independent.vue

@@ -90,7 +90,7 @@
         </div>
       </div>
     </div>
-    <Qute ref="Qute" :projectid="projectid" :wbsid="wbsid"> </Qute>
+    <Qute ref="Qute" :projectid="projectid" :wbsid="wbsid" :onLoad1="onLoad1"> </Qute>
     <Relation ref="Relation" :GLExcelFrom="GLExcelFrom" :wbsid="wbsid"></Relation>
     <!-- 编辑元素 -->
        <!-- 编辑元素 -->
@@ -426,14 +426,22 @@ export default {
     },
      onLoad(page){
       console.log(page,'page');
+      console.log(this.projectid,'this.projectid');
       if(this.treeId){
-         this.tabTypeLazyTreeAll(this.treeId, page.currentPage,page.pageSize).then((res)=>{
+         this.tabTypeLazyTree(this.treeId,this.projectid, page.currentPage,page.pageSize).then((res)=>{
+          this.loadData=res.records
+           this.page.total=res.total
+        })
+      }
+    },
+   onLoad1(){
+      if(this.treeId){
+         this.tabTypeLazyTree(this.treeId,this.projectid, this.page.current,this.page.size).then((res)=>{
           this.loadData=res.records
            this.page.total=res.total
         })
       }
     },
-
     resetChange(item){
       console.log(item);
         this.tabTypeLazyTree(this.treeId, this.projectid,this.page.current,this.page.size).then((res)=>{
@@ -477,7 +485,6 @@ export default {
         type: "warning"
       })
         .then(() => {
-          console.log(this.ids,'this.ids');
           let ids=this.ids.split(',')
           ids.forEach((item)=>{
             return removeTableByCondition(item,this.projectid,this.wbsid);

src/views/manager/projectinfo/qutediaolog/qute.vue

@@ -17,7 +17,7 @@
             :option="loadOption"
             v-model="obj"
             :page.sync="page"
-            @on-load="onLoad"
+            @on-load="quteonLoad"
             @search-change="searchChange" 
             @search-reset="resetChange"
             @selection-change="selectionChange"
@@ -146,7 +146,8 @@ export default {
      }
     },
     props:{
-      projectid:String
+      projectid:String,
+      onLoad1:Function
     },
     computed:{
      ids () {
@@ -164,7 +165,7 @@ export default {
 
 
     methods: {
-    onLoad(page){
+    quteonLoad(page){
       console.log(page,'page');
       if(this.treeId){
          this.tabTypeLazyTreeAll(this.treeId, page.currentPage,page.pageSize).then((res)=>{
@@ -243,6 +244,8 @@ export default {
             message: "操作成功!"
           });
           this.$refs.crud.toggleSelection();
+          this.dialogVisible=false;
+          this.onLoad1()
           }
         })
       }