Squashed commit of the following:

commit d74975f1371e7c81f3bf2e6a5bc13cf4958967cf
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 20 15:43:47 2019 +0800

    输入限制；搜索去重；添加类型

commit f041b11e2915b7cbd0bed54a522957df996f7025
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:50:20 2019 +0800

    合并dev分支

commit f22d1696ff132969ad0ca4ed65e5990a8ce7c09c
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:08:04 2019 +0800

    化验子项和术语关联维护联调完成

commit 4e0ca46985b6835a252cde585e928b570e011d7a
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 16:53:37 2019 +0800

    医学术语枚举获取；免责声明接口调整

commit 3522504bbf0b0184581dddf0a0a5df825a150d18
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 10:33:39 2019 +0800

    化验子项，术语关联维护

commit 169e6da63ea0da5047c3eab6bab8646917c1013e
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:06:38 2019 +0800

    合并dev分支

commit 42d9caa7ccf59a8620a7978219f85addf90b6088
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:02:21 2019 +0800

    修改文案

commit 1c888406cf9074c8306750347cf8418fba1db0b4
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 17:16:57 2019 +0800

    合并dev分支

commit cef77de3efd6a8a94d354ee68981bce29880dc41
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 8 15:55:24 2019 +0800

    合并

commit 0e4c4baade1f149d57a0073f6709064344221587
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 23 16:54:19 2019 +0800

    添加别名页面归属处理

# Conflicts:
#	src/api/config.js
#	src/api/icss.js
#	src/components/icss/AddAssaySon.vue
#	src/components/icss/AddChronicAndIndexRelation.vue
#	src/components/icss/AddConceptRelation.vue
#	src/components/icss/AddMedicalName.vue
#	src/components/icss/AddMedicinePrompt.vue
#	src/components/icss/MedicineInfoPg.vue
#	src/routes.js

src/components/icss/AddAssaySon.vue

@@ -17,12 +17,12 @@
                     :title="item.conceptName"
                     @click="selectDiag(item)"
                     :key="item.conceptId">
-                    {{item.conceptName}}
+                    {{item.conceptNameType||item.conceptName}}
                     </li>
                 </ul>
             </el-form-item>
              <el-form-item class="isRequired" label="已选择化验标准术语：" prop="type">
-                {{form.conceptName}}
+                {{form.conceptNameType||form.conceptName}}
             </el-form-item>
         </el-form>
         <div class="symptomList">
@@ -38,7 +38,7 @@
                         :title="item.conceptName"
                         @click="selectIndex(item)"
                         :key="item.conceptName">
-                        {{item.conceptName}}
+                        {{item.conceptNameType||item.conceptName}}
                         </li>
                     </ul>
             </div>
@@ -49,7 +49,8 @@
                     <td class="selectedContentOpera">操作</td>
                 </tr>
                 <tr v-for="(item, index) in selectedIndexList" :key="item.conceptId"> 
-                    <td class="selectedContent ">{{item.parentConceptName?item.conceptName+'（'+item.parentConceptName+'）':item.conceptName}}</td>
+                    <!-- <td class="selectedContent ">{{item.parentConceptName?item.conceptName+'（'+item.parentConceptName+'）':item.conceptName}}</td> -->
+                    <td class="selectedContent ">{{item.conceptNameType||item.conceptName}}</td>
                     <td class="selectedContentOpera"><el-button type="text" size="small" class="delete" @click="delSelectedIndex(item, index)">删除</el-button></td>
                 </tr>
             </table>
@@ -72,7 +73,8 @@
       return{   
         form: {
             conceptId: '', 
-            conceptName:'' 
+            conceptName:'' ,
+            conceptNameType:''
         },
         titleText: '添加化验子项',
         conceptList: [],
@@ -91,6 +93,7 @@
           this.titleText = '修改化验子项';
           this.form.conceptId = data.conceptId;
           this.form.conceptName = data.conceptName;
+          this.form.conceptNameType = data.conceptNameType;
           this.selectedIndexList = data.nodeList;
         }
     },
