yrik 4 лет назад
Родитель
Сommit
5e0aa2472c

+ 8 - 0
ruoyi-ui/src/api/system/table.js

@@ -81,3 +81,11 @@ export function tableSubimt(data) {
      data
      data
    })
    })
  }
  }
+
+ // 删除菜单
+ export function delMenutab(id) {
+   return request({
+     url: 'boman-web-core/p/cs/objectDelete/' + id,
+     method: 'delete'
+   })
+ }

+ 1 - 1
ruoyi-ui/src/components/DynamicForms/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
     <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
     <el-form-item :label="formConfig.columnComment" style="display: inline-block;" :prop="formConfig.columnName">
       <!-- 输入框 -->
       <!-- 输入框 -->
-      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
+      <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnValue]" :placeholder="'请输入'+formConfig.columnComment"
         clearable @keyup.enter.native="handleQuery" />
         clearable @keyup.enter.native="handleQuery" />
       <!-- 多行输入框 -->
       <!-- 多行输入框 -->
       <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
       <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"

+ 39 - 30
ruoyi-ui/src/views/system/editing/index.vue

@@ -22,7 +22,7 @@
          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
            <el-row >
            <el-row >
              <el-col :span="24"  :key="index">
              <el-col :span="24"  :key="index">
-                 <dynamic-forms :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='items.id' />
+                 <dynamic-forms :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
              </el-col>
              </el-col>
            </el-row>
            </el-row>
          </el-form>
          </el-form>
@@ -83,7 +83,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
- import { getTableQuery, getQueryList, geteditindeTab, tableSubimt, tableSubimtanit, addbjectSave} from '@/api/system/table.js';
+ import { getTableQuery, delMenutab, getQueryList, geteditindeTab, tableSubimt, tableSubimtanit, addbjectSave} from '@/api/system/table.js';
  // import { getTableQuery, getQueryList,geteditindeTab, tableSubimt, tableSubimtanit, addbjectSave } from '@/src/api/system/editing.js';
  // import { getTableQuery, getQueryList,geteditindeTab, tableSubimt, tableSubimtanit, addbjectSave } from '@/src/api/system/editing.js';
   export default {
   export default {
       name: "index",
       name: "index",
@@ -93,16 +93,12 @@
            title:'单表1',
            title:'单表1',
            // 查询参数
            // 查询参数
            queryParams: {
            queryParams: {
-             pageNum: 1,
-             pageSize: 10,
-             dictName: undefined,
-             dictType: undefined,
-             status: undefined
+
            },
            },
            labletit:'查询参数1233',
            labletit:'查询参数1233',
            num:0,
            num:0,
            tabledeLise:{
            tabledeLise:{
-             table:'obj_test',
+             table:'',
              isUi:true
              isUi:true
            },
            },
            taleLisst:[]  ,//列表数据
            taleLisst:[]  ,//列表数据
@@ -138,6 +134,16 @@
       mounted() {
       mounted() {
         // this.edingelsie()
         // this.edingelsie()
         // button
         // button
+        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.tabledeLise.table = this.$route.query.tables
+        this.tableZbie.table = this.$route.query.tables
+        this.tableZbie.fixedData.id = this.$route.query.id
+        this.formy.id = this.$route.query.id
+        this.tableZbietabg.table = this.$route.query.tables
+        console.log(this.forme.objId)
         this.init()
         this.init()
         // tab
         // tab
         this.edingelsietab()
         this.edingelsietab()
@@ -173,13 +179,9 @@
          this.tabledeLise.table = this.tabldie[index].tableName
          this.tabledeLise.table = this.tabldie[index].tableName
          this.formeanti.table = this.tabldie[index].tableName
          this.formeanti.table = this.tabldie[index].tableName
          this.forme.table = this.tabldie[index].tableName
          this.forme.table = this.tabldie[index].tableName
-         if(index == 0){
-          this.tabledeLise.table = 'obj_test'
-         }else if(index ==1){
-          this.tabledeLise.table = 'sys_config'
-         }
+
          this.tableZbie.table = this.tabldie[index].tableName
          this.tableZbie.table = this.tabldie[index].tableName
-         // this.edingelsie()
+         this.edingelsie()
          this.init()
          this.init()
         },
         },
         // 按钮
         // 按钮
@@ -229,39 +231,46 @@
               }
               }
             }
             }
           }
           }
