Merge remote-tracking branch 'origin/test' into test

src/components/icss/AddMedicalName.vue

@@ -27,6 +27,7 @@
                 :searchType='searchType'
                 :similarList = 'similarList'
                 isShow = "true"
+                @closeTable = "closeTable"
              >
              </SimilarListDrag>
             </td>
@@ -84,6 +85,7 @@
                     :searchType='searchType'
                     :similarList = 'similarList'
                     :isShow = "index ===searchIndex"
+                    @closeTable = "closeTable"
                 >
                 </SimilarListDrag>
               </td>
@@ -160,6 +162,7 @@
                 :searchType='searchType'
                 :similarList = 'similarList'
                 :isShow = "index ===searchIndex"
+                @closeTable = "closeTable"
               >
               </SimilarListDrag>
             </td>
@@ -311,6 +314,7 @@ import SimilarListDrag from './SimilarListDrag'
           utils.dragBox('dragModalWrap','dragModalTitle','del')
       },
       closeTable(){
+        this.searchType = ''
         this.similarList = []
       
       },
@@ -522,6 +526,7 @@ import SimilarListDrag from './SimilarListDrag'
       },
       getSimilarList(name){
         if(!name){
+          this.closeTable()
           return
         }
         const param = {

src/components/icss/SimilarListDrag.vue

@@ -47,7 +47,7 @@ export default {
             utils.dragBox('dragModalWrap','dragModalTitle','del')
         },
         closeTable(){
-            this.similarList = []
+            this.$emit("closeTable")
         },
     }
 }

src/components/medicalTerm/AddAssistCheckMultRelation.vue

@@ -265,7 +265,9 @@ import apis from '@api/medicalTerm.js';
         api.getConceptInfoAssay(param).then((res) => {
           const { data } = res
           if(data.code == '0') {
-            this.conceptList = data.data
+            if(this.conceptText.trim()) {
+              this.conceptList = data.data
+            }
           }
         })
       },