Merge branch 'groupType' into test

src/api/config.js

@@ -290,7 +290,7 @@ export default {
   },
   groupParams:[
     {controlType:[0,1,2],tagType:[1]},     //多列多选（杂音/初为）     notTagType为文字标签剔除
-    {controlType:[0,1,2,5,6,7],tagType:[1]},  //多项统一横铺标签（血压）
+    {controlType:[0,1,2,5,6,7,8],tagType:[1]},  //多项统一横铺标签（血压）
     {controlType:[0,1,2,5,6,7,8,11],tagType:[1,2,3]},  //症状详细（症状尾巴）
     {controlType:[0,1,2],tagType:[1,4]}, //组合项标签（既往史）
     {controlType:[0,1,6],tagType:[1]},    //化验组合

src/components/icss/CommonTemplate.vue

@@ -572,7 +572,7 @@ export default {
         "tagName": this.searchVal,
         "type": tmpTypeSin,
         "notIds": notIds,
-        "notTagType": (this.type==2 || this.type==22 || this.type==32 || this.type==322 || this.type==4)?[4,8,10]:this.type==1?[1,3,4,8,10]:[3,4,8,10]
+        "notTagType": (this.type==2 || this.type==22 || this.type==32 || this.type==322 || this.type==4)?[4,10]:this.type==1?[0,1,3,4,10]:this.type==331?[0,3,4,10]:[3,4,10]
       }
       let params = {
         "notIds": notIds,

src/components/icss/PubIndeptTag.vue

@@ -167,7 +167,6 @@
             <el-form-item
                     label="标签前后缀："
                     class="fix-inp"
-                    prop="region12"
                     v-if="form.region2==5 ||form.region2==6 || form.region2==7 || form.region2==8"
             >
                 <el-col :span="10">
@@ -372,7 +371,7 @@
         },
         labelTypesMaps: {       //// 归属和填写单类型限制
           '1':['1','2','5','8','6','7','11'], //联合推送暂时不用
-          '3':['1','2','5','6','7', '11',],
+          '3':['1','2','5','8','6','7', '11'],
           '4':['1','2','6','7', '11',],
           '5':['1','6']
         },