合并test分支

src/components/icss/AddSimilarName.vue

@@ -10,7 +10,7 @@
           <span class="search" @click.stop="search">搜索</span>
           <ul v-if="showFlag">
             <!-- <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="it.tagName.length>10?it.tagName+'（'+it.typeName+'）':''">{{it.tagName+'（'+it.typeName+'）'}}</li> -->
-            <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="it.tagName.length>10?it.tagName+'（'+typeList[it.type]+'）':''">{{it.tagName+'（'+typeList[it.type]+'）'}}</li>
+            <li v-for="it in searchDatas" :key="it.id" @click="choose(it)" :title="(it.tagName+'（'+typeList[it.type]+'）').length>10?it.tagName+'（'+typeList[it.type]+'）':''">{{it.tagName+'（'+typeList[it.type]+'）'}}</li>
           </ul>
         </div>   
         <span></span>

src/components/icss/CommonTemplate.vue

@@ -112,6 +112,7 @@
               <el-input
                 placeholder=""
                 v-model="item.text"
+                maxlength="15"
                 @change="updataData"
               >
               </el-input>
@@ -122,7 +123,7 @@
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
           >{{item.tagName}} 
-            <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
+            <i class="tagFlag">子</i>
             </p>
           <p
             v-if="item.type !== 'input' && item.type !== 'sub'"
@@ -473,8 +474,9 @@ export default {
         "tagName": this.searchVal,
         "type": this.type == 4?3:1,
         "noIds": notIds,
+        "notTagType":[3,4,8,10]
       }
-      api.getQuestionInfos(param).then((res) => {
+      api.searchTagList(param).then((res) => {
         if (res.data.code === '0') {
           this.leftTagsList = res.data.data
           this.selectLeftTagsList = []

src/components/icss/MedicalInfo.vue

@@ -1,9 +1,9 @@
 <template>
     <div>
-        <crumbs title="医学术语属性">
+        <crumbs title="医学术语属性维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="术语：">
-                    <el-input size="mini" v-model="filter.termName" placeholder="输入术语"></el-input>
+                <el-form-item label="医学标准术语：">
+                    <el-input size="mini" v-model="filter.termName" placeholder="输入医学标准"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">
                   <el-select v-model="filter.type" 

src/components/icss/PromptTagPool.vue

@@ -169,7 +169,7 @@
         }
         let param = {
           "tagName": this.searchVal,
-          "tagType": [],
+          "tagType": [1,2,3,4,5,6,7,9,10,11],
           "controlType": [],
           "type": this.type || '',
           "notIds": notIds,

src/components/icss/PubTagGroup.vue

@@ -255,7 +255,7 @@ export default {
         ],
         region3: [
           { required: true, message: '请输入标签系统名称', trigger: 'change' },
-          { validator: validatePass2, trigger: 'blur' },
+          // { validator: validatePass2, trigger: 'blur' },
         ],
         region4: [
           { required: true, message: '请输入标签界面名称', trigger: 'change' }

src/components/icss/PubTagPartDetail.vue

@@ -559,15 +559,20 @@ export default {
                     }
                   }
                 }else{
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
-                    this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
+                      this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                   }
                 }
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -576,13 +581,18 @@ export default {
               }else{
                 ++num;
                 if(num == 6){
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
                     for(let i = 2;i < this.poolDetailList.length;i++){
                       let ids = [];

src/components/icss/TemplateMaintenanceWrap.vue

@@ -78,7 +78,7 @@ export default {
           type: 'warning'
         });
         return;
-      }else if(detailLis[0].text == '' && detailLis[0].questionId == ''){
+      }else if(detailLis[0].questionId == '' && detailLis.length == 1){
         this.$message({
           message: '保存模版时，无法保存单独的输入栏',
           type: 'warning'