Merge branch 'dev2/luolei' into dev2/zhangxc

src/components/icss/PubTagGroup.vue

@@ -294,16 +294,17 @@ export default {
   watch: {
     newSex(nextVal, prevVal) {
       this.tmpSex = prevVal;
+      this.searchTagList()
     },
     newType(nextVal, prevVal) {
       this.tmpOwn = prevVal;
       if (nextVal != prevVal) {
-        this.searchTagList()
+        // this.searchTagList()
       }
     },
     newSign(nextVal, prevVal) {
       this.tmpType = prevVal;
-      if (nextVal != prevVal && JSON.stringify(this.form.tagPool) != '[]' ) {
+      if (nextVal != prevVal) {
         this.searchTagList()
       }
     },
@@ -324,10 +325,13 @@ export default {
     },
     searchTagList() {
       let region1 = this.form.region1, region2 = this.form.region2;
-      let param = {
+      let param1 = !!region2 ? api.getGroupParams(region2): {};
+      let param2 = {
         "type": region1,
         "sexType": this.form.region7,
       }
+      let param = Object.assign(param1,param2)
+
       api.searchTagList(param).then((res) => {
         if (res.data.code === '0') {
           this.form.tagPool = res.data.data
@@ -362,13 +366,11 @@ export default {
     changeSex(data) {   //改变性别清空数据
       this.$emit('changeVal', this.form, false)
       this.$emit('changeSex', data, false)
-      this.searchTagList()
     },
     readyChangeSelect(tmpData,type) {
       if(type === 1) {
         this.form.region2 = '';
         this.labelTypes = this.labelTypesList.filter(item => this.labelTypesMaps[tmpData].indexOf(item.val) > -1)
-        
       }
       this.changeSex(tmpData);
       // if(type == 3){

src/components/icss/SymptomTagGroup.vue

@@ -102,35 +102,42 @@ export default {
         }
     },
     mounted() {
-        this.rightTagsList2 = this.options
-        let newArr = []
-        for (let i = 0; i < this.rightTagsList2.length; i++) {
-            if(this.rightTagsList2[i].tagType == 8) {
-                newArr.push({ text: this.rightTagsList2[i].tagName ,type:'input' ,id: i+',,,'})
-            } else {
-                if(i === 0 ) {
-                    newArr.push({ text: '' ,type:'input' ,id: i+',,,'})
-                }
-                newArr.push(this.rightTagsList2[i])
-                if(!this.rightTagsList2[i+1] || this.rightTagsList2[i+1]&&this.rightTagsList2[i+1].tagType != 8) {
-                    newArr.push({ text: '' ,type:'input' ,id: i+',,,,'})
-                }
-            }
+      this.$nextTick(()=>{
+        let tagList = this.options;
+        if(tagList.length > 0){
+          console.log(99)
+          this.rightTagsList2 = this.options
+          let newArr = []
+          for (let i = 0; i < this.rightTagsList2.length; i++) {
+              if(this.rightTagsList2[i].tagType == 8) {
+                  newArr.push({ text: this.rightTagsList2[i].tagName ,type:'input' ,id: i+',,,'})
+              } else {
+                  if(i === 0 ) {
+                      newArr.push({ text: '' ,type:'input' ,id: i+',,,'})
+                  }
+                  newArr.push(this.rightTagsList2[i])
+                  if(!this.rightTagsList2[i+1] || this.rightTagsList2[i+1]&&this.rightTagsList2[i+1].tagType != 8) {
+                      newArr.push({ text: '' ,type:'input' ,id: i+',,,,'})
+                  }
+              }
+          }
+          this.rightTagsList2 = newArr
+          this.$emit('changeActionData',this.rightTagsList2, false);
+          this.searchTagList()
         }
-        this.rightTagsList2 = newArr
-        this.$emit('changeActionData',this.rightTagsList2, false);
-        this.searchTagList()
+      })
+        
         // this.leftTagsList = this.pool
         // console.log('TAGPOOL', this.pool)
     },
     watch: {
         pool(newVal, preVal) {
              this.leftTagsList = newVal
-            console.log('sdsadasdasdasdas11111111', newVal,'asds',preVal)
-            if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                console.log('sdsadasdasdasdas')
-                //  this.leftTagsList = newVal
-            }
+            // console.log('sdsadasdasdasdas11111111', newVal,'asds',preVal)
+            // if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+            //     console.log('sdsadasdasdasdas')
+            //     //  this.leftTagsList = newVal
+            // }
         },
         searchVal(newVal, preVal){
             if(newVal.trim() == ''){