+         console.log(this.queryParams)
+          if(this.queryParams.pageNum !== undefined){
+            this.queryParams.pageNum = undefined
+          }
+          if(this.queryParams.pageSize !== undefined){
+            this.queryParams.pageSize = undefined
+          }
           if(index == 'D'){
           if(index == 'D'){
             //删除
             //删除
-            this.handleDelete(index)
+            this.handleDelete(this.formy.id)
           }else if(index == 'S'){
           }else if(index == 'S'){
             //提交  保存
             //提交  保存
-             this.formeanti.table = 'obj_test'
+             // this.formeanti.table = 'obj_test'
              this.formeanti.commitData = []
              this.formeanti.commitData = []
              this.formy.status = 1
              this.formy.status = 1
-             this.formy.id = 0
+             // this.formy.id = 0
              this.formeanti.commitData.push(this.formy)
              this.formeanti.commitData.push(this.formy)
              console.log(this.formeanti)
              console.log(this.formeanti)
-            // this.antiSubmission()
+            this.antiSubmission()
           }else if(index == 'U'){
           }else if(index == 'U'){
             //反提交  保存
             //反提交  保存
-             this.formeanti.table = 'obj_test'
+             // this.formeanti.table = 'obj_test'
              this.formeanti.commitData = []
              this.formeanti.commitData = []
              this.formy.status = 2
              this.formy.status = 2
-             this.formy.id = 0
+             // this.formy.id = 0
              this.formeanti.commitData.push(this.formy)
              this.formeanti.commitData.push(this.formy)
              console.log(this.formeanti)
              console.log(this.formeanti)
-            // this.antiSubmission()
+            this.antiSubmission()
           }else if(index == 'M'){
           }else if(index == 'M'){
             // 修改
             // 修改
-            this.forme.table = 'obj_test'
-            this.forme.objId = 1
+            // this.forme.table = 'obj_test'
+            // this.forme.objId = 1
             this.forme.fixedData = this.queryParams
             this.forme.fixedData = this.queryParams
-            // this.submitForm()
+            this.submitForm()
           }else if(index == 'A'){
           }else if(index == 'A'){
             //新增
             //新增
-            this.forme.table = 'obj_test'
-            this.forme.objId = -1
+            // this.forme.table = 'obj_test'
+            // this.forme.objId = -1
             this.forme.fixedData = this.queryParams
             this.forme.fixedData = this.queryParams
-            // this.submitForm()
+            this.submitForm()
           }
           }
 
 
          console.log(this.forme)
          console.log(this.forme)
@@ -294,13 +303,13 @@
         }
         }
       },
       },
       //删除
       //删除
