Merge remote-tracking branch 'origin/master'

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

@@ -451,9 +451,6 @@
            this.forme.fixedData = this.queryParams
            this.submitForm()
          }else if(index == 'A'){
-          //  let query = Object.assign({'id':'630'},{} )
-          // this.$router.push({ query})
-          //  this.reload()
            this.forme.fixedData = this.queryParams
            this.submitForm()
          }
@@ -499,6 +496,9 @@
                let query = Object.assign({'id':response.data,'tables': this.forme.table},{} )
                this.$router.push({ query})
                this.queryParamslist.fixedData.condition[this.foremTtae] = response.data
+               this.deledlid.idList = []
+               this.deledlid.idList.push(response.data)
+               this.formy.id = response.data
                this.oieufr = response.data
                this.objParams.fixedData.id = response.data
                this.init()

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

@@ -93,10 +93,8 @@
       };
     },
     mounted() {
-      // this.tableZbie.fixedData.id = 0
       this.deledlid.idList = []
       this.formeanti.table = this.$route.query.tables
-      // this.formeanti.id = this.$route.query.id
       this.forme.table = this.$route.query.tables
       this.forme.objId = this.$route.query.id
       this.tableZbie.table = this.$route.query.tables