Merge branch 'termLink0615' into test

src/components/common/LtModal.vue

@@ -221,11 +221,11 @@ export default {
       this.form.source = this.data.source;
       this.form.hisCode = this.data.hisCode;
       let name
-      if (this.data.hisName !== '' && this.data.hisDetailName === '') {
+      if (this.data.hisName !== '' && this.data.hisDetailName === '' && this.type == 1) {
         this.ty = 1; // 1-化验大项、2-化验小项
         this.searchType = 1
         name = this.data.hisName;
-      } else if (this.data.hisName !== '' && this.data.hisDetailName !== '') {
+      } else if (this.data.hisName !== '' && this.data.hisDetailName !== '' && this.type == 1) {
         this.ty = 2;
         this.searchType = 2
         name = this.data.hisDetailName;
@@ -363,6 +363,7 @@ export default {
         type: type ? type : this.type,
         inputStr: name ? name :this.form.hisName
       };
+      console.log(params)
       api.getTermMatching(params).then(res => {
         this.showDrop = false;
         if (res.data.code === '0') {