Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/App.vue

@@ -1,12 +1,30 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="isRouterAlive"/>
   </div>
 </template>
 
 <script>
 export default  {
   name:  'App',
+  provide () {
+    return{
+      reload: this.reload
+    }
+  },
+  data() {
+    return {
+        isRouterAlive: true
+    }
+  },
+  methods:{
+    reload(){
+      this.isRouterAlive = false
+      this.$nextTick(function(){
+        this.isRouterAlive = true
+      })
+    }
+  }
 }
 </script>
 <style>

ruoyi-ui/src/views/system/table/index.vue

@@ -33,7 +33,8 @@
     delMenutab
   } from '@/api/system/table.js'
   export default {
-    name: "index",
+    name: "index",
+    inject: ['reload'],
     data() {
       return {
         // 显示搜索条件
@@ -79,7 +80,7 @@
         },
         jeigneu:[],
         jeigneutwo:[],
-        xidugje:'保存',
+        xidugje:0,
         tijeq:0
       };
     },
@@ -183,16 +184,22 @@
              path: '/business/table',
              query: {id:-1,tables:this.forme.table},
            })
-          // this.forme.objId = "-1"
-          this.xidugje = '新增'
-          this.tableZbie.fixedData.id = -1
-          this.formy.id = '-1'
-          this.init()
+          // // this.forme.objId = "-1"
+          //  this.queryParams = {}
+          this.xidugje = 0
+          // this.tableZbie.fixedData.id = -1
+          // this.formy.id = '-1'
+          // this.init()
+          this.reload()
          }else if(index == '返回'){
-           this.$router.go(-1)
+           if(this.xidugje ==0){
+              this.$router.go(-2)
+           }else{
+             this.$router.go(-1)
+           }
          }else if(index == '刷新'){
-           this.xidugje = '刷新'
-           this.init()
+           this.xidugje = 1
+           this.reload()
          }
 
 
@@ -203,11 +210,12 @@
 
       },
       init() {
-        console.log(1243)
+
         getTableQuery(
           this.tableZbie
         ).then(res => {
           let data = res.data
+          console.log(res.data)
           this.queryData = {}
           this.queryData = data
           this.jeigneutwo = []
@@ -257,6 +265,7 @@
           this.jeigneutwo.push('刷新')
           this.jeigneutwo.push('返回')
           console.log(this.jeigneutwo,567)
+          console.log(this.xidugje)
           if(this.xidugje == '刷新'){
             if(res.code == 200){
               this.msgSuccess("操作成功");
@@ -290,11 +299,12 @@
               addbjectSave(this.forme).then(response => {
                 this.msgSuccess("保存成功");
                 this.open = false;
-                if(this.xidugje =="新增"){
-                   this.$router.go(-2)
-                }else{
+                console.log(this.xidugje)
+                // if(this.xidugje =="新增"){
+                //    this.$router.go(-2)
+                // }else{
                   this.$router.go(-1)
-                }
+                // }
 
                 // this.getList();
               });