Przeglądaj źródła

Squashed commit of the following:

commit 04ae023f0e0ad23ea0cefa9b2990217d78878590
Author: liucf <liucf@zjlantone.com>
Date:   Wed Aug 21 17:46:45 2019 +0800

    bug2041

commit e6b697f5b61f03e0f54522c6204e5191853ddacf
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Aug 20 13:55:38 2019 +0800

    独立标签性别不能修改(回滚之前独立标签修改可以修改性别)
liucf 6 lat temu
rodzic
commit
619bc009bc

+ 13 - 4
src/components/icss/AddMedicalName.vue

@@ -24,7 +24,7 @@
               <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="50" @blur="handleBlur(1)">
             </td>
             <td>
-              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin">
+              <input type="text" v-model="data.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin($event,1)">
             </td>
             <td>
               <!-- <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small" @change="selectType">
@@ -79,7 +79,7 @@
               </td>
               <td v-else> -->
               <td>
-                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin" class="spell">
+                <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin($event,2,index)" class="spell">
               </td>
               <td>
                 <!-- {{data.type}} -->
@@ -145,7 +145,7 @@
               <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="50"  @input="handlePinyin">
+              <input type="text" v-model="item.spell" placeholder="请输入拼音" maxlength="50"  @input="handlePinyin($event,3,index)">
             </td>
             <td>
               {{data.type}}
@@ -410,8 +410,17 @@ import pinyin from '../../js/Convert_Pinyin.js';
           }
         }
       },
-      handlePinyin(e){//只能输入英文
+      handlePinyin(e,flag,index){//只能输入英文
         e.target.value = e.target.value.replace(/[^a-zA-Z]/g,'');
+        // 解决输入数字不触发更新
+        if(flag==1){//标准词
+          this.data.spell = e.target.value;
+        }else if(flag==2){//同义词-修改
+          this.allwords[index].spell = e.target.value;
+        }else if(flag==3){//同义词-新增
+          this.synonymous[index].spell = e.target.value;
+        }
+        // e.target.value = e.target.value.replace(/[^a-zA-Z]/g,'');
       },
       addSpan(type){
         let singleSpan = {

+ 2 - 2
src/components/icss/PubIndeptTag.vue

@@ -210,10 +210,10 @@
                 label="性别:"
                 prop="region7"
             >
-                <!-- <span class="changeTips">改变性别后,标签明细将会恢复到默认状态</span> -->
+                <span class="changeTips">改变性别后,标签明细将会恢复到默认状态</span>
                 <el-select
                         v-model="form.region7"
-                        :disabled="!form.region1 || form.region2 == '99'"
+                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
                         @change="(e)=>readyChangeSelect(e,3)"
                 >
                     <el-option

+ 5 - 5
src/components/icss/SingleSelect.vue

@@ -210,11 +210,11 @@
             }
         },
         sexType(newVal, preVal) {
-            // if (newVal != preVal) {
-            //     if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
-            //         this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
-            //     }
-            // }
+            if (newVal != preVal) {
+                if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
+                    this.rows = [{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''},{name:'',defaultSelect:'',isBan:'',isNone:'',isError:''}];
+                }
+            }
         },
       },
       methods:{