浏览代码

Merge branch 'AIControl' into test

zhangxc 5 年之前
父节点
当前提交
f886246e24
共有 2 个文件被更改,包括 39 次插入10 次删除
  1. 11 8
      src/components/recordInput/AddRecordItem.vue
  2. 28 2
      src/components/recordInput/ManageItemBatch.vue

+ 11 - 8
src/components/recordInput/AddRecordItem.vue

@@ -211,10 +211,13 @@
             for(let i = 0; i < this.selectHospital.length; i++){
               const selectItem = this.selectHospital[i]
               let item = tableData.find(item => item.hospitalName === selectItem.hospitalName)
-              item.value = selectItem.score
-              item.tipMsg = selectItem.msg
-              item.isUsed = selectItem.isUsed
-              this.multipleSelection.push(item)
+              if(item) {
+                  item.value = selectItem.score
+                  item.tipMsg = selectItem.msg
+                  item.isUsed = selectItem.isUsed
+                  this.multipleSelection.push(item)
+              }
+            
             }
             this.tableData = tableData
             this.toggleSelection(this.multipleSelection)
@@ -295,12 +298,12 @@
                 showClose: true
               })
               this.canSave = true
-              return
+              returnxiaoyudengy
             }
             var reg = new RegExp(/^\d+(\.\d)?$/);
-            if(!reg.test(item.value)){
+            if(!reg.test(item.value) || item.value > 100){
                this.$message({
-                message:'扣分值请输入≥0的数字,最多保留小数点后1位',
+                message:'扣分值请输入≥0且≤100的数字,最多保留小数点后1位',
                 type:'warning',
                 showClose: true
               });
@@ -470,7 +473,6 @@
               .el-input__inner{
                     width:80px;
                     height: 30px;
-                    line-height: 30px;
                     display: inline-block;
                     box-sizing: border-box;
                 }
@@ -484,6 +486,7 @@
             }
             /deep/.el-input input[type="number"]{
               -moz-appearance: textfield;
+              line-height: 20px;
             }
 
         

+ 28 - 2
src/components/recordInput/ManageItemBatch.vue

@@ -354,9 +354,9 @@
               return
             }
             var reg = new RegExp(/^\d+(\.\d)?$/);
-            if(!reg.test(value.score)){
+            if(!reg.test(value.score) || value.score >100){
                this.$message({
-                message:'扣分值请输入≥0的数字,最多保留小数点后1位',
+                message:'扣分值请输入≥0且≤100的数字,最多保留小数点后1位',
                 type:'warning',
                 showClose: true
               });
@@ -542,6 +542,31 @@
             -webkit-transform: rotate(45deg) scaleY(1);
             transform: rotate(45deg) scaleY(1);
         }
+        .active.disabled::after{
+           -webkit-box-sizing: content-box;
+            box-sizing: content-box;
+            content: "";
+            border: 1px solid #c9cdd5;
+            border-left: 0;
+            border-top: 0;
+            height: 7px;
+            left: 4px;
+            position: absolute;
+            top: 1px;
+            -webkit-transform: rotate(45deg) scaleY(0);
+            transform: rotate(45deg) scaleY(0);
+            width: 3px;
+            -webkit-transition: -webkit-transform .15s ease-in .05s;
+            transition: -webkit-transform .15s ease-in .05s;
+            transition: transform .15s ease-in .05s;
+            transition: transform .15s ease-in .05s, -webkit-transform .15s ease-in .05s;
+            transition: transform .15s ease-in .05s,-webkit-transform .15s ease-in .05s;
+            -webkit-transform-origin: center;
+            transform-origin: center;
+            -webkit-transform: rotate(45deg) scaleY(1);
+            transform: rotate(45deg) scaleY(1);
+         
+        }
         .disabled{
           cursor: not-allowed;
           background-color: #edf2fc;
@@ -576,6 +601,7 @@
             }
         /deep/.el-input input[type="number"]{
           -moz-appearance: textfield;
+          line-height: 20px;
         }
         /deep/.scoreInp.el-input{
               width:50px;