Browse Source

页面更新

sr 4 years ago
parent
commit
6e150dd3d5

+ 400 - 358
ruoyi-ui/src/views/system/editing/index.vue

@@ -4,7 +4,7 @@
     <div class="eniting_header">
       <!-- <p class="p">表编辑</p> -->
       <div class="ppl">
-       <p v-for="(item,index) in tabldie" :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="num !== index">
           <img src="../../../assets/images/icon_tbtab_selected.png" alt="" class="index_headerImg" v-if="num == index">
           <span :class="[index == num ? 'span' : '']">{{item.tableComment}}</span>
@@ -12,333 +12,355 @@
       </div>
       <el-divider></el-divider>
       <div class="table_headerBtun" v-if="queryData.buttonList">
-           <el-button type="primary" size="small" plain v-for="(item,indexss) in jeigneutwo" :key="keyname + indexss" @click="handleQuery(item)">{{item}}</el-button>
+        <el-button type="primary" size="small" plain v-for="(item,indexss) in jeigneutwo" :key="keyname + indexss"
+          @click="handleQuery(item)">{{item}}</el-button>
       </div>
     </div>
     <!-- 内容 -->
     <div class="eniting_nav">
-     <el-collapse v-model="activeNames" @change="handleChange">
-       <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">
-                 <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>
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" :rules="queryData.rules" label-width="120px">
+          <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index"
+            class="eitde">
+            <el-row>
+              <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-collapse-item>
+        </el-form>
+      </el-collapse>
     </div>
   </div>
 </template>
 <script>