@@ -116,21 +119,31 @@
             })
         },
         selectDiag(item) {
-            this.form.conceptId = item.conceptId
-            this.form.conceptName = item.conceptName
-            this.searchConcept = ''
-            this.conceptList=[]
+            this.form.conceptId = item.conceptId;
+            this.form.conceptName = item.conceptName;
+            this.form.conceptNameType = item.conceptNameType;
+            this.searchConcept = '';
+            this.conceptList=[];
         },
         focuInput() {
             // 聚焦时清空搜索结果？   
         },
+        selectedTags() {//已选项ids
+          let selectedTags = []
+          for (let i =0; i < this.selectedIndexList.length; i++) {
+            selectedTags.push(this.selectedIndexList[i].conceptId)
+          }
+          return selectedTags
+        },
         searchIndex() {
+           const notIds = this.selectedTags();
            const param = {
             "name": this.searchIndexVal,
             "relationId": 18,
             "relationPosition": 2,
             "typeId": 13,
-            "relationConceptId":this.form.conceptId
+            "relationConceptId":this.form.conceptId,
+            "excludedConceptIds":notIds
           }
           
           api.getConceptInfoAssay(param).then((res)=>{
@@ -148,7 +161,7 @@
             this.nodeList.splice(index, 1)
         },
         submitForm(formName) {
-            if(!this.form.conceptName) {
+            if(!this.form.conceptId) {
                 this.warning('请选择化验标准术语')
                 return
             }

src/components/icss/AddConceptRelation.vue

@@ -15,15 +15,15 @@
           <li 
           v-for="item in conceptList" 
           class="diagItem ellipsis"
-          :title="item.conceptName"
+          :title="item.conceptNameType"
           @click="selectDiag(item)"
           :key="item.conceptId">
-          {{item.conceptName}}
+          {{item.conceptNameType||item.conceptName}}
         </li>
       </ul>
     </el-form-item>
     <el-form-item class="isRequired" label="已选择术语：" prop="type">
-      {{form.conceptName}}
+      {{form.conceptNameType}}
     </el-form-item>
   </el-form>
   <div class="symptomList">
@@ -53,11 +53,12 @@
       <li v-for="(item, index) in leftTagsList"
       class = "tagItem"
       :key='item.conceptId'
-      :title="'[ '+item.conceptName+' ]'"
+      :title="item.conceptNameType"
       :style="getStyle(item)?styles:null"
       @click='selectLeftTag(item, index)'
       >
-      <p class="tagName ellipsis" >{{item.conceptName}} </p>
+      <!-- <p class="tagName ellipsis" >{{item.conceptName}} </p> -->
+      <p class="ellipsis" >{{item.conceptNameType}} </p>
     </li>
   </ul>
 </div>
@@ -76,7 +77,8 @@
     :style="index === selectRightTagIndex?styles:null"
     @click='selectRightTag(index)'
     >   
-    <p v-if="item.conceptName" class="tagName  ellipsis" :title="'[ '+item.conceptName+' ]'">{{item.conceptName}} </p>
+    <!-- <p v-if="item.conceptName" class="tagName  ellipsis" :title="'[ '+item.conceptName+' ]'">{{item.conceptName}} </p> -->
+    <p v-if="item.conceptName" class="ellipsis" :title="item.conceptNameType">{{item.conceptNameType}} </p>
   </li>
 </ul>
 
@@ -104,8 +106,9 @@ export default {
   data() {
     return{
       form: {
-        conceptId: '',  //诊断id
-        conceptName:''  //诊断名称
+        conceptId: '', 
+        conceptName:'',
+        conceptNameType:''
       },
       titleText: '添加',
       conceptList: [],
@@ -132,6 +135,7 @@ export default {
             this.rightTagsList = data.nodeList;
             this.form.conceptId =data.conceptId;
             this.form.conceptName =data.conceptName;
+            this.form.conceptNameType =data.conceptNameType;
           }
           let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
           this.typeList = typeList.lexiconTypeEnum;
@@ -168,10 +172,11 @@ export default {
        })
         },
         selectDiag(item) {
-          this.form.conceptId = item.conceptId
-          this.form.conceptName = item.conceptName
-          this.searchDiagVal = ''
-          this.conceptList=[]
+          this.form.conceptId = item.conceptId;
+          this.form.conceptName = item.conceptName;
+          this.form.conceptNameType = item.conceptNameType;
+          this.searchDiagVal = '';
+          this.conceptList=[];
         },
         focuInput() {
 

src/components/icss/AddMedicalName.vue

@@ -58,8 +58,11 @@
                 <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
                 <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
               </td>
-              <td>
-                {{data.spell}}
+              <td v-if="!item.isEdit">
+                {{item.spell}}
+              </td>
+              <td v-else>
+                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin" class="spell">
               </td>
               <td>
                 {{data.type}}
@@ -301,11 +304,14 @@ import pinyin from '../../js/Convert_Pinyin.js';
       },*/
       handleBlur(type,index,flg){
         // 不能为纯数字、纯字符、纯数字加字符 4-18
-        const pattern = /[^~@#$%^&*_\-+=,，.。:："“？?”；;、!！0-9]/g;
-        if(type==1 && this.data.name){//标准词输入
-          if(!pattern.test(this.data.name)){
+        // const pattern = /[^~@#$%^&*_\-+=,，.。:："“？?”；;、!！0-9]/g;
+        // 需求更改：不能为纯数字，其余均可输入 5-20
+        const pattern = /[^0-9]/g;
+        if(type==1){//标准词输入
+          if(this.data.name && !pattern.test(this.data.name)){
             this.$message({
-              message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              // message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              message:'无法输入纯数字，请输入正确数据！',
               type:'warning'
             });
             this.data.name = '';
@@ -313,12 +319,13 @@ import pinyin from '../../js/Convert_Pinyin.js';
             let data = this.data;
             data.spell = pinyin.getCamelChars(data.name);
           }
-        }else if(type==2 && this.synonymous[index].name){
+        }else if(type==2){
           // 修改时术语名称、拼音和类型均不能修改
           if(flg == 99){
-            if(!pattern.test(this.synonymous[index-1].name)){
+              if(this.synonymous[index-1].name && !pattern.test(this.synonymous[index-1].name)){
               this.$message({
-                message:'无法输入纯数字或者纯字符，请输入正确数据！',
+                // message:'无法输入纯数字或者纯字符，请输入正确数据！',
+                message:'无法输入纯数字，请输入正确数据！',
                 type:'warning'
               });
               this.synonymous[index-1].name = '';
@@ -327,9 +334,9 @@ import pinyin from '../../js/Convert_Pinyin.js';
               current.spell = pinyin.getCamelChars(current.name);
             }
           }else{
-            if(!pattern.test(this.synonymous[index].name)){
+            if(this.synonymous[index].name && !pattern.test(this.synonymous[index].name)){
               this.$message({
-                message:'无法输入纯数字或者纯字符，请输入正确数据！',
+                message:'无法输入纯数字，请输入正确数据！',
                 type:'warning'
               });
               this.synonymous[index].name = '';
@@ -577,6 +584,9 @@ import pinyin from '../../js/Convert_Pinyin.js';
       margin:15px 0;
     }
   }
+  .spell{
+    text-align: center;
+  }
   /deep/.ages{
     margin-top: 20px;
     .el-input {

src/components/icss/ConceptRelation.vue

@@ -114,7 +114,6 @@ export default {
             this.$router.push({name:'AddConceptRelation'})
         },
         modifyRelation(row) {
-            console.log('row:',row)
             const param = {
               "conceptId": row.conceptId
             }