Merge branch 'dev' into dev2/zhangxc

src/api/config.js

@@ -163,7 +163,7 @@ export default {
   },
   labelTypesMaps: {       //// 归属和填写单类型限制
     '1':['2','3','4','11'],
-    '3':['4','6'],
+    '3':['2','4','6'],
     '4':[,'2','3'],
     '5':['7'],
     '6':['9'],
@@ -172,9 +172,9 @@ export default {
   },
   groupParams:[
     {controlType:[1,2],tagType:[1],notTagType:[8]},     //多列多选（杂音/初为）     notTagType为文字标签剔除
-    {controlType:[0,1,2,5,6],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签（血压）
-    {controlType:[0,1,2,5,6],tagType:[1,2],notTagType:[8]},  //症状详细（症状尾巴）
-    {controlType:[1,2],tagType:[1,2,3,4,10],notTagType:[8]}, //组合项标签（既往史）
+    {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],tagType:[1,2,3,4],notTagType:[2,8]}, //组合项标签（既往史）
     {controlType:[1,6],tagType:[],notTagType:[8]},    //化验组合
     {controlType:[1,2,99],tagType:[],notTagType:[8]},   //症状推送类型（添加症状）
   ]

src/components/icss/CommonTemplate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="symptomTagGroupWrapper clearfix">
+  <div class="templateTagGroupWrapper clearfix">
     <div class="bottomPartLeft">
       <p class="poolTitle">标签池</p>
       <div class="pool">
@@ -384,7 +384,7 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "../../less/common.less";
-.symptomTagGroupWrapper {
+.templateTagGroupWrapper {
   .bottomPartLeft {
     width: 30%;
     box-sizing: border-box;
@@ -447,7 +447,7 @@ export default {
       }
     }
   }
-  .bottomPartRight {
+  .bottomPartRightTemplate {
     float: left;
     width: 60%;
       .arrowWrap {
@@ -455,7 +455,7 @@ export default {
         background-color: #fff;
         padding-top: 1px;
         margin-right: 10px;
-        .arrowWrapPub[data-v-2db8be7a] {
+        .arrowWrapPub {
           border: 1px solid @adminBase;
           height: 23px;
           width: 40px;
@@ -514,7 +514,7 @@ export default {
     .el-select {
       margin-right:10px;
     }
-    .el-button--mini[data-v-2db8be7a], .el-button--mini.is-round[data-v-2db8be7a] {
+    .el-button--mini, .el-button--mini.is-round {
       padding: 5px 8px 4px;
     }
     .el-button:hover {

src/components/icss/MedicalName.vue

@@ -6,7 +6,11 @@
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">
-                  <el-select v-model="filter.type" clearable filterable placeholder="请选择" size="mini">
+                  <el-select v-model="filter.type" 
+                  clearable 
+                  filterable 
+                  placeholder="请选择" 
+                  size="mini">
                     <el-option
                       v-for="item in typeList"
                       :key="item.id"
@@ -130,7 +134,7 @@
       getTypeList(){
         const param = {
           current: this.currentPage,
-          size: this.pageSize
+          size: 60
         }
         api.allKnowledgeType(param).then((res)=>{
           const data = res.data;
@@ -226,7 +230,7 @@
         let inp = document.getElementById("upFile");
         inp.value = "";
         */
-      }
+      },
     }
   }
 </script>

src/components/icss/PubTagGroup.vue

@@ -142,6 +142,25 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.region1 == 1 && form.region2 ==4"
+        label="是否为症状"
+        prop="region12"
+      >
+        <el-select
+          v-model="form.region12"
+          @change="sendData"
+        >
+          <el-option
+            label="是"
+            value="0"
+          ></el-option>
+          <el-option
+            label="不是"
+            value="1"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item
         label="年龄："
         prop="region8"
@@ -238,7 +257,7 @@ export default {
       },
       labelTypesMaps: {       //// 归属和填写单类型限制
         '1':['2','3','4','11'],
-        '3':['4','6'],
+        '3':['2','4','6'],
         '4':['2','3'],
         '5':['7'],
         '6':['9'],
@@ -293,6 +312,10 @@ export default {
       systom:null,      //标签系统名称存在与否
     }
   },
+  beforeDestroy:function(){
+    console.log(995)
+    this.searchVal = ''
+  },
   computed: {
     newSex() {
       return this.form.region7;

src/components/icss/PubTagPartDetail.vue

@@ -135,7 +135,8 @@ export default {
     }
   },
 
-  destroyed:function(){
+  beforeDestroy:function(){
+    console.log(99)
     this.searchVal = ''
   },
   data() {
@@ -489,7 +490,7 @@ export default {
                   this.$message({
                     showClose: true,
                     message: '添加的数据有误',
-                    type: 'error'
+                    type: 'warning'
                   });
                   return;
                 }
@@ -521,11 +522,29 @@ export default {
             this.currentLis.map((id)=>{
               tmpArr.push(res.data.data[id]);
             })
-            // console.log(tmpArr,'多选既往史')
+            console.log(tmpArr,'多选既往史')
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
                 if(idx == 0 || idx == 1){
-                  this.poolDetailList[idx] = tmpArr;
+                  if(tmpArr.length > 1){
+                    this.$message({
+                      showClose: true,
+                      message: '添加的数据有误',
+                      type: 'warning'
+                    });
+                    return;
+                  }else{
+                    if((idx == 0 && (tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 1)) || (idx == 1 && (tmpArr[0].tagType != 1 && tmpArr[0].tagType != 2))){      //第一列
+                      this.$message({
+                        showClose: true,
+                        message: '添加的数据有误',
+                        type: 'warning'
+                      });
+                      return;
+                    }else{
+                      this.poolDetailList[idx] = tmpArr;
+                    }
+                  }
                 }else{
                   this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                 }

src/components/icss/SimilarName.vue

@@ -212,7 +212,7 @@
         e.preventDefault();
         let formData = new FormData();
         formData.append('uploadfile', fileInfo);
-        console.log(123,fileInfo,formData);
+        // console.log(123,fileInfo,formData);
         const header = {
           headers:{
             'Content-Type': 'multipart/form-data'
@@ -225,7 +225,12 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            // this.$message.error(res.data.msg);
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message:res.data.msg,
+              type:'error'
+            });
           }
         })
         this.getDataList();