提交

ruoyi-ui/src/api/system/form.js

@@ -15,4 +15,20 @@ export function getObject(data) {
     method: 'POST',
     data
   })
-}
+}
+// 获取表单tab数据
+ export function geteditindeTab(data) {
+   return request({
+     url: '/boman-web-core/p/cs/objectTab',
+     method: 'POST',
+     data
+   })
+ }
+ 
+ export function listIndex(data) {
+   return request({
+     url: '/boman-web-core/p/cs/queryList',
+     method: 'post',
+     data: data
+   })
+ }

ruoyi-ui/src/api/system/table.js

@@ -11,7 +11,7 @@ export function getQueryList(data) {
 // 获取表单查询字段、按钮、表头
 export function getTableQuery(data) {
   return request({
-    url: '/boman-web-core/p/cs/getTableQuery',
+    url: '/boman-web-core/p/cs/getObject',
     method: 'POST',
     data
   })

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

@@ -18,7 +18,7 @@
     <!-- 内容 -->
     <div class="eniting_nav">
      <el-collapse v-model="activeNames" @change="handleChange">
-       <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in taleLisst" :key="index" class="eitde">
+       <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" class="eitde">
          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
            <el-row >
              <el-col :span="24"  :key="index">
@@ -108,7 +108,11 @@
            taleLisst:[]  ,//列表数据
            // 按钮参数
            tableZbie:{
-             table:'obj_test'
+             table:'obj_test',
+             isUi:true,
+             fixedData:{
+               id:-1
+             }
            },
            tableZbietabg:{
              table:'sys_user'
@@ -132,7 +136,7 @@
         };
       },
       mounted() {
-        this.edingelsie()
+        // this.edingelsie()
         // button
         this.init()
         // tab
@@ -166,16 +170,16 @@
               },
         enditTab(index){
          this.num = index
-         // this.tabledeLise.table = this.tabldie[index].tableName
-         // this.formeanti.table = this.tabldie[index].tableName
-         // this.forme.table = this.tabldie[index].tableName
+         this.tabledeLise.table = this.tabldie[index].tableName
+         this.formeanti.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.edingelsie()
+         // this.edingelsie()
          this.init()
         },
         // 按钮
@@ -314,6 +318,9 @@
     }
   }
   .eniting_nav{
+    // .el-form-item{
+    //   width: 25% !important;
+    //   }
     .el-collapse-item__content{
       padding-bottom: 0;
     }
@@ -328,9 +335,9 @@
       color: #3C8DBC;
       line-height: 36px;
     }
