Merge branch 'test' into ChronicMag_zxc

src/components/icss/AddMedicalName.vue

@@ -56,13 +56,13 @@
               <td :title="item.name&&item.name.length>9?item.name:''">
                 <!-- 使用原生input，输入限制 -->
                 <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
-                <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
+                <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
               </td>
               <td v-if="!item.isEdit">
                 {{item.spell}}
               </td>
               <td v-else>
-                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin" class="spell">
+                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin" class="spell">
               </td>
               <td>
                 {{data.type}}
@@ -110,10 +110,10 @@
             <td :title="item.name&&item.name.length>9?item.name:''">
               <!-- 使用原生input，输入限制 -->
               <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
-              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index)">
+              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(2,index)">
             </td>
             <td>
-              <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="30"  @input="handlePinyin">
+              <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin">
             </td>
             <td>
               {{data.type}}

src/components/icss/PubIndeptTag.vue

@@ -448,6 +448,20 @@
       newSex(nextVal, prevVal) {
         this.tmpSex = prevVal;
       },
+      newType(nextVal, prevVal) {
+        if(nextVal == 4 || nextVal == 5){
+          this.form.region12 = '0'
+        }else{
+          this.form.region12 = '1'
+        }
+      },
+      newSign(nextVal, prevVal) {
+        if(this.form.region1 == 4 || this.form.region1 == 5){
+          this.form.region12 = '0'
+        }else{
+          this.form.region12 = '1'
+        }
+      },
       newName(nextVal, prevVal) {
         if (this.isNeedSearchSys && nextVal != prevVal && (this.form.region12 == 0)) {
           this.focusSystemName()

src/components/icss/PubTagGroup.vue

@@ -416,9 +416,19 @@ export default {
     },
     newType(nextVal, prevVal) {
       this.tmpOwn = prevVal;
+      if(nextVal == 4 || nextVal == 5){
+        this.form.region12 = '0'
+      }else{
+        this.form.region12 = '1'
+      }
     },
     newSign(nextVal, prevVal) {
       this.tmpType = prevVal;
+      if(this.form.region1 == 4 || this.form.region1 == 5){
+        this.form.region12 = '0'
+      }else{
+        this.form.region12 = '1'
+      }
       if (nextVal != prevVal && (this.form.region2 == 2 || this.form.region2 == 6 || this.form.region2 == 7 || this.form.region2 == 4 || this.form.region2 == 11)) {
         this.searchTagList()
       }