Merge branch 'knowledgeExtra_0521' into test

src/components/basicKnow/AddTerm.vue

@@ -260,8 +260,8 @@
               <div-editable v-model="klLisVO.qualitative" :Maincontent="'Maincontent'"></div-editable>
             </el-form-item>
             <div
-              v-if="data.type=='实验室检查子项目'"
-              style=" display:inlne;position: relative;right: -530px;top: -40px;"
+              v-if="data.type=='实验室检查子项目' && (radio == 1 || klLisVO.minValue || klLisVO.maxValue)"
+              style="width:300px; display:inlne;position: relative;right: -530px;top: -40px;"
             >
               <span style="margin-right:15px">范围</span>
               <el-select v-model="klLisVO.type">
@@ -1085,7 +1085,7 @@ export default {
                 ? redata.klDiseaseDTO
                 : this.klDiseaseVO;
               this.radio =
-                this.klLisVO.minValue || this.klLisVO.maxValue ? 1 : 2;
+                this.klLisVO.qualitative == '' ? 1 : 2;
               this.klTcmDiseaseVO = redata.klTcmDiseaseDTO
                 ? redata.klTcmDiseaseDTO
                 : this.klTcmDiseaseVO;

src/components/basicKnow/DivEditable.vue

@@ -44,7 +44,6 @@ export default {
       let text = event.target.innerText;
       let len = text.length;
       this.onshow = len > 0 ? false : true;
-      console.log(len)
       this.valueHandle(event, text);
       this.$emit('input', text);
     },
@@ -110,17 +109,17 @@ export default {
   font-size: 14px;
 }
 .test_box {
-  min-height: 40px;
+  min-height: 20px;
   max-height: 300px;
   outline: 0;
   border: 1px solid #dcdfe6;
   font-size: 14px;
-  line-height: 40px;
-  padding: 0 16px;
+  line-height: 1.5;
   word-wrap: break-word;
   overflow-x: hidden;
   overflow-y: auto;
   border-radius: 4px;
   margin-top: 6px;
+  padding: 10px 15px;
 }
 </style>

src/components/basicKnow/searchTerm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="address-placeholder" v-show="!onshow && items.length == 0" @click="getfouce">请输入</div>
+    <div class="address-placeholder" v-show="!onshow && items.length == 0" @click="getfouce">请输入要选择的内容</div>
     <div class="source" @click="getfouce">
       <div class="select">
         <transition-group name="flip-list">
@@ -26,6 +26,7 @@
           v-model="value"
           @input="handleInput"
         />
+        <i class="el-icon-arrow-down"></i>
       </div>
       <ul class="list" v-if="conceptList.length>0 && onshow">
         <li
@@ -50,7 +51,7 @@ export default {
   props: ['type', 'refbool'],
   data() {
     return {
-      innerText:'',
+      innerText: '',
       conceptList: [],
       oldNum: 0,
       newNum: 0,
@@ -74,8 +75,8 @@ export default {
   },
   methods: {
     handleInput(event) {
-      let text = event.data?event.data:'';
-      let len =  text.length;
+      let text = event.data ? event.data : '';
+      let len = text.length;
       this.onshow = len > 0 ? true : false;
       const param = {
         excludedConceptIds: [],
@@ -89,10 +90,11 @@ export default {
             const data = res.data.data;
             this.conceptList = data;
             this.onshow = true;
-            
-            this.items.forEach(item=>{
-              this.conceptList = this.conceptList.filter(it => it.conceptId !== item.conceptId)
-            })
+            this.items.forEach(item => {
+              this.conceptList = this.conceptList.filter(
+                it => it.conceptId !== item.conceptId
+              );
+            });
           }
         })
         .catch(error => {
@@ -102,14 +104,14 @@ export default {
     getfouce() {
       this.$refs.inputVal.focus();
     },
-    getTag(item,index) {
+    getTag(item, index) {
       var v = this.items.some(el => {
         return el.conceptName == item.conceptName;
       });
       if (v) {
         return;
       }
-      this.conceptList.splice(index,1)
+      this.conceptList.splice(index, 1);
       this.items.push(item);
       this.onshow = true;
     },
@@ -118,7 +120,7 @@ export default {
     },
     unblur() {
       this.onshow = false;
-      this.conceptList = []
+      this.conceptList = [];
       this.value = '';
     },
     shuffle() {
@@ -191,7 +193,11 @@ export default {
     background: #f5f7fa;
   }
 }
-
+.el-icon-arrow-down {
+  position: absolute;
+  top: 21px;
+  right: 15px;
+}
 .source {
   min-height: 40px;
   outline: 0;