提交

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

@@ -106,11 +106,11 @@
     created() {
       this.config = {}
       // console.log(this.formConfig.mask.slice(3,4),876454)
-      console.log(this.formConfig.fkInfo)
+      console.log(this.formConfig)
       if(this.type){
         if(this.formConfig.readonly == true){
           this.formConfig.disabshow = true
-        }else if(this.formConfig.mask.slice(3,4) == '0'){
+        }else if(this.formConfig.mask.slice(3,4) == '0' || this.formConfig.isonliy == true){
           this.formConfig.disabshow = true
         }else{
           this.formConfig.disabshow = false

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

@@ -202,6 +202,19 @@
            this.queryData.showData.filter(route => {
                if(route.cssClass !== null){
                  this.imgShoew = route.cssClass
+                 if(route.cssClass == 2 || route.cssClass == 4){
+                   console.log(34)
+                   route.hrChildren.filter(routers =>{
+                     routers.isonliy = true
+                   })
+                   // route.routers = true
+                 }else{
+                   console.log(123)
+                   route.hrChildren.filter(routers =>{
+                     routers.isonliy = false
+                   })
+                   // route.isonliy = false
+                 }
                }
            })
           }

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

@@ -248,6 +248,19 @@
            this.queryData.showData.filter(route => {
                if(route.cssClass !== null){
                  this.imgShoew = route.cssClass
+                 if(route.cssClass == 2 || route.cssClass == 4){
+                   console.log(34)
+                   route.hrChildren.filter(routers =>{
+                     routers.isonliy = true
+                   })
+                   // route.routers = true
+                 }else{
+                   console.log(123)
+                   route.hrChildren.filter(routers =>{
+                     routers.isonliy = false
+                   })
+                   // route.isonliy = false
+                 }
                }
            })
           }

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

@@ -8,7 +8,7 @@
          <img src="../../../assets/images/pic_sy_shz.png" alt="" v-if="imgShoew == 4" >
           <img src="../../../assets/images/pic_sy_ybh.png" alt="" v-if="imgShoew == 3" >
       </div>
-      <div class="table_headerBtun" v-if="queryData.buttonList">
+      <div class="table_headerBtun table_headerBtuntwo" v-if="queryData.buttonList">
         <el-button type="primary" size="mini" plain v-for="(item,index) in jeigneutwo" :key="index" @click="handleQuery(item)">{{item}}</el-button>
       </div>
     </div>
@@ -17,7 +17,6 @@
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-form :model="queryParams" :rules="queryData.rules" ref="queryForm" :inline="true" label-width="120px">
           <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index">
-
             <el-row>
               <el-col :span="24" :key="index">
                 <dynamic-forms @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren"
@@ -291,6 +290,19 @@
           this.queryData.showData.filter(route => {
             if(route.cssClass !== null){
               this.imgShoew = route.cssClass
+              if(route.cssClass == 2 || route.cssClass == 4){
+                console.log(34)
+                route.hrChildren.filter(routers =>{
+                  routers.isonliy = true
+                })
+                // route.routers = true
+              }else{
+                console.log(123)
+                route.hrChildren.filter(routers =>{
+                  routers.isonliy = false
+                })
+                // route.isonliy = false
+              }
             }
           })
          }
@@ -431,6 +443,9 @@
         border-radius: 3px;
 
       }
+      .table_headerBtuntwo{
+        margin-bottom: 0 !important;
+      }
      }
      // 内容
      .headertable_nav{