yrik %!s(int64=4) %!d(string=hai) anos
pai
achega
cfab87b2f0

BIN=BIN
ruoyi-ui/src/assets/images/pic_sy_ytj.png


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

@@ -7,7 +7,7 @@
     <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]"
       :placeholder="'请输入'+formConfig.columnComment" clearable @keyup.enter.native="handleQuery" :disabled="formConfig.disabshow"/>
     <!-- 下拉框 -->
-    <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(!formConfig.fkInfo.fkTableName)"
+    <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(!formConfig.fkInfo)"
       filterable :placeholder="'请输入'+formConfig.columnComment" :disabled="formConfig.disabshow">
       <el-option v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictLabel"
         :value="itemChild.dictValue">
@@ -102,6 +102,7 @@
     created() {
       this.config = {}
       // console.log(this.formConfig.mask.slice(3,4),876454)
+      console.log(this.formConfig.fkInfo)
       if(this.formConfig.readonly == true){
         this.formConfig.disabshow = true
       }else if(this.formConfig.mask.slice(3,4) == '0'){
@@ -109,6 +110,10 @@
       }else{
         this.formConfig.disabshow = false
       }
+      console.log(this.formConfig.fkInfo.fkTableName)
+      if(this.formConfig.fkInfo == null){
+          this.formConfig.fkInfo=false
+      }
       this.init()
     },
     mounted() {},

+ 20 - 1
ruoyi-ui/src/views/system/editing/index.vue

@@ -3,7 +3,7 @@
     <!-- 头部 -->
     <div class="eniting_header">
       <!-- <p class="p">表编辑</p> -->
-      <p></p>
+      <div class="imge_tab"><img src="../../../assets/images/pic_sy_ytj.png" alt="" v-if="imgShoew"></div>
       <div class="ppl">
         <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">
@@ -95,6 +95,7 @@
         },
         jeigneu: [],
         jeigneutwo: [],
+        imgShoew:true
       };
     },
     mounted() {
@@ -187,6 +188,18 @@
           this.jeigneutwo.push('刷新')
           this.jeigneutwo.push('返回')
           console.log(this.queryData, 567)
+          // 图片的显示隐藏
+          if(this.queryData.showData.length !==0){
+           this.queryData.showData.filter(route => {
+               if(route.hrChildren.length !== 0){
+                  if(route.hrChildren[1].readonly == true){
+                        this.imgShoew = true
+                  }else{
+                    this.imgShoew = false
+                  }
+               }
+           })
+          }
         })
       },
       // 数据信息
@@ -339,6 +352,7 @@
 
 <style lang="scss">
   .eniting_header {
+    position: relative;
     .el-divider--horizontal {
       margin-top: 0;
     }
@@ -502,4 +516,9 @@
       // padding: 23px;
     }
   }
+  .imge_tab{
+    position: absolute;
+    right: 0;
+    top: 5px;
+  }
 </style>

+ 23 - 3
ruoyi-ui/src/views/system/form/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="tabForm">
-    <div class="tabForm_header">
+    <div class="tabForm_header">
+      <div class="imge_tab"><img src="../../../assets/images/pic_sy_ytj.png" alt="" v-if="imgShoew"></div>
       <div class="table_headerBtun" v-if="queryData.buttonList">
         <el-button type="primary" size="small" plain @click="handleQuery(item)" v-for="(item,index) in queryData.buttonList.split('')" :key="index">{{item | btnConversion}}</el-button>
         <el-button type="primary" size="small" plain @click="handleQuery('sx')">刷新</el-button>
@@ -120,7 +121,8 @@
         deledlid:{
           table:'',
           idList:[]
-        }
+        },
+        imgShoew:true
       };
     },
     filters:{
@@ -199,6 +201,18 @@
           console.log(res)
           let data = res.data
           this.queryData = data
+          // 图片的显示隐藏
+          if(this.queryData.showData.length !==0){
+           this.queryData.showData.filter(route => {
+               if(route.hrChildren.length !== 0){
+                  if(route.hrChildren[1].readonly == true){
+                        this.imgShoew = true
+                  }else{
+                    this.imgShoew = false
+                  }
+               }
+           })
+          }
           if(this.xidugje == 'sx'){
             if(res.code == 200){
               this.msgSuccess("操作成功");
@@ -231,6 +245,7 @@
          this.total = res.data.total - 0
          console.log(this.total)
          console.log(this.postList,567)
+
        })
       },
       // tab点击
@@ -426,7 +441,7 @@
       border-radius: 6px;
       padding: 23px;
       margin-bottom: 20px;
-
+      position: relative;
     }
 
     // 内容
@@ -514,5 +529,10 @@
       color: #3C8DBC;
       border-bottom: 3px solid #3C8DBC;
     }
+  }
+  .imge_tab{
+    position: absolute;
+    right: 0;
+    top: 5px;
   }
 </style>

+ 26 - 4
ruoyi-ui/src/views/system/table/index.vue

@@ -2,7 +2,8 @@
   <div class="table_total">
     <div class="table_header">
       <!-- <p>单表</p>
-      <el-divider></el-divider> -->
+      <el-divider></el-divider> -->
+      <div class="imge_tab"><img src="../../../assets/images/pic_sy_ytj.png" alt="" v-if="imgShoew" ></div>
       <div class="table_headerBtun" 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>
@@ -81,7 +82,8 @@
         jeigneu:[],
         jeigneutwo:[],
         xidugje:0,
-        tijeq:0
+        tijeq:0,
+        imgShoew:true
       };
     },
     // filters:{
@@ -215,6 +217,7 @@
           console.log(res.data)
           this.queryData = {}
           this.queryData = data
+          // imgShoew
           this.jeigneutwo = []
           this.jeigneu = []
           this.jeigneu = data.buttonList.split('')
@@ -262,13 +265,26 @@
           })
           this.jeigneutwo.push('刷新')
           this.jeigneutwo.push('返回')
-          console.log(this.jeigneutwo,567)
-          console.log(this.xidugje)
+          // console.log(this.jeigneutwo,567)
+          // console.log(this.xidugje)
           if(this.xidugje == '刷新'){
             if(res.code == 200){
               this.msgSuccess("操作成功");
             }
           }
+         // 图片的显示隐藏
+         if(this.queryData.showData.length !==0){
+          this.queryData.showData.filter(route => {
+              if(route.hrChildren.length !== 0){
+                 if(route.hrChildren[1].readonly == true){
+                       this.imgShoew = true
+                 }else{
+                   this.imgShoew = false
+                 }
+              }
+          })
+         }
+
 
         })
       },
@@ -350,6 +366,7 @@
 
 <style  lang="scss">
   .table_header{
+    position: relative;
     .el-divider--horizontal{
       margin-top: 16px;
     }
@@ -419,4 +436,9 @@
     margin: 0;
 
   }
+  .imge_tab{
+    position: absolute;
+    right: 0;
+    top: 5px;
+  }
 </style>