Merge remote-tracking branch 'origin/depart' into dev

# Conflicts:
#	src/components/icss/AddIndeptLabel.vue
#	src/components/icss/AddMedicalInfo.vue
#	src/components/icss/InfoParagraph.vue
#	src/components/icss/NoiseTemplate.vue

src/components/icss/AddMedicalInfo.vue

@@ -11,7 +11,7 @@
                      ref="groups">
                 <el-form-item label="搜索概念:">
                   <div class="conceptSearch">
-                    <input v-model="conceptText" @focus="focusInput" type="text" class="searchText">
+                    <input v-model="conceptText" 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" @focus="focusInput" type="text" class="searchText">
+                    <input v-model="termMiniClassText" 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" @focus="focusInput" type="text"  class="searchText">
+                    <input v-model="termClassText" type="text" class="searchText">
                     <span class="searchName" @click="searchTermClass">搜索</span>
                     <ul class="conceptList" ref="termClassList">
                       <li 
@@ -468,11 +468,6 @@
           }
         })
       },
-      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/NoiseTemplate.vue

@@ -231,12 +231,17 @@ export default {
         })
       });*/
       const h = this.$createElement;
+      const {isEdit} = this.$route.params;
+      const addMsg = h('div',{style:'padding-bottom:10px'},[
+            h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签组？')
+          ])
+      const modMsg = h('div',{style:'padding-bottom:10px'},[
+            h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签组？'),
+            h('span',{style:'color:red;font-size:12px'},'若标签系统名称已经改变，请去别名维护中修改相关信息'),
+          ])
       this.$msgbox({
         title:'提示',
-        message:h('div',{style:'padding-bottom:10px'},[
-            h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签组？'),
-            h('span',{style:'color:red;font-size:12px'},'标签系统名称已经改变，请去别名维护中修改相关信息'),
-          ]),
+        message:isEdit?modMsg:addMsg,
         showCancelButton: true,
         distinguishCancelAndClose:true,
         confirmButtonText: '确认并前往别名维护',

src/components/icss/VersionDesc.vue

@@ -15,6 +15,10 @@
                 label="建立时间"
                 :show-overflow-tooltip="true">
         </el-table-column>
+        <el-table-column
+                prop="title"
+                label="标题">
+        </el-table-column>
         <el-table-column
                 prop="modifierid"
                 label="操作人">