7450

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="4">
+                    <el-col :span="2">
                         <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="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMaxValue">
-                            <el-input-number controls-position="right" type="text" v-model="groupData.subMaxValue" placeholder="填写数值"/>
+                            <el-input type="text" v-model="groupData.subMaxValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMaxUnit">
                             <el-input  type="text" v-model="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="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMinOperator">
                             <el-select v-model="groupData.subMinOperator"
                                        placeholder="请选择"
@@ -98,12 +98,12 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
-                        <el-form-item prop="subMaxValue">
-                            <el-input-number controls-position="right" type="text" v-model="groupData.subMinValue" placeholder="填写数值"/>
+                    <el-col :span="2">
+                        <el-form-item prop="subMinValue">
+                            <el-input type="text" v-model="groupData.subMinValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMinUnit">
                             <el-input  type="text" v-model="groupData.subMinUnit" placeholder="填写单位"/>
                         </el-form-item>
@@ -156,7 +156,9 @@
                     dataType:[{ required: true, message: '请选择类型',trigger: ['change'] }],
                     subMaxOperator:[{
                         validator: (rule,value,callback)=>{
-                            if((!value)&&this.groupData.subMinOperator===''){
+                            const {subMaxValue,subMinOperator,subMinValue}=this.groupData;
+                            const val=value+subMinOperator+subMinValue+subMaxValue;
+                            if(!val||(!value&&subMaxValue!=='')){
                                 callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
                             }else{
                                 callback();
@@ -164,8 +166,36 @@
                     }],
                     subMinOperator:[{
                         validator: (rule,value,callback)=>{
-                            if((!value)&&this.groupData.subMaxOperator===''){
+                            const {subMaxValue,subMaxOperator,subMinValue}=this.groupData;
+                            const val=value+subMaxOperator+subMinValue+subMaxValue;
+                            if(!val||(!value&&subMinValue!=='')){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
+                    subMaxValue:[{
+                        validator: (rule,value,callback)=>{
+                            const {subMaxOperator,subMinOperator,subMinValue}=this.groupData;
+                            const val=value+subMaxOperator+subMinValue+subMinOperator;
+                            const isNum=/^\d+$/.test(value);
+                            if(!val){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else if(value!==''&&!isNum){
+                                callback(new Error('只能输入数字'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
+                    subMinValue:[{
+                        validator: (rule,value,callback)=>{
+                            const {subMaxValue,subMinOperator,subMaxOperator}=this.groupData;
+                            const val=value+subMaxOperator+subMaxValue+subMinOperator;
+                            const isNum=/^\d+$/.test(value);
+                            if(!val){
                                 callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else if(value!==''&&!isNum){
+                                callback(new Error('只能输入数字'));
                             }else{
                                 callback();
                             }}, trigger: 'blur'