sr 4 gadi atpakaļ
vecāks
revīzija
7104da287a

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


+ 5 - 0
ruoyi-ui/src/components/DynamicForms/index.vue

@@ -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()
     },
     watch: {

+ 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() {
@@ -189,6 +190,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
+                  }
+               }
+           })
+          }
         })
       },
       // 数据信息
@@ -341,6 +354,7 @@
 
 <style lang="scss">
   .eniting_header {
+    position: relative;
     .el-divider--horizontal {
       margin-top: 0;
     }
@@ -504,4 +518,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:{
@@ -202,6 +204,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("操作成功");
@@ -234,6 +248,7 @@
          this.total = res.data.total - 0
          console.log(this.total)
          console.log(this.postList,567)
+
        })
       },
       // tab点击
@@ -429,7 +444,7 @@
       border-radius: 6px;
       padding: 23px;
       margin-bottom: 20px;
-
+      position: relative;
     }
 
     // 内容
@@ -517,5 +532,10 @@
       color: #3C8DBC;
       border-bottom: 3px solid #3C8DBC;
     }
+  }
+  .imge_tab{
+    position: absolute;
+    right: 0;
+    top: 5px;
   }
 </style>

+ 183 - 120
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>
@@ -52,38 +53,39 @@
         queryParams: {
 
         },
-        labletit: '查询参数1233',
-        tableZbie: {
-          table: '',
-          isUi: true,
-          fixedData: {
-            id: -1
-          }
-
-        },
-        taleLisst: [],
-        forme: {
-          table: '',
-          objId: -1,
-          fixedData: {}
-        },
-        formeanti: {
-          table: '',
-          commitData: [],
-        },
-        formy: {
-          id: 0,
-          status: 1
-        },
-        // 删除参数
-        deledlid: {
-          table: '',
-          idList: []
-        },
-        jeigneu: [],
-        jeigneutwo: [],
-        xidugje: 0,
-        tijeq: 0
+        labletit: '查询参数1233',
+        tableZbie:{
+          table:'',
+          isUi:true,
+          fixedData:{
+            id:-1
+          }
+
+        },
+        taleLisst:[],
+        forme:{
+          table:'',
+          objId:-1,
+          fixedData:{}
+        },
+        formeanti:{
+          table:'',
+          commitData:[],
+        },
+        formy:{
+          id:0,
+          status:1
+        },
+        // 删除参数
+        deledlid:{
+          table:'',
+          idList:[]
+        },
+        jeigneu:[],
+        jeigneutwo:[],
+        xidugje:0,
+        tijeq:0,
+        imgShoew:true
       };
     },
     // filters:{
@@ -218,64 +220,77 @@
         getTableQuery(
           this.tableZbie
         ).then(res => {
-          let data = res.data
-          this.queryData = {}
-          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') {
-              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.jeigneutwo, 567)
-          console.log(this.xidugje)
-          if (this.xidugje == '刷新') {
-            if (res.code == 200) {
-              this.msgSuccess("操作成功");
-            }
-          }
-
+          let data = res.data
+          console.log(res.data)
+          this.queryData = {}
+          this.queryData = data
+          // imgShoew
+          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'){
+              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.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
+                 }
+              }
+          })
+         }
         })
       },
       tablsie() {
@@ -353,35 +368,83 @@
   };
 </script>
 
-
-<style lang="scss">
-  .table_header {
-    .el-divider--horizontal {
-      margin-top: 16px;
-    }
-  }
-
-  .headertable_nav {
-    .el-collapse-item__wrap {
-      border-bottom: 0;
-    }
-
-    .el-collapse-item__header {
-      border-bottom: 0;
-      font-size: 15px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #3C8DBC;
-      line-height: 36px;
-    }
-
-    // .el-form-item__content{
-    //   width: 55%;
-    // }
-    .el-collapse {
-      border-top: 0;
-    }
-  }
+<style  lang="scss">
+  .table_header{
+    position: relative;
+    .el-divider--horizontal{
+      margin-top: 16px;
+    }
+  }
+  .headertable_nav{
+    .el-collapse-item__wrap{
+      border-bottom: 0;
+    }
+    .el-collapse-item__header{
+      border-bottom: 0;
+      font-size: 15px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #3C8DBC;
+      line-height: 36px;
+    }
+    // .el-form-item__content{
+    //   width: 55%;
+    // }
+    .el-collapse{
+      border-top: 0;
+    }
+  }
+
+</style>
+
+
+
+<style scoped lang="scss">
+  .app-main{
+     // background-color: #eef0ff !important;
+  }
+  .table_total{
+     background-color: #eef0ff;
+     height: 100%;
+     padding: 20px;
+     // 头部
+     .table_header{
+        background-color: #fff;
+        border-radius: 6px;
+        padding: 23px;
+        margin-bottom: 20px;
+      p{
+         font-size: 15px;
+         font-weight: bold;
+         color: #3C8DBC;
+         line-height: 36px;
+        }
+      p::before{
+        content: "";
+        display: block;
+        width: 18px;
+        height: 8px;
+        background: #3C8DBC;
+        border-radius: 3px;
+
+      }
+     }
+     // 内容
+     .headertable_nav{
+       background-color: #fff;
+       border-radius: 6px;
+       padding: 23px;
+     }
+  }
+  p{
+    margin: 0;
+
+  }
+  .imge_tab{
+    position: absolute;
+    right: 0;
+    top: 5px;
+  }
 </style>