Merge branch 'test' into dev2/zhangxc

src/components/icss/BloodPressTagGroup.vue

@@ -113,9 +113,7 @@ export default {
     },
     watch: {
         pool(newVal, preVal) {
-            if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-                this.leftTagsList = newVal
-            }
+          this.leftTagsList = newVal
         },
         searchVal(newVal, preVal){
             if(newVal.trim() == ''){
@@ -133,7 +131,7 @@ export default {
                     this.rightTagsList2 = [];
                     this.selectRightTagsList = [];
                     this.searchVal = '';
-                     this.searchTagList();
+                    //  this.searchTagList();
                 }
             }
         },

src/components/icss/PubTagGroup.vue

@@ -294,17 +294,16 @@ export default {
   watch: {
     newSex(nextVal, prevVal) {
       this.tmpSex = prevVal;
-      this.searchTagList()
+      if (nextVal != prevVal || this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 9) {
+        this.searchTagList()
+      }
     },
     newType(nextVal, prevVal) {
       this.tmpOwn = prevVal;
-      if (nextVal != prevVal) {
-        // this.searchTagList()
-      }
     },
     newSign(nextVal, prevVal) {
       this.tmpType = prevVal;
-      if (nextVal != prevVal) {
+      if (nextVal != prevVal || this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 9) {
         this.searchTagList()
       }
     },