浏览代码

Squashed commit of the following:

commit 6c083881b7554b3ad9b835cf695f7324f634030d
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 24 16:54:19 2019 +0800

    慢病指标值只能输入数字修改

commit e575cad7462b444170c12908aa9c48fb7ec2437a
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 22 11:11:49 2019 +0800

    慢病指标值关联维护不可输入负数1068

commit de8455b86c106eaf74168e08cc28a4c2acece420
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 22 10:10:49 2019 +0800

    合并dev分支

commit 2783ddd9504d11df0fd778ce8879af4ad67ab97c
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 21 17:33:52 2019 +0800

    术语关联维护去掉状态

commit 83dda5a82d73bee22a5853df59de64e89297d505
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 21 10:23:35 2019 +0800

    合并dev分支

commit d74975f1371e7c81f3bf2e6a5bc13cf4958967cf
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 20 15:43:47 2019 +0800

    输入限制;搜索去重;添加类型

commit f041b11e2915b7cbd0bed54a522957df996f7025
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:50:20 2019 +0800

    合并dev分支

commit f22d1696ff132969ad0ca4ed65e5990a8ce7c09c
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:08:04 2019 +0800

    化验子项和术语关联维护联调完成

commit 4e0ca46985b6835a252cde585e928b570e011d7a
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 16:53:37 2019 +0800

    医学术语枚举获取;免责声明接口调整

commit 3522504bbf0b0184581dddf0a0a5df825a150d18
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 10:33:39 2019 +0800

    化验子项,术语关联维护

commit 169e6da63ea0da5047c3eab6bab8646917c1013e
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:06:38 2019 +0800

    合并dev分支

commit 42d9caa7ccf59a8620a7978219f85addf90b6088
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:02:21 2019 +0800

    修改文案

commit 1c888406cf9074c8306750347cf8418fba1db0b4
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 17:16:57 2019 +0800

    合并dev分支

commit cef77de3efd6a8a94d354ee68981bce29880dc41
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 8 15:55:24 2019 +0800

    合并

commit 0e4c4baade1f149d57a0073f6709064344221587
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 23 16:54:19 2019 +0800

    添加别名页面归属处理

# Conflicts:
#	src/components/icss/AddChronicAndIndexRelation.vue
#	src/components/icss/AddMedicalMultRelation.vue
#	src/components/icss/ChronicAndIndexRelation.vue
#	src/components/icss/MedicalMultRelation.vue
#	src/components/icss/PhysicalExamTemplate.vue
#	src/routes.js
liucf 6 年之前
父节点
当前提交
511414d177
共有 2 个文件被更改,包括 7 次插入8 次删除
  1. 6 7
      src/components/icss/AddChronicAndIndexRelation.vue
  2. 1 1
      src/components/icss/MedicalMultRelation.vue

+ 6 - 7
src/components/icss/AddChronicAndIndexRelation.vue

@@ -54,7 +54,7 @@
                 </tr>
                 <tr v-for="(item, index) in selectedIndexList" :key="item.indexUnique"> 
                     <td class="selectedContent ">{{item.indexUnique}}</td>
-                    <td class="selectedContentGroup"><input class="groupInput" type="number" min="0"  v-model="item.indexDesc" @change="handleInp(index,$event)"></td>
+                    <td class="selectedContentGroup"><input class="groupInput" type="text" v-model="item.indexDesc" @input="handleInp(index,$event)"></td>
                     <td class="selectedContentOpera"><el-button type="text" size="small" class="delete" @click="delSelectedIndex(item, index)">删除</el-button></td>
                 </tr>
             </table>
@@ -241,12 +241,11 @@
                 duration:time || '3000'
             })
         },
-        handleInp(index,e){ //分组不能输入负数 
-            const value = e.target.value;
-            if(parseFloat(value)<0){
-                e.target.value = '';
-                this.selectedIndexList[index].indexDesc = '';
-            }
+        handleInp(index,e){ //分组不能输入负数
+            const value =  e.target.value;
+            const item = this.selectedIndexList[index].indexDesc;
+            e.target.value = value.replace(/[^\d]/g,'');
+            this.selectedIndexList[index].indexDesc = item.replace(/[^\d]/g,'');
         }
     }
   }

+ 1 - 1
src/components/icss/MedicalMultRelation.vue

@@ -265,4 +265,4 @@
     #upFile{
       display: none !important;
     }
-</style>
+</style>