Merge branch 'dev2/zhangxc' into test

src/api/config.js

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

src/components/icss/IndeptLabel.vue

@@ -2,11 +2,11 @@
     <div>
         <crumbs title="独立标签维护">
             <el-form :inline="true" class="demo-form-inline">
-                <!--<el-form-item label="标签类型：">
-                    <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>
+                <el-form-item label="标签类型：">
+                    <el-select size="mini" v-model="filter.controlType[0]" placeholder="标签类型" clearable>
                         <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
-                </el-form-item>-->
+                </el-form-item>
                 <el-form-item label="标签归属：">
                     <el-select size="mini" v-model="filter.tagAdscription" @change="getValue"  placeholder="标签归属" clearable>
                         <el-option v-if="item.val!=6&&item.val!=7&&item.val!=8&&item.val!=9" v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.id" ></el-option>
@@ -102,8 +102,10 @@
         list: [],
         tagTypes: [],
         Adscriptions: [],
+        tagTypesList:[],
         filter: {
           tagType: [], //标签类型
+          controlType: [],
           tagAdscription: '', //标签归属
           tagSysName: '', //标签系统名称
         },
@@ -124,10 +126,11 @@
       },
       getDropList() {
         return api.getDropList().then((res) =>{
-          console.log('dropList', res)
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[6];
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+      
           }
 
         })
@@ -190,7 +193,8 @@
           current: this.currentPage,
           size: this.pageSize,
           type: this.filter.tagAdscription,
-          tagName: this.filter.tagSysName
+          tagName: this.filter.tagSysName,
+          controlTypeList: this.filter.controlType
         };
         return param;
       },

src/components/icss/NoiseTemplate.vue

@@ -182,6 +182,7 @@ export default {
           });
           return;
       }
+     
       let detailLis = utils.dataRecombination(this.sendIds, this.dataPub.region2)
       let param = {
         "questionWrapper": {
@@ -206,8 +207,9 @@ export default {
           "questionMappings": detailLis       //映射关系,
         }
       }
-      if(this.dataPub.region2 == 2 && detailLis.length == 0) {
+      if((this.dataPub.region2 == 2 || this.dataPub.region2 == 3)&& detailLis.length == 0) {
          this.warning('请选择标签明细')
+         return
       }
       this.showDelDialog(param)
     },

src/components/icss/PubIndeptTag.vue

@@ -117,6 +117,7 @@
                 ></el-input></el-col>
             </el-form-item>
             <el-form-item
+                    v-if="form.region1 != 5"
                     label="选择项之间链接："
                     prop="region5"
             >
@@ -343,7 +344,8 @@
         api.validateSystomName(param).then((res) => {
           if (res.data.code === '0') {
             if(res.data.data && res.data.data.length != 0){
-              callback(new Error('该系统名称已存在'));
+              this.warning('标签系统名称已重复，无法建立');
+              // callback(new Error('该系统名称已存在'));
             }else{
               callback();
             }
@@ -365,7 +367,7 @@
         if(type === 1) {
           this.form.region2 = '';
           this.labelTypes = this.labelTypesList.filter(item => this.labelTypesMaps[tmpData].indexOf(item.val) > -1)
-          
+          this.initForm()
         }
         if(type === 2) {
           this.initForm()
@@ -396,6 +398,7 @@
         this.form.suffix = ''
         this.form.minNormalVal = ''
         this.form.maxNormalVal = ''
+        this.form.region5 = ''
       },
     }
   }

src/routes.js

@@ -177,7 +177,7 @@ export default [
       {path:'LT-YXSJWH-TJMZSM',component:AddDisclInfo,name:'AddDisclInfo'},     //免责声明-添加/修改
       {path:'LT-YXSJWH-MBWH',component:TemplateMaintenance,name:'TemplateMaintenance'},     //模板维护
       {path:'LT-YXSJWH-CTMBWH',component:PhysicalExamTemplate,name:'PhysicalExamTemplate'},     //查体模板维护
-      {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护
+      {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护--添加
       {path:'LT-YXSJWH-TJMBWH',component:TemplateMaintenanceWrap,name:'TemplateMaintenanceWrap'},     //模板维护-添加修改
       {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护-添加
       {path:'LT-YXSJWH-TSXXXQ',component:PromptDetail,name:'PromptDetail'},         //提示信息维护详情