- import { getTableQuery, delMenutab, getQueryList, geteditindeTab, tableSubimt, tableSubimtanit, addbjectSave} from '@/api/system/table.js';
+  import {
+    getTableQuery,
+    delMenutab,
+    getQueryList,
+    geteditindeTab,
+    tableSubimt,
+    tableSubimtanit,
+    addbjectSave
+  } from '@/api/system/table.js';
   export default {
-      name: "index",
-      data() {
-        return {
-           activeNames: ['1'],
-           title:'单表1',
-           // 查询参数
-           queryParams: {
-           },
-           labletit:'查询参数1233',
-           num:0,
-           tabledeLise:{
-             table:'',
-             isUi:true
-           },
-           taleLisst:[]  ,//列表数据
-           // 按钮参数
-           tableZbie:{
-             table:'obj_test',
-             isUi:true,
-             fixedData:{
-               id:-1
-             }
-           },
-           tableZbietabg:{
-             table:'sys_user'
-           },
-           queryData: {},
-            keyname:'nu',
-            tabldie:[],
-            forme:{
-              table:'',
-              objId:-1,
-              fixedData:{}
-            },
-            formeanti:{
-              table:'',
-              commitData:[],
-            },
-            formy:{
-              id:0,
-              status:1
-            },
-            // 删除参数
-            deledlid:{
-              table:'',
-              idList:[]
-            },
-            jeigneu:[],
-            jeigneutwo:[],
-        };
+    name: "index",
+    data() {
+      return {
+        activeNames: ['1'],
+        title: '单表1',
+        // 查询参数
+        queryParams: {},
+        labletit: '查询参数1233',
+        num: 0,
+        tabledeLise: {
+          table: '',
+          isUi: true
+        },
+        taleLisst: [], //列表数据
+        // 按钮参数
+        tableZbie: {
+          table: 'obj_test',
+          isUi: true,
+          fixedData: {
+            id: -1
+          }
+        },
+        tableZbietabg: {
+          table: 'sys_user'
+        },
+        queryData: {},
+        keyname: 'nu',
+        tabldie: [],
+        forme: {
+          table: '',
+          objId: -1,
+          fixedData: {}
+        },
+        formeanti: {
+          table: '',
+          commitData: [],
+        },
+        formy: {
+          id: 0,
+          status: 1
+        },
+        // 删除参数
+        deledlid: {
+          table: '',
+          idList: []
+        },
+        jeigneu: [],
+        jeigneutwo: [],
+      };
+    },
+    mounted() {
+      // this.edingelsie()
+      // button
+      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.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
+      this.deledlid.table = this.$route.query.tables
+      this.deledlid.idList.push(this.$route.query.id)
+      console.log(this.deledlid)
+
+      // tab
+      this.edingelsietab()
+    },
+    filters: {},
+    methods: {
+      handleChange(val) {
+        console.log(val);
       },
-      mounted() {
+      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.tableZbie.table = this.tabldie[index].tableName
         // this.edingelsie()
-        // button
-        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.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
-        this.deledlid.table = this.$route.query.tables
-        this.deledlid.idList.push(this.$route.query.id)
-        console.log(this.deledlid)
-
-        // tab
-        this.edingelsietab()
+        this.init()
       },
-      filters:{
-      },
-      methods: {
-        handleChange(val) {
-                console.log(val);
-              },
-        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.tableZbie.table = this.tabldie[index].tableName
-         // this.edingelsie()
-         this.init()
-        },
-        // 按钮
-        init() {
-          getTableQuery(
-            this.tableZbie
-          ).then(res => {
-            let data = res.data
-            this.queryData = data
-            this.jeigneutwo = []
-            this.jeigneu = []
-            this.jeigneu = data.buttonList.split('')
-            console.log(data.buttonList)
-            console.log(this.jeigneu)
-            this.jeigneu.filter(route => {
-              // route.dept_id = route.dept_id.value
-              console.log(route)
-              if(route == 'A'){
-                if(this.formy.id == -1){
-                  route = '保存'
-                  this.jeigneutwo.push(route)
-                }else{
-                  route = '新增'
-                }
-
-              }else if(route == 'M'){
+      // 按钮
+      init() {
+        getTableQuery(
+          this.tableZbie
+        ).then(res => {
+          let data = res.data
+          this.queryData = data
+          this.jeigneutwo = []
+          this.jeigneu = []
+          this.jeigneu = data.buttonList.split('')
+          console.log(data.buttonList)
+          console.log(this.jeigneu)
+          this.jeigneu.filter(route => {
+            // route.dept_id = route.dept_id.value
+            console.log(route)
+            if (route == 'A') {
+              if (this.formy.id == -1) {
                 route = '保存'
-                if(this.formy.id != -1){
-                  this.jeigneutwo.push(route)
-                }
-              }else if(route == 'D'){
-                route = '删除'
-                if(this.formy.id != -1){
-                  this.jeigneutwo.push(route)
-                }
-              }else if(route == 'Q'){
-                route = '查询'
-              }else if(route == 'S'){
-                route = '提交'
-                if(this.formy.id != -1){
-                  this.jeigneutwo.push(route)
-                }
-              }else if(route == 'U'){
-                route = '反提交'
-                if(this.formy.id != -1){
-                  this.jeigneutwo.push(route)
-                }
-              }else if(route == 'I'){
-                route = '导入'
-              }else if(route == 'E'){
-                route = '导出'
+                this.jeigneutwo.push(route)
+              } else {
+                route = '新增'
               }
 
-            })
-            this.jeigneutwo.push('刷新')
-            this.jeigneutwo.push('返回')
-            console.log(this.queryData,567)
-          })
-        },
-        // 数据信息
-        edingelsie(){
-          console.log(1234)
-          getQueryList(
-            this.tabledeLise
-          ).then(res => {
-            let data = res.data
-            this.taleLisst = data
-            // console.log(this.queryData.queryList)
-          })
-        },
-        // tab数据
-       edingelsietab(){
-         console.log(4566)
-         geteditindeTab(this.tableZbietabg).then(response => {
-           this.tabldie = response.data.ref
-           if(this.tabldie.length !==0){
-             this.init()
-           }else {
-             this.msgSuccess("暂无数据");
-
-             this.$router.go(-1)
-           }
-           // this.msgSuccess("反提交成功");
-           // this.open = false;
-           // this.getList();
-         });
-       },
-       changeFn(obj) {
-         for(let key in obj){
-           this.queryParams[key] = obj[key]
-         }
-       },
-       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
-                console.log(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.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName])
+            } else if (route == 'M') {
+              route = '保存'
+              if (this.formy.id != -1) {
+                this.jeigneutwo.push(route)
+              }
+            } else if (route == 'D') {
+              route = '删除'
+              if (this.formy.id != -1) {
+                this.jeigneutwo.push(route)
+              }
+            } else if (route == 'Q') {
+              route = '查询'
+            } else if (route == 'S') {
+              route = '提交'
+              if (this.formy.id != -1) {
+                this.jeigneutwo.push(route)
+              }
+            } else if (route == 'U') {
+              route = '反提交'
+              if (this.formy.id != -1) {
+                this.jeigneutwo.push(route)
               }
+            } else if (route == 'I') {
+              route = '导入'
+            } else if (route == 'E') {
+              route = '导出'
             }
+
+          })
+          this.jeigneutwo.push('刷新')
+          this.jeigneutwo.push('返回')
+          console.log(this.queryData, 567)
+        })
+      },
+      // 数据信息
+      edingelsie() {
+        console.log(1234)
+        getQueryList(
+          this.tabledeLise
+        ).then(res => {
+          let data = res.data
+          this.taleLisst = data
+          // console.log(this.queryData.queryList)
+        })
+      },
+      // tab数据
+      edingelsietab() {
+        console.log(4566)
+        geteditindeTab(this.tableZbietabg).then(response => {
+          this.tabldie = response.data.ref
+          if (this.tabldie.length !== 0) {
+            this.init()
+          } else {
+            this.msgSuccess("暂无数据");
+
+            this.$router.go(-1)
           }
-         console.log(this.queryParams)
-         this.queryParams.image = JSON.stringify(this.queryParams.image)
-         this.queryParams.file = JSON.stringify(this.queryParams.file)
-          if(this.queryParams.pageNum !== undefined){
-            this.queryParams.pageNum = undefined
-          }
-          if(this.queryParams.pageSize !== undefined){
-            this.queryParams.pageSize = undefined
+          // this.msgSuccess("反提交成功");
+          // this.open = false;
+          // this.getList();
+        });
+      },
+      changeFn(obj) {
+        for (let key in obj) {
+          this.queryParams[key] = obj[key]
+        }
+      },
+      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
+              console.log(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.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName])
+            }
           }
-          if(index == '删除'){
-            //删除
-            this.handleDelete(this.deledlid)
-          }else if(index == '提交'){
-            //提交  保存
-             // 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 == '反提交'){
-            //反提交  保存
-             // 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 == '保存'){
-            // 修改
-            // this.forme.table = 'obj_test'
-            // this.forme.objId = 1
-            this.forme.fixedData = this.queryParams
-            this.submitForm()
-          }else if(index == '返回'){
-           // if(this.xidugje ==0){
-           //    this.$router.go(-2)
-           // }else{
-             this.$router.go(-1)
-           // }
-         }else if(index == '刷新'){
-           // this.xidugje = 1
-           this.reload()
-         }
-
-         console.log(this.forme)
-         // this.getList();
-       },
+        }
+        console.log(this.queryParams)
+        this.queryParams.image = JSON.stringify(this.queryParams.image)
+        this.queryParams.file = JSON.stringify(this.queryParams.file)
+        if (this.queryParams.pageNum !== undefined) {
+          this.queryParams.pageNum = undefined
+        }
+        if (this.queryParams.pageSize !== undefined) {
+          this.queryParams.pageSize = undefined
+        }
+        if (index == '删除') {
+          //删除
+          this.handleDelete(this.deledlid)
+        } else if (index == '提交') {
+          //提交  保存
+          // 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 == '反提交') {
+          //反提交  保存
+          // 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 == '保存') {
+          // 修改
+          // this.forme.table = 'obj_test'
+          // this.forme.objId = 1
+          this.forme.fixedData = this.queryParams
+          this.submitForm()
+        } else if (index == '返回') {
+          // if(this.xidugje ==0){
+          //    this.$router.go(-2)
+          // }else{
+          this.$router.go(-1)
+          // }
+        } else if (index == '刷新') {
+          // this.xidugje = 1
+          this.reload()
+        }
+
+        console.log(this.forme)
+        // this.getList();
+      },
       /** 新增 修改提交按钮 */
       submitForm: function() {
-              addbjectSave(this.forme).then(response => {
-                this.msgSuccess("保存成功");
-                this.open = false;
+        this.$refs["queryForm"].validate(valid => {
+          if (valid) {
+            addbjectSave(this.forme).then(response => {
+              this.msgSuccess("保存成功");
+              this.open = false;
+              this.$router.go(-1)
+              // this.getList();
+            });
+          }
+        });
+      },
+      // 提交反提交
+      antiSubmission() {
+        this.$refs["queryForm"].validate(valid => {
+          if (valid) {
+            if (this.formy.status == 1) {
+              // 提交
+              tableSubimt(this.formeanti).then(response => {
+                this.msgSuccess("提交成功");
                 this.$router.go(-1)
+                // this.open = false;
                 // this.getList();
               });
-      },
-      // 提交反提交
-      antiSubmission(){
-        if (this.formy.status == 1) {
-          // 提交
-          tableSubimt(this.formeanti).then(response => {
-            this.msgSuccess("提交成功");
-            this.$router.go(-1)
-            // this.open = false;
-            // this.getList();
-          });
-        } else if(this.formy.status == 2){
-          // 反提交
-          tableSubimtanit(this.formeanti).then(response => {
-            this.msgSuccess("反提交成功");
-            this.$router.go(-1)
-            // this.open = false;
-            // this.getList();
-          });
-        }
+            } else if (this.formy.status == 2) {
+              // 反提交
+              tableSubimtanit(this.formeanti).then(response => {
+                this.msgSuccess("反提交成功");
+                this.$router.go(-1)
+                // this.open = false;
+                // this.getList();
+              });
+            }
+          }
+        });
       },
       //删除
       handleDelete(index) {
         this.$confirm('是否确认删除', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-            return delMenutab(index);
-          }).then(() => {
-            // this.getList();
-            this.msgSuccess("删除成功");
-            this.$router.go(-1)
-          })
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delMenutab(index);
+        }).then(() => {
+          // this.getList();
+          this.msgSuccess("删除成功");
+          this.$router.go(-1)
+        })
       }
