Merge remote-tracking branch 'origin/master'

src/components/base/LtModal.vue

@@ -252,7 +252,6 @@ export default {
         this.searchType = 2;
         name = this.data.hisDetailName;
       }
-      console.log(this.ty);
       this.getTermMatching(this.ty, name);
       this.getRelatedMapping();
     }
@@ -302,11 +301,7 @@ export default {
         return;
       }
       const { hisName, hisDetailName } = this.form;
-      if (
-        hisName !== '' &&
-        (this.data.hisDetailName == null || this.data.hisDetailName === '') &&
-        this.type == 1
-      ) {
+      if (hisName !== '' && hisDetailName === '' && this.type == 1) {
         this.ty = 1;
       } else if (hisName !== '' && hisDetailName !== '' && this.type == 1) {
         this.ty = 2;
@@ -395,6 +390,7 @@ export default {
           name = hisDetailName;
         }
       }
+
       this.getTermMatching(type, name);
     },
     clear() {
@@ -429,10 +425,9 @@ export default {
             source
           } = this.form;
           // 当标准术语是套餐时，细项必须为空
-          console.log(hisDetailName);
+          console.log(this.searchType);
 
           if (this.searchType === 1 && hisDetailName !== '') {
-            console.log(123);
             this.warning('医院术语与标准术语类型不匹配，请修改');
             return;
           }