-      handleDelete(row) {
-        this.$confirm('是否确认删除名称为"' + row + '"的数据项?', "警告", {
+      handleDelete(index) {
+        this.$confirm('是否确认删除名称为"' + index + '"的数据项?', "警告", {
             confirmButtonText: "确定",
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             cancelButtonText: "取消",
             type: "warning"
             type: "warning"
           }).then(function() {
           }).then(function() {
-            // return delMenu(row.id);
+            return delMenutab(index);
           }).then(() => {
           }).then(() => {
             // this.getList();
             // this.getList();
             this.msgSuccess("删除成功");
             this.msgSuccess("删除成功");

+ 15 - 8
ruoyi-ui/src/views/system/form/index.vue

@@ -124,6 +124,13 @@
       }
       }
     },
     },
     mounted() {
     mounted() {
+      this.formeanti.table = this.$route.query.tables
+      this.forme.table = this.$route.query.tables
+      this.forme.objId = this.$route.query.id
+      this.formy.id = this.$route.query.id
+      this.tableZbietabg.table = this.$route.query.tables
+      this.objParams.table = this.$route.query.tables
+      this.objParams.objId = this.$route.query.id
       this.init()
       this.init()
       this.edingelsietab()
       this.edingelsietab()
     },
     },
@@ -233,32 +240,32 @@
            this.handleDelete(index)
            this.handleDelete(index)
          }else if(index == 'S'){
          }else if(index == 'S'){
            //提交  保存
            //提交  保存
-            this.formeanti.table = 'obj_test'
+            // this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formeanti.commitData = []
             this.formy.status = 1
             this.formy.status = 1
-            this.formy.id = 0
+            // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
             console.log(this.formeanti)
            // this.antiSubmission()
            // this.antiSubmission()
          }else if(index == 'U'){
          }else if(index == 'U'){
            //反提交  保存
            //反提交  保存
-            this.formeanti.table = 'obj_test'
+            // this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formeanti.commitData = []
             this.formy.status = 2
             this.formy.status = 2
-            this.formy.id = 0
+            // this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
             console.log(this.formeanti)
            // this.antiSubmission()
            // this.antiSubmission()
          }else if(index == 'M'){
          }else if(index == 'M'){
            // 修改
            // 修改
-           this.forme.table = 'obj_test'
-           this.forme.objId = 1
+           // this.forme.table = 'obj_test'
+           // this.forme.objId = 1
            this.forme.fixedData = this.queryParams
            this.forme.fixedData = this.queryParams
            // this.submitForm()
            // this.submitForm()
          }else if(index == 'A'){
          }else if(index == 'A'){
            //新增
            //新增
-           this.forme.table = 'obj_test'
-           this.forme.objId = -1
+           // this.forme.table = 'obj_test'
+           // this.forme.objId = -1
            this.forme.fixedData = this.queryParams
            this.forme.fixedData = this.queryParams
            // this.submitForm()
            // this.submitForm()
          }
          }

+ 5 - 4
ruoyi-ui/src/views/system/surface/index.vue

@@ -143,7 +143,7 @@
                 path: '/business/table',
                 path: '/business/table',
                 query: {
                 query: {
                   id: -1,
                   id: -1,
-                  table: this.tabName,
+                  tables: this.tabName,
                 },
                 },
               })
               })
               return
               return
@@ -154,12 +154,13 @@
                 this.msgInfo('请勾选一条信息')
                 this.msgInfo('请勾选一条信息')
                 return
                 return
               }
               }
-              const id = this.ids
+              const id = this.ids.join(',')
+              // id = id.join(',')
               this.$router.push({
               this.$router.push({
-                path: '/business/table',
+                path: '/business/editing',
                 query: {
                 query: {
                   id,
                   id,
-                  table: this.tabName,
+                  tables: this.tabName,
                 },
                 },
               })
               })
               return
               return

+ 32 - 20
ruoyi-ui/src/views/system/table/index.vue

@@ -29,7 +29,8 @@
     getQueryList,
     getQueryList,
     tableSubimt,
     tableSubimt,
     tableSubimtanit,
     tableSubimtanit,