-    .el-form-item__content{
-      width: 55%;
-    }
+    // .el-form-item__content{
+    //   width: 65%;
+    // }
     .textarea_et{
     width: 95%;
     .el-form-item__content{

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

@@ -1,43 +1,39 @@
 <template>
   <div class="tabForm">
     <div class="tabForm_header">
-      <div class="table_headerBtun">
-        <el-button type="primary" plain @click="headerBtn(item)" v-for="(item,index) in tabList.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
+      <div class="table_headerBtun" v-if="queryData.buttonList">
+        <el-button type="primary" plain @click="headerBtn(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
     <div class="table_nav">
       <el-collapse v-model="activeNames">
-        <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
-          <el-form :model="queryParams" ref="queryForm" :inline="true">
+        <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" class="eitde">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
             <el-row :gutter="0">
-              <el-col :span="6" v-for="(item,index) in 8" :key="index">
-                <el-form-item :label="labletit" prop="dictName">
-                  <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable size="small"
-                    @keyup.enter.native="handleQuery" />
-                </el-form-item>
+              <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='indexs' />
               </el-col>
             </el-row>
           </el-form>
         </el-collapse-item>
-
         <!-- 列表 -->
-        <el-collapse-item :title="title" :name="index" v-for="(item,index) in 1" :key="index" class="eitde">
+        <el-collapse-item :title="title" name="index"  class="eitde">
           <div class="ppl">
-            <p v-for="(item,index) in 6" :key="index" @click="enditTab(index)">
+            <p v-for="(item,index) in tabldie" :key="index" @click="enditTab(index)">
               <img src="../../../assets/images/icon_tbtab_normal.png" alt="" class="index_headerImg" v-if="numtab !== index">
               <img src="../../../assets/images/icon_tbtab_selected.png" alt="" class="index_headerImg" v-if="numtab == index">
-              <span :class="[index == numtab ? 'span' : '']">列表名称</span>
+              <span :class="[index == numtab ? 'span' : '']">{{item.tableComment}}</span>
             </p>
           </div>
-          <el-form style="margin-top: 30px;" :model="queryParams" ref="queryForm" :inline="true" label-width="118px">
+        <!--  <el-form style="margin-top: 30px;" :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
             <el-form-item label="岗位编码" prop="postCode" v-for="(item,index) in 2" :key="index">
               <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable size="small" @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             </el-form-item>
-          </el-form>
+          </el-form> -->
           <el-divider></el-divider>
           <el-table stripe v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
             <el-table-column label="序号" align="center" prop="noticeId" width="80" />
@@ -57,21 +53,22 @@
           </el-table>
           <div class="index_haderPagin">
             <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage3"
-              :page-size="queryParams.pageSize" layout="prev, pager, next, jumper" :total="1000">
+              :page-size="queryParamslist.pageSize" layout="prev, pager, next, jumper" :total="1000">
             </el-pagination>
           </div>
         </el-collapse-item>
 
       </el-collapse>
     </div>
-
   </div>
 </template>
 
 <script>
   import {
     getTableQuery,
-    getObject
+    getObject,
+    geteditindeTab,
+    listIndex
   } from '@/api/system/form.js'
 
   export default {
@@ -83,29 +80,36 @@
         tabList: {},
         currentPage3: 0,
         activeNames: ['1'],
-        title: '单表1',
+        title: '列表',
         objParams: {
           table: 'sys_config',
           fixedData: {
             id: -1
-          }
+          },
+          isUi:true
         },
+        queryData: {},
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 10,
           dictName: undefined,
           dictType: undefined,
           status: undefined
         },
+        queryParamslist: {
+          pageNo: 1,
+          pageSize: 10,
+          orderBy:'create_time desc',
+          table: 'sys_config',
+        },
         labletit: '查询参数1233',
         surlable: '实际数据库表',
-        postList: [{
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }],
-        numtab: 0
+        postList: [],
+        numtab: 0,
+        tabldie:[],
+        tabShoes:false,//tab 显示隐藏
+        tableZbietabg:{
+          table:'sys_user'
+        },
       };
     },
     filters:{
@@ -132,18 +136,16 @@
     },
     mounted() {
       this.init()
+      this.edingelsietab()
     },
     methods: {
       handleCurrentChange() {
-        
+
       },
       handleSizeChange() {
-        
-      },
-      handleSelectionChange() {
 
       },
-      handleQuery() {
+      handleSelectionChange() {
 
       },
       headerBtn(item) {
@@ -172,23 +174,104 @@
         }
       },
       init() {
-        getTableQuery({
-          table: 'sys_config'
-        }).then(res => {
-          this.tabList = res.data
-          console.log(res)
-        })
         getObject(this.objParams).then(res => {
           console.log(res)
+          let data = res.data
+          this.queryData = data
+          console.log(this.queryData,567)
         })
       },
+      // tab数据
+      edingelsietab(){
+        console.log(4566)
+        geteditindeTab(this.tableZbietabg).then(response => {
+          if(response.data.ref.length !==0){
+            this.tabldie = response.data.ref
+            this.tabShoes = true
+          }else{
+            this.tabShoes = false
+          }
+          // this.msgSuccess("反提交成功");
+          // this.open = false;
+          // this.getList();
+        });
+      },
+      // 列表数据
+      foremliseju(){
+       listIndex(this.queryParamslist).then(res => {
+         console.log(res)
+         let data = res.data
+         this.postList = data
+         console.log(this.postList,567)
+       })
+      },
       // tab点击
       tabSbu(index) {
         this.num = index
       },
       enditTab(index) {
         this.numtab = index
-      }
+      },
+      changeFn(obj) {
+        for(let key in obj){
+          this.queryParams[key] = obj[key]
+        }
+      },
+      resetQuery() {
+
+      },
+      /** 搜索按钮操作 */
+      handleQuery(index) {
+         console.log(index,4)
+         for(let item of this.queryData.showData){
+           for(var i = 0 ; i < item.hrChildren.length ; i++){
+             if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
+               this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
+             } else{
+               this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
+             }
+           }
+         }
+         console.log(this.queryParams)
+         if(index == 'D'){
+           //删除
+           this.handleDelete(index)
+         }else if(index == 'S'){
+           //提交  保存
+            this.formeanti.table = 'obj_test'
+            this.formeanti.commitData = []
+            this.formy.status = 1
+            this.formy.id = 0
+            this.formeanti.commitData.push(this.formy)
+            console.log(this.formeanti)
+           // this.antiSubmission()
+         }else if(index == 'U'){
+           //反提交  保存
+            this.formeanti.table = 'obj_test'
+            this.formeanti.commitData = []
+            this.formy.status = 2
+            this.formy.id = 0
+            this.formeanti.commitData.push(this.formy)
+            console.log(this.formeanti)
+           // this.antiSubmission()
+         }else if(index == 'M'){
+           // 修改
+           this.forme.table = 'obj_test'
+           this.forme.objId = 1
+           this.forme.fixedData = this.queryParams
+           // this.submitForm()
+         }else if(index == 'A'){
+           //新增
+           this.forme.table = 'obj_test'
+           this.forme.objId = -1
+           this.forme.fixedData = this.queryParams
+           // this.submitForm()
+         }
+
+        console.log(this.forme)
+        // this.getList();
+      },
+
     },
   };
 </script>
