zhouna %!s(int64=4) %!d(string=hai) anos
pai
achega
44396f43c4
Modificáronse 1 ficheiros con 27 adicións e 11 borrados
  1. 27 11
      src/components/knowledgeExtra/SubConditions.vue

+ 27 - 11
src/components/knowledgeExtra/SubConditions.vue

@@ -56,7 +56,7 @@
             </el-form-item>
             <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值:">
                 <div class="select-item clearfix">
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMaxOperator">
                             <el-select v-model="groupData.subMaxOperator"
                                        placeholder="请选择"
@@ -70,12 +70,12 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMaxValue">
                             <el-input type="text" v-model="groupData.subMaxValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMaxUnit">
                             <el-input  type="text" v-model.trim="groupData.subMaxUnit" placeholder="填写单位"/>
                         </el-form-item>
@@ -84,7 +84,7 @@
             </el-form-item>
             <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值:">
                 <div class="select-item clearfix">
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMinOperator">
                             <el-select v-model="groupData.subMinOperator"
                                        placeholder="请选择"
@@ -98,22 +98,22 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMinValue">
                             <el-input type="text" v-model="groupData.subMinValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="2">
+                    <el-col :span="3">
                         <el-form-item prop="subMinUnit">
                             <el-input  type="text" v-model.trim="groupData.subMinUnit" placeholder="填写单位"/>
                         </el-form-item>
                     </el-col>
                 </div>
             </el-form-item>
-            <el-form-item v-if="groupData.subType!==6&&groupData.dataType==='2'" label="医学内容:" prop="subEqValue" class="discDesc">
+            <el-form-item v-if="groupData.subType!==6&&groupData.dataType==='2'" label="医学内容:" prop="subEqValue" class="discDesc is-required">
                 <el-input type="textarea" rows="3" placeholder="请输入医学内容" v-model.trim="groupData.subEqValue"></el-input>
             </el-form-item>
-            <el-form-item v-if="groupData.subType===6" label="正则表达式:" prop="subEqValue" class="discDesc">
+            <el-form-item v-if="groupData.subType===6" label="正则表达式:" prop="subEqValue" class="discDesc is-required">
                 <el-input type="textarea" rows="3" placeholder="请输入正则表达式" v-model.trim="groupData.subEqValue"></el-input>
             </el-form-item>
         </el-form>
@@ -201,7 +201,16 @@
                                 callback();
                             }}, trigger: 'blur'
                     }],
-                    subEqValue:[{ required: true, message: '请输入'+(this.groupData.dataType==='2'?"医学内容":"正则表达式"),trigger: ['blur'] }],
+                    subEqValue:[{
+                        validator: (rule,value,callback)=>{
+                            if(value===''){
+                                callback(new Error('请输入'+this.textName));
+                            }else if(value.length>200){
+                                callback(new Error(this.textName+'不能超过200字'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
                 },
             }
         },
@@ -250,13 +259,17 @@
         computed:{
             showDataType:function(){
                return (this.numTypes+',').indexOf(this.groupData.subLenCode+',')===-1;
+            },
+            textName:function(){
+                return this.groupData.subType!==6&&this.groupData.dataType==='2'?'医学内容':'正则表达式';
             }
         },
         methods:{
             dataTypeChange(val){
-                this.groupData.subEqOperator=val==='2'?'=':undefined;
                 this.groupData.dataType=val;
-                this.clearNumText();
+                this.groupData.subEqOperator=(val==='2'?'=':'');
+                this.clearNumText();console.log(322,this.groupData)
+                this.$emit("changeVal",this.groupData,this.ind);
             },
             subTypeChange(val){        //基础规则类型修改
                 this.groupData.subLenCode='';
@@ -432,5 +445,8 @@
             height: 15px;
             line-height: 16px;
         }
+        .el-col-3 {
+            width: 94px;
+        }
     }
 </style>