-    addbjectSave
+    addbjectSave,
+    delMenutab
   } from '@/api/system/table.js'
   } from '@/api/system/table.js'
   export default {
   export default {
     name: "index",
     name: "index",
@@ -40,7 +41,7 @@
         activeNames: ['1'],
         activeNames: ['1'],
         title: '单表1',
         title: '单表1',
         tabledeLise:{
         tabledeLise:{
-          table:'obj_test',
+          table:'',
           isUi:true
           isUi:true
         },
         },
         queryData: {},
         queryData: {},
@@ -50,7 +51,7 @@
         },
         },
         labletit: '查询参数1233',
         labletit: '查询参数1233',
         tableZbie:{
         tableZbie:{
-          table:'obj_test',
+          table:'',
           isUi:true,
           isUi:true,
           fixedData:{
           fixedData:{
             id:-1
             id:-1
@@ -96,6 +97,18 @@
       }
       }
     },
     },
     mounted() {
     mounted() {
+      // this.tableZbie.fixedData.id = 0
+
+       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
+       this.tableZbie.fixedData.id = this.$route.query.id
+       this.formy.id = this.$route.query.id
+       console.log(this.$route.query.id)
+       console.log(this.tableZbie.table)
+
       this.init()
       this.init()
       // this.tablsie()
       // this.tablsie()
     },
     },
@@ -121,39 +134,38 @@
            }
            }
          }
          }
          console.log(this.queryParams)
          console.log(this.queryParams)
+         if(this.queryParams.pageNum !== undefined){
+           this.queryParams.pageNum = undefined
+         } 
+         if(this.queryParams.pageSize !== undefined){
+           this.queryParams.pageSize = undefined
+         }
          if(index == 'D'){
          if(index == 'D'){
            //删除
            //删除
-           this.handleDelete(index)
+           console.log(this.formy.id)
+           this.handleDelete(this.formy.id)
          }else if(index == 'S'){
          }else if(index == 'S'){
            //提交  保存
            //提交  保存
-            this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formeanti.commitData = []
             this.formy.status = 1
             this.formy.status = 1
-            this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
             console.log(this.formeanti)
-           // this.antiSubmission()
+           this.antiSubmission()
          }else if(index == 'U'){
          }else if(index == 'U'){
            //反提交  保存
            //反提交  保存
-            this.formeanti.table = 'obj_test'
             this.formeanti.commitData = []
             this.formeanti.commitData = []
             this.formy.status = 2
             this.formy.status = 2
-            this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
             console.log(this.formeanti)
-           // this.antiSubmission()
+           this.antiSubmission()
          }else if(index == 'M'){
          }else if(index == 'M'){
            // 修改
            // 修改
-           this.forme.table = 'obj_test'
-           this.forme.objId = 1
            this.forme.fixedData = this.queryParams
            this.forme.fixedData = this.queryParams
-           // this.submitForm()
+           this.submitForm()
          }else if(index == 'A'){
          }else if(index == 'A'){
            //新增
            //新增
-           this.forme.table = 'obj_test'
-           this.forme.objId = -1
            this.forme.fixedData = this.queryParams
            this.forme.fixedData = this.queryParams
-           // this.submitForm()
+           this.submitForm()
          }
          }
 
 
         console.log(this.forme)
         console.log(this.forme)
@@ -188,7 +200,7 @@
       delet(index){
       delet(index){
       console.log(index)
       console.log(index)
       if(index == 'D'){
       if(index == 'D'){
-        this.handleDelete(index)
+        this.handleDelete(this.formy.id)
       }
       }
       },
       },
       /** 新增 修改提交按钮 */
       /** 新增 修改提交按钮 */
@@ -218,13 +230,13 @@
         }
         }
       },
       },
       //删除
       //删除
-      handleDelete(row) {
-        this.$confirm('是否确认删除名称为"' + row + '"的数据项?', "警告", {
+      handleDelete(index) {
+        this.$confirm('是否确认删除名称为"' + index + '"的数据项?', "警告", {
             confirmButtonText: "确定",
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             cancelButtonText: "取消",
             type: "warning"
             type: "warning"
           }).then(function() {
           }).then(function() {
-            // return delMenu(row.id);
+            return delMenutab(index);
           }).then(() => {
           }).then(() => {
             // this.getList();
             // this.getList();
             this.msgSuccess("删除成功");
             this.msgSuccess("删除成功");