@@ -213,9 +296,9 @@
         line-height: 36px;
       }
 
-      .el-form-item__content {
-        width: 55%;
-      }
+      // .el-form-item__content {
+      //   width: 55%;
+      // }
 
       .el-collapse {
         border-top: 0;

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

@@ -10,7 +10,7 @@
     <!-- 内容 -->
     <div class="table_nav headertable_nav">
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in taleLisst" :key="index" >
+        <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" >
           <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="120px">
             <el-row :gutter="0">
               <el-col :span="24"  :key="index">
@@ -18,7 +18,7 @@
               </el-col>
             </el-row>
           </el-form>
-        </el-collapse-item> 
+        </el-collapse-item>
       </el-collapse>
     </div>
   </div>
@@ -50,7 +50,12 @@
         },
         labletit: '查询参数1233',
         tableZbie:{
-          table:'obj_test'
+          table:'obj_test',
+          isUi:true,
+          fixedData:{
+            id:-1
+          }
+
         },
         taleLisst:[],
         forme:{
@@ -92,7 +97,7 @@
     },
     mounted() {
       this.init()
-      this.tablsie()
+      // this.tablsie()
     },
     methods: {
       changeFn(obj) {
@@ -106,7 +111,7 @@
       /** 搜索按钮操作 */
       handleQuery(index) {
          console.log(index,4)
-         for(let item of this.taleLisst){
+         for(let item of this.queryData.showData){
            for(var i = 0 ; i < item.hrChildren.length ; i++){
              if(item.hrChildren[i].htmlType == 'checkbox' || item.hrChildren[i].htmlType == 'imageUpload' || item.hrChildren[i].htmlType == 'fileUpload'){
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config
@@ -115,6 +120,7 @@
              }
            }
          }
+         console.log(this.queryParams)
          if(index == 'D'){
            //删除
            this.handleDelete(index)
@@ -126,7 +132,7 @@
             this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
-           this.antiSubmission()
+           // this.antiSubmission()
          }else if(index == 'U'){
            //反提交  保存
             this.formeanti.table = 'obj_test'
@@ -135,19 +141,19 @@
             this.formy.id = 0
             this.formeanti.commitData.push(this.formy)
             console.log(this.formeanti)
-           this.antiSubmission()
+           // this.antiSubmission()
          }else if(index == 'M'){
            // 修改
            this.forme.table = 'obj_test'
            this.forme.objId = 1
            this.forme.fixedData = this.queryParams
-           this.submitForm()
+           // this.submitForm()
          }else if(index == 'A'){
            //新增
            this.forme.table = 'obj_test'
            this.forme.objId = -1
            this.forme.fixedData = this.queryParams
-           this.submitForm()
+           // this.submitForm()
          }
 
         console.log(this.forme)