Merge branch 'dev2/zhangxc' into test

src/components/icss/AddMedicalInfo.vue

@@ -11,7 +11,7 @@
                      ref="groups">
                 <el-form-item label="搜索概念:">
                   <div class="conceptSearch">
-                    <input v-model="conceptText" type="text" class="searchText">
+                    <input v-model="conceptText" @focus="focusInput" type="text" class="searchText">
                     <span class="searchName" @click="searchConcept">搜索</span>
                     <ul class="conceptList" ref="conceptList">
                       <li 
@@ -52,7 +52,7 @@
                 </el-form-item>
                 <el-form-item label="搜索小类名称:" >
                   <div class="conceptSearch  termMiniClassSearch">
-                    <input v-model="termMiniClassText" type="text" class="searchText">
+                    <input v-model="termMiniClassText" @focus="focusInput" type="text" class="searchText">
                     <span class="searchName" @click="searchTermMiniClass">搜索</span>
                     <ul class="conceptList" ref="termMiniClassNameList">
                       <li 
@@ -79,7 +79,7 @@
                 </el-form-item>
                  <el-form-item label="搜索术语类组:">
                   <div class="conceptSearch termClassSearch">
-                    <input v-model="termClassText" type="text" class="searchText">
+                    <input v-model="termClassText" @focus="focusInput" type="text"  class="searchText">
                     <span class="searchName" @click="searchTermClass">搜索</span>
                     <ul class="conceptList" ref="termClassList">
                       <li 
@@ -468,6 +468,11 @@
           }
         })
       },
+      focusInput() {
+         this.$refs['conceptList'].style.display = 'none'
+         this.$refs['termClassList'].style.display = 'none'
+         this.$refs['termMiniClassNameList'].style.display = 'none'
+      },
       selectPrimarySite() {
         this.form.twoLevelPosition = '';
         this.getTwoLevelPosition();

src/components/icss/PubIndeptTag.vue

@@ -263,7 +263,7 @@
           tipLis:[],           //提示列表
         },
         labelTypesMaps: {       //// 归属和填写单类型限制
-          '1':['1','2','5','6','7','11','99'],
+          '1':['1','2','5','6','7','11'], //联合推送暂时不用
           '3':['1','2','5','6','7', '11',],
           '4':['1','2','6','7', '11',],
           '5':['1','6']

src/components/icss/PubTagGroup.vue

@@ -237,7 +237,7 @@ export default {
         tipLis:[],           //提示列表
       },
       labelTypesMaps: {       //// 归属和填写单类型限制
-        '1':['2','3','4','11'],
+        '1':['2','3','4'],  //推送类型暂时不用
         '3':['2','4','6'],
         '4':['2','3'],
         '5':['7'],