Merge remote-tracking branch 'origin/diagBase6.0' into test

src/components/knowledgeExtra/DiagBaseItem.vue

@@ -116,7 +116,7 @@
             </el-form-item>
             <el-form-item v-if="(!onlyNum&&!showRegx&&groupData.basType===2&&groupData.dataType==='2')||onlyTxt" label="医学内容：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
                 <el-input placeholder="请输入医学内容" v-model.trim="groupData.eqValue"></el-input>
-                <span class="tip-text">注：只能输入升高、降低、阴性、阳性~</span>
+                <span class="tip-text">注：可输入升高、降低、阴性、阳性等~</span>
             </el-form-item>
             <el-form-item v-if="showRegx" label="正则表达式：" :prop="ruleLine+ind+'.eqValue'" class="discDesc is-required">
                 <el-input type="textarea" rows="3" placeholder="请输入正则表达式" v-model.trim="groupData.eqValue"></el-input>

src/components/knowledgeExtra/DiseaseTree.vue

@@ -57,7 +57,8 @@
     </div>
     <div class="btmFix"></div>
     <SearchList 
-      v-if="showSearch" 
+      v-if="showSearch"
+      ref="searchDom"
       :conceptList="conceptList||[]" 
       :addLevel="addLevel"
       placeTxt="请输入术语"
@@ -335,11 +336,17 @@ export default {
         this.showSearch = true
       },
       closeSearch() {
-        this.conceptText = ''
         this.conceptList = []
         this.showSearch = false
       },
       append(data, e) {
+          if(this.$refs.searchDom){console.log(this.$refs.searchDom.$refs.conceptInput)
+              this.conceptList = [];
+              setTimeout(()=>{
+                  this.$refs.searchDom.$refs.conceptInput.value="";
+              })
+
+          }
           this.addLevel = data.level+1;
           this.relationConceptId = data.conceptId
           this.operaList = data;