提交

ruoyi-ui/src/components/DynamicFormsteo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- <el-row  class="row-bg"> -->
-  <el-col :span="this.formConfig.tableColumnuy !== null? this.formConfig.tableColumnuy : 8 "  >
+  <el-col :span="ieug !== null? ieug : 8 "  >
   <el-form-item   :label="formConfig.columnComment"  :prop="formConfig.columnName">
     <!-- 输入框 -->
     <el-input v-if="formConfig.htmlType == 'input'" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
@@ -87,7 +87,8 @@
           pageSize: 10,
           fixedData: {
             condition: {}
-          }
+          },
+          ieug:8
         },
       }
     },
@@ -121,6 +122,14 @@
           this.formConfig.fkInfo=false
         }
       }
+      if(this.formConfig.tableColumnuy == null){
+        this.ieug = null
+      }else{
+        this.ieug = 24 / (this.formConfig.tableColumnuy -0)
+      }
+        
+      
+      console.log(this.formConfig.tableColumnuy -0)
       this.init()
     },
     watch: {

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

@@ -262,22 +262,20 @@
           // 图片的显示隐藏
           if(this.queryData.showData.length !==0){
            this.queryData.showData.filter(route => {
+             route.hrChildren.filter(routerst =>{
+               if(this.queryData.table_column == undefined){
+                 this.queryData.table_column = null
+               }
+               routerst.tableColumnuy = this.queryData.table_column
+             })
                if(route.cssClass !== null){
                  this.imgShoew = route.cssClass
                  if(route.cssClass == 2 || route.cssClass == 4 ){
                    route.hrChildren.filter(routers =>{
-                    if(this.queryData.table_column == undefined){
-                      this.queryData.table_column = null
-                    }
-                    routers.tableColumnuy = this.queryData.table_column
                      routers.isonliy = true
                    })
                  }else{
                    route.hrChildren.filter(routers =>{
-                     if(this.queryData.table_column == undefined){
-                       this.queryData.table_column = null
-                     }
-                     routers.tableColumnuy = this.queryData.table_column
                      routers.isonliy = false
                    })
                  }

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

@@ -280,7 +280,6 @@
                  if(route.cssClass == 2 || route.cssClass == 4){
                    route.hrChildren.filter(routers =>{
                      routers.isonliy = true
-
                    })
                  }else{
                    route.hrChildren.filter(routers =>{
@@ -598,11 +597,16 @@
          //删除
          this.handleDeletetwo(this.deledlid)
        }  else if(index == '新增'){
-         if(this.cielsshow == true){
-           this.routerFn(-1, this.tabName,this.oieufr,this.forme.table)
+         if(this.objParams.fixedData.id !== -1){
+            this.routerFn(-1, this.tabName,this.oieufr,this.forme.table)
          }else{
-           this.msgInfo('基本信息暂未保存')
+           if(this.cielsshow == true){
+             this.routerFn(-1, this.tabName,this.oieufr,this.forme.table)
+           }else{
+             this.msgInfo('基本信息暂未保存')
+           }
          }
+         
        }else if(index == '修改'){
          if (this.single) {
            this.msgInfo('请勾选一条信息')

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

@@ -268,7 +268,7 @@
                if(this.queryData.table_column == undefined){
                  this.queryData.table_column = null
                }
-               routerst.tableColumnuy = 34
+               routerst.tableColumnuy = this.queryData.table_column
              })
             if(route.cssClass !== null){
               this.imgShoew = route.cssClass