Merge branch 'dev2/luolei' into independentTag

src/components/icss/BloodPressTagGroup.vue

@@ -29,7 +29,7 @@
         <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
-      <p class="poolTitle">操作池</p>
+      <p class="poolTitle">操作界面：</p>
       <ul class="tagList operationPool">
             <li class = "tagItem operationItem"
                 v-for="(item) in rightTagsList2" 

src/components/icss/NoiseTemplate.vue

@@ -155,8 +155,8 @@ export default {
           "ageBegin": this.dataPub.region8,       		 //最小年龄
           "ageEnd": this.dataPub.region9,              //最大年龄
           "textGenerate": this.form.currentOrder,      //成文顺序 默认0
-          "copyType": this.dataPub.region2 == 6 ? this.dataPub.region10 : (this.dataPub.region2 == 3 ? this.dataPub.region11 : ''),                               //是否复制
-          "showAdd": 0,                                //是否显示加号血压
+          "copyType": this.dataPub.region10,           //是否复制
+          "showAdd": this.dataPub.region11,            //是否显示加号血压
           "showInfo": 0,
           "questionDetails": [],
           "questionMappings": detailLis       //映射关系,
@@ -168,7 +168,12 @@ export default {
       this.showConfirmDialog('是否保存该标签组？', () => {
         api.saveOrUpdate(param).then((res) => {
           if (res.data.code === '0') {
-            this.warning(res.data.msg || '保存成功', 'success')
+            this.warning(res.data.msg || '保存成功', 'success','1000')
+            setTimeout(() => {
+              this.$router.push({
+                path:'/admin/LT-YXSJWH-BQZWH'
+              })
+            }, 1000);
           } else {
             this.warning(res.data.msg)
           }
@@ -185,11 +190,12 @@ export default {
         resolve();
       }).catch(() => {});
     },
-    warning(msg, type) {
+    warning(msg, type,time) {
       this.$message({
         showClose: true,
         message: msg,
-        type: type || 'warning'
+        type: type || 'warning',
+        duration:time || '3000'
       })
     },
   },

src/components/icss/PubTagGroup.vue

@@ -65,7 +65,7 @@
           @change="sendData"
         ></el-input>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="选择项之间链接："
         prop="region5"
       >
@@ -75,7 +75,7 @@
           placeholder="请输入选择项之间链接"
           @change="sendData"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="能否当项目检索："
         prop="region6"
@@ -125,24 +125,31 @@
         <el-input
           v-model.number="form.region8"
           ref="valage1"
+          type="number"
           @input="sendData"
-        ></el-input> ~
+        ></el-input>
+      </el-form-item> ~
+      <el-form-item
+        prop="region9"
+        class="ages maxAges"
+      > 
         <el-input
           v-model.number="form.region9"
+          type="number"
           ref="valage2"
           @input="sendData"
         ></el-input>
       </el-form-item>
-      <el-form-item label="选择子项时是否复制主项标签：" prop="region10" v-if="form.region2 == 6">
+      <el-form-item class="verticalMiddle" label="选择子项时是否复制主项标签：" prop="region10" v-if="form.region2 == 6">
         <el-select v-model="form.region10">
           <el-option label="不可以" value="1"></el-option>
           <el-option label="可以" value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="是否复制当前模块(是否显示加号)：" prop="region11" v-if="form.region2 == 3">
+      <el-form-item label="是否显示加号：" prop="region11" v-if="form.region2 == 2 || form.region2 == 3">
         <el-select v-model="form.region11">
-          <el-option label="不可以" value="1"></el-option>
-          <el-option label="可以" value="0"></el-option>
+          <el-option label="显示" value="1"></el-option>
+          <el-option label="不显示" value="0"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -177,7 +184,7 @@ export default {
         region8: '0',          //最小年龄
         region9: '200',         //最大年龄
         region10: '0',        //是否复制主标签
-        region11: '1',       //是否复制当前模块
+        region11: '0',       //是否复制当前模块
         tagPool:[],          //标签池数据
         order:[],            //排序方式
         tipLis:[],           //提示列表
@@ -288,7 +295,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]:[]),
+        "tagType":this.form.region2.split(''),
         "type": this.form.region1
       }
       api.validateSystomName(param).then((res) => {
@@ -401,21 +408,36 @@ export default {
   .el-input__icon {
     line-height: 30px;
   }
-  .ages .el-input {
+  .verticalMiddle .el-form-item__content {
+    position: relative;
+    top: 16px;
+  }
+  .maxAges {
+    margin-left: -125px;
+  }
+  .ages {
     display: inline-block;
-    width: auto;
-    .el-input__inner {
-      width: 40px;
-      padding: 0 5px;
+    .el-form-item__content {
+      width: auto;
     }
+    .el-input {
+      display: inline-block;
+      width: auto;
+      .el-input__inner {
+        width: 60px;
+        padding: 0 5px;
+        margin-right: 25px;
+        text-align: center;
+      }
 
-    .el-input__inner::-webkit-outer-spin-button,
-    .el-input__inner::-webkit-inner-spin-button {
-      -webkit-appearance: none;
-    }
+      .el-input__inner::-webkit-outer-spin-button,
+      .el-input__inner::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+      }
 
-    .el-input__inner[type="number"] {
-      -moz-appearance: textfield;
+      .el-input__inner[type="number"] {
+        -moz-appearance: textfield;
+      }
     }
   }
   .el-message-box__btns .el-button--default {
@@ -428,7 +450,7 @@ export default {
     position: absolute;
     left: 220px;
     min-width: 300px;
-    color: #ea7777;
+    color: #22ccc8;
     font-size: 12px;
   }
 }

src/components/icss/PubTagPartDetail.vue

@@ -78,13 +78,16 @@
       <div class="partWaring">
         <ul>
           <li v-for="i in 5" :key="i">
-            <p v-for="item in poolDetailListTips[i]" class="partDetail tipsWrap ellipsis" v-show="poolDetailListTips[i].length > 0" :key="item">
-              <template v-for="section in currentTipLis">
-                <span class="tips" v-if="item == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
-              </template>
-            </p>
+            <template v-for="item in poolDetailListTips[i]" v-show="poolDetailListTips[i].length > 0">
+              <p class="partDetail tipsWrap" :key="item.type">
+                <template v-for="section in currentTipLis">
+                  <span v-if="item.type == section.val" :title="section.name" :key="section.val">{{section.name}}</span>         
+                </template>
+              </p>        
+              <p class="partDetail tipsWrap" :title="item.name" :key="item.type+'--'">{{item.name}}</p> 
+            </template>
           </li>
-        </ul>
+        </ul> 
       </div>
     </div>
     <span class="mutex">互斥项</span>
@@ -153,39 +156,30 @@ export default {
     sexType(newVal, preVal) {
       if (newVal != preVal) {
         if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-          this.poolDetailList = [[],[],[],[],[],[]]
-          this.poolDetailListTips = [[],[],[],[],[],[]]
-          this.poolDetailListIds = [[],[],[],[],[],[]]
-          this.poolDetailListAll=[]
-          this.activePart='-1'
-          this.activePartSon='-1'
-          this.selectArr = [false, false, false, false, false, false]
-          this.searchVal= ''
-          this.currentPool= []        
-          this.currentLis=[]           
-          this.notIds=[]               
-          this.multipleItem=[]
+          this.clearData()
         }
       }
     },
     sign(newVal, preVal) {
       if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-        this.poolDetailList = [[],[],[],[],[],[]]
-        this.poolDetailListTips = [[],[],[],[],[],[]]
-        this.poolDetailListIds = [[],[],[],[],[],[]]
-        this.poolDetailListAll=[]
-        this.activePart='-1'
-        this.activePartSon='-1'
-        this.selectArr = [false, false, false, false, false, false]
-        this.searchVal= ''
-        this.currentPool= []        
-        this.currentLis=[]           
-        this.notIds=[]               
-        this.multipleItem=[]
+        this.clearData()
       }
     },
     type(newVal, preVal) {
       if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+        this.clearData()
+      }
+    },
+    searchVal(newVal, preVal){
+      if(newVal.trim() == ''){
+        this.searchTagList();
+      }else if(newVal.trim() != preVal.trim()){
+        this.searchTagList();
+      }
+    }
+  },
+  methods: {
+    clearData(){
         this.poolDetailList = [[],[],[],[],[],[]]
         this.poolDetailListTips = [[],[],[],[],[],[]]
         this.poolDetailListIds = [[],[],[],[],[],[]]
@@ -198,17 +192,7 @@ export default {
         this.currentLis=[]
         this.notIds=[]               
         this.multipleItem=[]
-      }
     },
-    searchVal(newVal, preVal){
-      if(newVal.trim() == ''){
-        this.searchTagList();
-      }else if(newVal.trim() != preVal.trim()){
-        this.searchTagList();
-      }
-    }
-  },
-  methods: {
     selectTagOne(e,id,n){
       e.stopPropagation()
       this.activePartSon = n
@@ -279,9 +263,11 @@ export default {
         let tmpLis = list[i];
         if(tmpLis.length > 0){
           for(let j = 0;j < tmpLis.length;j++){
-            let tmpLi = list[i][j];
+            let tmpLi = list[i][j],objTmp={};
             if(!utils.filterArr(poolDetailListTips[i],tmpLi.controlType,2)){
-              poolDetailListTips[i].push(tmpLi.controlType)
+              objTmp.type = tmpLi.controlType
+              objTmp.name = tmpLi.name
+              poolDetailListTips[i].push(objTmp)
             }
             poolDetailListIds[i].push(tmpLi.id)
           }
@@ -401,6 +387,14 @@ export default {
             tmpArr.push(res.data.data[idStr]);
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
+                if(idx == 0 && res.data.data[idStr].questionDetailList && res.data.data[idStr].questionDetailList.length > 1){
+                  this.$message({
+                    showClose: true,
+                    message: '添加的数据有误',
+                    type: 'error'
+                  });
+                  return;
+                }
                 let ids = [];
                 this.poolDetailList[idx] = tmpArr;
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -416,7 +410,7 @@ export default {
                       this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);
                       this.searchTagList();
                       this.getPoolDetailListTips();
-                      return
+                      return;
                     }
                   }
                 }
@@ -430,7 +424,7 @@ export default {
             })
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
-                this.poolDetailList[idx] = tmpArr;
+                this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
                 this.searchTagList();
                 this.getPoolDetailListTips();

src/components/icss/SymptomTagGroup.vue

@@ -29,7 +29,7 @@
         <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
     </div>
     <div class="bottomPartRight ">
-      <p class="poolTitle">操作池</p>
+      <p class="poolTitle">操作界面：</p>
       <ul class="tagList operationPool">
             <li class = "tagItem"
                 v-for="(item) in rightTagsList2"