Merge remote-tracking branch 'origin/dev' into dev

src/components/icss/BloodPressTagGroup.vue

@@ -25,8 +25,8 @@
       </div>
     </div>
     <div class="bottomPartMid fl">
-      <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
-      <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+        <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+        <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
       <p class="poolTitle">操作池</p>
@@ -66,6 +66,10 @@ export default {
             default: '',
             type: String
         },
+        sexType: {
+            default: '',
+            type: String
+        },
     },
     data() {
         return {
@@ -98,6 +102,19 @@ export default {
                 this.searchTagList()
             }
         },
+        sexType(newVal, preVal) {
+            if (newVal != preVal) {
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                    this.leftTagsList = [];
+                    this.selectLeftTagsList = [];
+                    this.rightTagsList = [];
+                    this.rightTagsList2 = [];
+                    this.selectRightTagsList = [];
+                    this.searchVal = '';
+                     this.searchTagList();
+                }
+            }
+        },
         
         
     },
@@ -177,9 +194,11 @@ export default {
             this.rightTagsList.push(...this.selectLeftTagsList);
             let textItem = { text: '' ,type:'input' }
             for (let i = 0; i < this.selectLeftTagsList.length; i++) { //选中标签每个前后加入输入框
-                let textItem1 = JSON.parse(JSON.stringify(textItem))
-                textItem1.id = this.selectLeftTagsList[i].id + ',,'
-                this.rightTagsList2.push(textItem1)
+                if(this.rightTagsList2.length === 0) {
+                    let textItem1 = JSON.parse(JSON.stringify(textItem))
+                    textItem1.id = this.selectLeftTagsList[i].id + ',,'
+                    this.rightTagsList2.push(textItem1)
+                }
                 this.rightTagsList2.push(this.selectLeftTagsList[i]);
                 let textItem2 = JSON.parse(JSON.stringify(textItem))
                     textItem2.id = this.selectLeftTagsList[i].id + ','
@@ -207,6 +226,7 @@ export default {
                 "controlType": [],
                 "type": this.type || '',
                 "notIds": notIds,
+                "sexType": this.sexType,
 
             }
             api.searchTagList(param).then((res) => {
@@ -250,21 +270,22 @@ export default {
         height: 30px;
     }
     .tagList {
-        padding: 10px 10px;
         height: 300px;
         overflow-y: auto;
         border: 1px solid @icssBorder;
     }
     .tagItem {
-        line-height: 20px;
+        line-height: 30px;
+        padding: 0px 10px;
+
     }
     .operationPool {
         position: relative;
         width: 85%;
     }
     .tagName {
-        height: 40px;
-        line-height: 40px;
+        height: 30px;
+        line-height: 30px;
     }
     .tagName:before {
         content: '['
@@ -273,20 +294,23 @@ export default {
         content: ']'
     }
     .bottomPartMid {
-        position: relative;
-        width: 10%;
-        top: 150px;
-    p {
+        width: 8%;
+        margin-top: 60px;
+        p {
         width: 100%;
         text-align: center;
         span {
+            cursor: pointer;
             display: inline-block;
-            width: 50px;
-            height: 30px;
-            line-height: 30px;
+            width: 30px;
+            height: 40px;
+            line-height: 40px;
             margin: 0 auto;
+            border: 1px solid @icssBorder;
+            margin-bottom: 15px;
+            font-size: 18px;
+        }
         }
-    }
     }
     .bottomPartRight {
         float: left;
@@ -296,7 +320,7 @@ export default {
         margin-top: 20px;
     }
     .operationItem {
-        float: left;
+        display: inline-block;
         line-height: 40px;
         margin: 0 5px 10px 0;
     }

src/components/icss/LabelGroup.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="标签组维护" style="min-width: 1085px">
+        <crumbs title="标签组维护" style="min-width: 980px">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="标签类型：">
                     <el-select size="mini" v-model="filter.tagType[0]" placeholder="标签类型" clearable>

src/components/icss/NoiseTemplate.vue

@@ -28,6 +28,7 @@
         v-if="dataPub.region2 == 4" 
         :pool="dataPub.tagPool" 
         :type="dataPub.region1"
+        :sexType="dataPub.region7"
         @changeActionData="changeActionData"
         >
       </SymptomTagGroup>
@@ -35,6 +36,7 @@
         v-if="dataPub.region2 == 3" 
         :pool="dataPub.tagPool" 
         :type="dataPub.region1"
+        :sexType="dataPub.region7"
         @changeActionData="changeActionData"
         >
       </BloodPressTagGroup>
@@ -160,7 +162,7 @@ export default {
           "questionMappings": detailLis       //映射关系,
         }
       }
-      // this.showDelDialog(param)
+      this.showDelDialog(param)
     },
     showDelDialog(param) {
       this.showConfirmDialog('是否保存该标签组？', () => {

src/components/icss/PubTagGroup.vue

@@ -172,7 +172,7 @@ export default {
         region3: '',      //系统名称
         region4: '',      //界面名称
         region5: '',      //选项之间的链接
-        region6: '1',      //是否可以检索
+        region6: '0',      //是否可以检索
         region7: '3',       //性别
         region8: '0',          //最小年龄
         region9: '200',         //最大年龄
@@ -288,6 +288,7 @@ export default {
       if(this.form.region3.trim() == ''){ return }
       let param = {
         "existName": this.form.region3,
+        "tagType":this.form.region2 == 2?[1]:(this.form.region2 == 6?[1,2,3,4,10]:[]),
         "type": this.form.region1
       }
       api.validateSystomName(param).then((res) => {

src/components/icss/PubTagPartDetail.vue

@@ -132,7 +132,7 @@ export default {
       selectArr: [false, false, false, false, false, false],   //右侧选中part状态
 
       styles:{background:'#eae7e7'},                       //选中单条样式
-      styleR:{color:'red !important'},
+      styleR:{background:'#eae7e7 !important'},
       searchVal: '',           //搜索值
       currentPool: [],         //标签池数据
       currentLis:[],           //选中单条ID组合（多选）
@@ -234,8 +234,9 @@ export default {
         });
         return;
       }
+      this.getRightListDes();
       if(this.choose == 'multiple'){
-        this.getRightListDes();
+        // this.getRightListDes();
       }
     },
     toLeftPool(){      //往左返回数据
@@ -287,7 +288,11 @@ export default {
         }
       }
       this.$emit('changeActionData',poolDetailListIds, false);
-      this.poolDetailListTips = poolDetailListTips
+      if(this.choose == 'multiple'){
+        this.poolDetailListTips = [[],[],[],[],[],[]]
+      }else{
+        this.poolDetailListTips = poolDetailListTips
+      }
       this.poolDetailListIds = poolDetailListIds
     },
     getStyle(id){       //左侧选中状态
@@ -359,7 +364,7 @@ export default {
               if(JSON.stringify(this.poolDetailList[k]) != '[]'){
                 ++plus2
                 if(plus2 == 5){     //右侧数据填满了
-                  alert('请选择需要修改的模块')
+                  // alert('请选择需要修改的模块')
                   return;
                 }
               }
@@ -371,7 +376,7 @@ export default {
         let tmpIds = [];
         tmpIds.push(id);
         this.currentLis = tmpIds;
-        this.getRightListDes();
+        // this.getRightListDes();
       }else{                                //多选
         let tmpIds = this.currentLis;
         if(utils.filterArr(tmpIds,id,2)){

src/components/icss/SymptomTagGroup.vue

@@ -25,8 +25,8 @@
       </div>
     </div>
     <div class="bottomPartMid fl">
-      <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
-      <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+        <p><span class="el-icon-arrow-right" @click="toRightList"></span></p>
+        <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
       <p class="poolTitle">操作池</p>
@@ -37,7 +37,7 @@
                 :style="getStyle2(item)?styles:null"
                 @click='selectRightTag(item)'
             >   
-                <div>
+                <div class="inputBox">
                     <el-input
                         v-if="item.type === 'input'"
                         placeholder=""
@@ -47,8 +47,8 @@
                 </div>
                 <p v-if="item.tagName" class="tagName">{{item.tagName}} </p>
                 <div class="attributeBox">
-                    <p v-if="item.symptomType === 1" class="tagAttribute">跟主症状</p>
-                    <p v-if="item.symptomType === 2" class="tagAttribute">跟伴随症状</p>
+                    <p v-if="item.symptomType === 1" class="tagAttribute" @click.stop>跟主症状 <span @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
+                    <p v-if="item.symptomType === 2" class="tagAttribute" @click.stop>跟伴随症状<span  @click="closeTagAttribute(item)" class="closeTagAttribute"><i class="el-icon-error"></i></span></p>
                 </div>
             </li>
         </ul>
@@ -78,6 +78,10 @@ export default {
             default: '',
             type: String
         },
+        sexType: {
+            default: '',
+            type: String
+        },
     },
     data() {
         return {
@@ -110,7 +114,20 @@ export default {
                 this.searchTagList()
             }
         },
-        
+        sexType(newVal, preVal) {
+            if (newVal != preVal) {
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                    this.leftTagsList = [];
+                    this.selectLeftTagsList = [];
+                    this.rightTagsList = [];
+                    this.rightTagsList2 = [];
+                    this.selectRightTagsList = [];
+                    this.searchVal = '';
+                     this.searchTagList();
+                }
+            }
+        },
+
         
     },
     methods: {
@@ -223,6 +240,7 @@ export default {
                 "controlType": [],
                 "type": this.type || '',
                 "notIds": notIds,
+                "sexType": this.sexType,
 
             }
             api.searchTagList(param).then((res) => {
@@ -256,13 +274,21 @@ export default {
                 })
             }
             this.selectRightTagsList = []
+        },
+        closeTagAttribute(tag) {
+            this.rightTagsList2 = this.rightTagsList2.filter((item) =>{
+                    if(item.id === tag.id) {
+                        item.symptomType = 3
+                    }
+                    return item
+                })
         }
 
     }
 }
 </script>
 
-<style lang="less" scoped>
+<style lang="less" >
 @import '../../less/common.less';
 .symptomTagGroupWrapper {
     .bottomPartLeft {
@@ -286,7 +312,6 @@ export default {
         height: 30px;
     }
     .tagList {
-        padding: 10px 10px;
         border: 1px solid @icssBorder;
     }
     .tagPool {
@@ -297,16 +322,19 @@ export default {
     .attributeBox {
         position: absolute;
         right: -100px;
-        top: 10px;
+        top: 2px;
     }
     .tagItem {
         position: relative;
-        line-height: 40px;
+        line-height: 30px;
+        cursor: pointer;
+        padding: 0 10px;
     }
     .operationPool {
         position: relative;
         width: 60%;
         min-height: 300px;
+        padding: 10px 0;
     }
     .tagName:before {
         content: '['
@@ -315,20 +343,23 @@ export default {
         content: ']'
     }
     .bottomPartMid {
-        position: relative;
-        width: 10%;
-        top: 150px;
-    p {
+        width: 8%;
+        margin-top: 60px;
+        p {
         width: 100%;
         text-align: center;
         span {
+            cursor: pointer;
             display: inline-block;
-            width: 50px;
-            height: 30px;
-            line-height: 30px;
+            width: 30px;
+            height: 40px;
+            line-height: 40px;
             margin: 0 auto;
+            border: 1px solid @icssBorder;
+            margin-bottom: 15px;
+            font-size: 18px;
+        }
         }
-    }
     }
     .bottomPartRight {
         float: left;
@@ -343,8 +374,24 @@ export default {
     }
     .tagAttribute {
        border: 1px solid @icssBorder;
-       height: 20px;
-       line-height: 20px;
+       height: 17px;
+       line-height: 17px;
+       padding: 3px 5px;
+       border-radius: 10px;
+    }
+    .inputBox {
+        width: 120px;
+        .el-input {
+            .el-input__inner {
+                height: 30px;
+                background: rgb(234, 231, 231);
+            }
+        }
+    }
+    .closeTagAttribute {
+        position: absolute;
+        top: -5px;
+        right: -5px;
     }
     .active {
         color: #aBcdef;