Merge branch 'dev' into ChronicMag_zxc

src/components/icss/PubIndeptTag.vue

@@ -49,7 +49,7 @@
             </el-form-item>
             <el-form-item
               v-show="form.region1 == 4 "
-              :label="'是否当化验推送项'"
+              :label="'当为查体推送项时，需要检索标准术语'"
               prop="region12"
             >
               <span
@@ -562,7 +562,6 @@
             width: 40px;
             padding: 0 5px;
         }
-
     }
     .PubTagGroupWrapper .fix-inp .el-col .el-input__inner{
         width: 100%;

src/components/icss/PubTagGroup.vue

@@ -375,6 +375,7 @@ export default {
       systom: null,      //标签系统名称存在与否
       systemNameShow: false,//系统名称列表显示
       systemNameLis: [],//系统名称列表
+      isNeedSearch:false
     }
   },
   computed: {
@@ -419,7 +420,7 @@ export default {
       }
     },
     newName(nextVal, prevVal) {
-      if (nextVal != prevVal && (this.form.region12 == 0)) {
+      if (this.isNeedSearch && nextVal != prevVal && (this.form.region12 == 0)) {
         this.focusSystemName()
       }
     },
@@ -440,6 +441,7 @@ export default {
       }
     },
     focusSystemName() {
+      this.isNeedSearch = true
       if (this.form.region3.trim() == '') {
         this.systemNameShow = false
         this.systemNameLis = []
@@ -471,6 +473,7 @@ export default {
       }
     },
     pushSystemName(val) {
+      this.isNeedSearch = false
       this.form.region3 = val
       this.systemNameShow = false
     },
@@ -629,7 +632,7 @@ export default {
       top: 28px;
     }
     .el-form-item__label {
-      line-height: 30px;
+      line-height: 24px !important;
       text-align: left;
     }
     .el-input__icon {