-      },
-    };
-
+    },
+  };
 </script>
 
-<style  lang="scss">
-  .eniting_header{
-    .el-divider--horizontal{
+<style lang="scss">
+  .eniting_header {
+    .el-divider--horizontal {
       margin-top: 0;
     }
   }
-  .eniting_nav{
+
+  .eniting_nav {
+
     // .el-form-item{
     //   width: 25% !important;
     //   }
-    .el-collapse-item__content{
+    .el-collapse-item__content {
       padding-bottom: 0;
     }
-    .el-collapse-item__wrap{
+
+    .el-collapse-item__wrap {
       border-bottom: 0;
     }
-    .el-collapse-item__header{
+
+    .el-collapse-item__header {
       border-bottom: 0;
       font-size: 15px;
       font-family: PingFang SC;
@@ -346,118 +368,138 @@
       color: #3C8DBC;
       line-height: 36px;
     }
+
     // .el-form-item__content{
     //   width: 65%;
     // }
-    .textarea_et{
-    width: 95%;
-    .el-form-item__content{
-      width: 80%;
-      height: 83px;
-      .el-textarea__inner{
-        height: 100%;
-      }
+    .textarea_et {
+      width: 95%;
+
+      .el-form-item__content {
+        width: 80%;
+        height: 83px;
+
+        .el-textarea__inner {
+          height: 100%;
+        }
       }
     }
-    .textarea_etyju{
+
+    .textarea_etyju {
       width: 90%;
-      .el-form-item__content{
+
+      .el-form-item__content {
         width: 75%;
+
         // height: 83px;
-        .el-textarea__inner{
+        .el-textarea__inner {
           // height: 100%;
         }
-        }
+      }
     }
-    .textarea_ety{
+
+    .textarea_ety {
       width: 100%;
-      .el-form-item__content{
+
+      .el-form-item__content {
         width: 88%;
         height: 150px;
         margin-bottom: 0;
-        .el-textarea__inner{
+
+        .el-textarea__inner {
           height: 100%;
         }
-        }
+      }
     }
-    .el-collapse{
+
+    .el-collapse {
       border-top: 0;
     }
-    .eitde{
+
+    .eitde {
       background-color: #fff;
       border-radius: 6px;
       padding: 23px;
       margin-bottom: 20px;
     }
   }
-
 </style>
 
 <style scoped lang="scss">
-  .eniting{
-    p{
+  .eniting {
+    p {
       margin: 0;
     }
+
     background-color: #eef0ff;
     height: 100%;
     padding: 20px;
-    .eniting_header{
-       background-color: #fff;
-       border-radius: 6px;
-       padding: 23px;
-       margin-bottom: 20px;
-     .p{
+
+    .eniting_header {
+      background-color: #fff;
+      border-radius: 6px;
+      padding: 23px;
+      margin-bottom: 20px;
+
+      .p {
         font-size: 15px;
         font-weight: bold;
         color: #3C8DBC;
         line-height: 36px;
         margin-bottom: 0;
-       }
-     .p::before{
-       content: "";
-       display: block;
-       width: 18px;
-       height: 8px;
-       background: #3C8DBC;
-       border-radius: 3px;
-
-     }
-     .ppl{
-       display: flex;
-       height: 54px;
-       p{
-         position: relative;
-         width: 113px;
-         height: 38px;
-         img{
-           position: absolute;
-           top:0;
-           left: 0;
-           width: 100%;
-           height: 100%;
-           // z-index: -1;
-         }
-         span{
-           width: 100%;
-           position: absolute;
-           top: 0;
-           left: 0;
-           // transform: translate(-50%);
-           text-align: center;
-           line-height: 38px;
-           font-size: 15px;
-           font-family: PingFang SC;
-           font-weight: bold;
-           color: #aaa;
-         }
-         .span{
-           color: #3C8DBC;
-         }
-       }
-     }
+      }
+
+      .p::before {
+        content: "";
+        display: block;
+        width: 18px;
+        height: 8px;
+        background: #3C8DBC;
+        border-radius: 3px;
+
+      }
+
+      .ppl {
+        display: flex;
+        height: 54px;
+
+        p {
+          position: relative;
+          width: 113px;
+          height: 38px;
+
+          img {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            // z-index: -1;
+          }
+
+          span {
+            width: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+            // transform: translate(-50%);
+            text-align: center;
+            line-height: 38px;
+            font-size: 15px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #aaa;
+          }
+
+          .span {
+            color: #3C8DBC;
+          }
+        }
+      }
     }
+
     // 内容
-    .eniting_nav{
+    .eniting_nav {
       // background-color: #fff;
       // border-radius: 6px;
       // padding: 23px;

+ 18 - 10
ruoyi-ui/src/views/system/form/index.vue

@@ -9,16 +9,16 @@
     </div>
     <!-- 内容 -->
     <div class="table_nav">
-      <el-collapse v-model="activeNames">
+      <el-collapse v-model="activeNames">
+         <el-form :model="queryParams" ref="queryForm" :rules="queryData.rules" :inline="true" label-width="120px">
         <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="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>
+        </el-form>
         <!-- 列表 -->
         <el-collapse-item :title="title" name="index"  class="eitde" v-if="tabShoes">
           <div class="ppl">
@@ -315,15 +315,21 @@
       },
      /** 新增 修改提交按钮 */
      submitForm: function() {
-             addbjectSave(this.forme).then(response => {
-               this.msgSuccess("保存成功");
-               this.open = false;
-               this.$router.go(-1)
-               // this.getList();
-             });
+       this.$refs["queryForm"].validate(valid => {
+         if (valid) {
+           addbjectSave(this.forme).then(response => {
+             this.msgSuccess("保存成功");
+             this.open = false;
+             this.$router.go(-1)
+             // this.getList();
+           });
+         }
+       });
      },
      // 提交反提交
      antiSubmission(){
+       this.$refs["queryForm"].validate(valid => {
+         if (valid) {
        if (this.formy.status == 1) {
          // 提交
          tableSubimt(this.formeanti).then(response => {
@@ -341,6 +347,8 @@
            // this.getList();
          });
        }
+       }
+       });
      },
      //删除
      handleDelete(index) {

+ 9 - 10
ruoyi-ui/src/views/system/surface/index.vue

@@ -118,7 +118,7 @@
         path
       } = route;
       let items = this.sidebarRouters.filter(res => {
-        return res.path == ('/'+ path.split('/')[1])
+        return res.path == ('/' + path.split('/')[1])
       })[0].children.filter(res => {
         return res.path == path.split('/')[2]
       })[0]
@@ -129,8 +129,8 @@
       this.getList();
     },
     methods: {
-      routerFn(id,tables) {
-        if(this.queryData.viewType == 'crud'){
+      routerFn(id, tables) {
+        if (this.queryData.viewType == 'crud') {
           this.$router.push({
             path: '/business/table',
             query: {
@@ -138,7 +138,7 @@
               tables,
             },
           })
-        }else if(this.queryData.viewType == 'headTab') {
+        } else if (this.queryData.viewType == 'headTab') {
           this.$router.push({
             path: '/business/editing',
             query: {
@@ -146,7 +146,7 @@
               tables,
             },
           })
-        }else if(this.queryData.viewType == 'itemTab'){
+        } else if (this.queryData.viewType == 'itemTab') {
           this.$router.push({
             path: '/business/form',
             query: {
@@ -160,7 +160,7 @@
         switch (item) {
           case 'A':
             {
-              this.routerFn(-1,this.tabName)
+              this.routerFn(-1, this.tabName)
               return
             }
           case 'M':
@@ -170,7 +170,7 @@
                 return
               }
               const id = this.ids.join(',')
-              this.routerFn(id,this.tabName)
+              this.routerFn(id, this.tabName)
               return
             }
           case 'D':
@@ -281,8 +281,7 @@
           this.queryData = data
         })
       },
-      handleChange(val) {
-      }
+      handleChange(val) {}
     },
   };
 </script>
@@ -372,4 +371,4 @@
     margin: 0;
 
   }
-</style>
+</style>

+ 22 - 18
ruoyi-ui/src/views/system/table/index.vue

@@ -12,7 +12,7 @@
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-form :model="queryParams" ref="queryForm" :inline="true" :rules="queryData.rules" label-width="120px">
         <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" >
-          
+
             <el-row :gutter="0">
               <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' />
@@ -308,23 +308,27 @@
       },
       // 提交反提交
       antiSubmission(){
-        if (this.formy.status == 1) {
-          // 提交
-          tableSubimt(this.formeanti).then(response => {
-            this.msgSuccess("提交成功");
-            this.$router.go(-1)
-            // this.open = false;
-            // this.getList();
-          });
-        } else if(this.formy.status == 2){
-          // 反提交
-          tableSubimtanit(this.formeanti).then(response => {
-            this.msgSuccess("反提交成功");
-            this.$router.go(-1)
-            // this.open = false;
-            // this.getList();
-          });
-        }
+        this.$refs["queryForm"].validate(valid => {
+          if (valid) {
+            if (this.formy.status == 1) {
+              // 提交
+              tableSubimt(this.formeanti).then(response => {
+                this.msgSuccess("提交成功");
+                this.$router.go(-1)
+                // this.open = false;
+                // this.getList();
+              });
+            } else if(this.formy.status == 2){
+              // 反提交
+              tableSubimtanit(this.formeanti).then(response => {
+                this.msgSuccess("反提交成功");
+                this.$router.go(-1)
+                // this.open = false;
+                // this.getList();
+              });
+            }
+          }
+        });
       },
       //删除
       handleDelete(index) {