diff --git a/src/components/DictField/index.vue b/src/components/DictField/index.vue index b564eb90..802bbc78 100644 --- a/src/components/DictField/index.vue +++ b/src/components/DictField/index.vue @@ -1,19 +1,14 @@ @@ -28,6 +23,18 @@ }else{ return null; } + }, + showVal(){ + if(this.dict){ + var item= this.dict.find(k=>k.id==this.myVal) + if(item){ + return item.name + }else{ + return this.myVal + } + }else{ + return this.myVal + } } }, data(){ @@ -78,6 +85,9 @@ } , }, methods: { + showSelect(){ + this.$refs["selectRef"].$refs["selectRef"].toggleMenu(); + }, getMyAvaterInfo(item){ if(!item){ return "" @@ -146,25 +156,35 @@ margin-right:5px; align-items: center; cursor: pointer; + height: 40px; + line-height: 40px; .avater { background-color:#FF9F73; } .field-info { + + height: 40px; + line-height: 40px; margin-left: 10px; display: flex; flex-direction: column; .field-value { - font-size: 16px; + height: 20px; + line-height: 20px; + font-size: 0.75rem; } .field-label{ - height: 40px; - font-size: 14px; + height: 20px; + line-height: 20px; + font-size: 0.75rem; color: #C0C4CC; } } .my-select{ + height: 20px; + line-height: 20px; margin-left: 5px; margin-right:5px; max-width: 120px; @@ -176,7 +196,7 @@ display: none; } .field-box:hover .my-select{ - height: 40px; + height: 20px; margin-left: 5px; display: inline; } diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue index 5c9a7d7c..db087f24 100644 --- a/src/components/DictSelect/index.vue +++ b/src/components/DictSelect/index.vue @@ -1,5 +1,5 @@