7367

src/components/knowledgeExtra/RuleManager.vue

@@ -3,7 +3,7 @@
         <crumbs title="规则维护" :minWidth="titleWidth" class="knowledgeTitle">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="规则名称：">
-                    <el-input size="mini" v-model="filter.parDescription" placeholder="输入规则名称"></el-input>
+                    <el-input size="mini" v-model="filter.parDescription" placeholder="输入规则名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="规则类型：">
                     <el-select v-model="filter.parRuleType" clearable placeholder="请选择" size="mini">
@@ -16,7 +16,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="术语名称：">
-                    <el-input size="mini" v-model="filter.parConceptName" placeholder="输入术语名称"></el-input>
+                    <el-input size="mini" v-model="filter.parConceptName" placeholder="输入术语名称"  clearable></el-input>
                 </el-form-item>
                 <el-form-item label="状态：">
                     <el-select v-model="filter.parStatus" clearable placeholder="请选择" size="mini">

src/components/knowledgeExtra/SubConditions.vue

@@ -60,7 +60,7 @@
                         <el-form-item prop="subMaxOperator">
                             <el-select v-model="groupData.subMaxOperator"
                                        placeholder="请选择"
-                                       size="small">
+                                       size="small" clearable>
                                 <el-option
                                         v-for="item in operMaxList"
                                         :key="item.key"
@@ -88,7 +88,7 @@
                         <el-form-item prop="subMinOperator">
                             <el-select v-model="groupData.subMinOperator"
                                        placeholder="请选择"
-                                       size="small">
+                                       size="small" clearable>
                                 <el-option
                                         v-for="item in operMinList"
                                         :key="item.name"
@@ -154,12 +154,22 @@
                     subLenCode:[{ required: true, message: '请选择基础规则术语类型',trigger: ['change'] }],
                     subConceptId:[{ required: true, message: '请输入医学标准术语',trigger: ['blur'] }],
                     dataType:[{ required: true, message: '请选择类型',trigger: ['change'] }],
-                    subMaxOperator:[{ required: true, message: '请选择最大值操作符',trigger: ['change'] }],
-                    subMaxValue:[{ required: true, message: '请输入最大值',trigger: ['blur'] }],
-                    subMaxUnit:[{ required: true, message: '请输入最大值单位',trigger: ['blur'] }],
-                    subMinOperator:[{ required: true, message: '请选择最小值操作符',trigger: ['change'] }],
-                    subMinValue:[{ required: true, message: '请输入最小值',trigger: ['blur'] }],
-                    subMinUnit:[{ required: true, message: '请输入最小值单位',trigger: ['blur'] }],
+                    subMaxOperator:[{
+                        validator: (rule,value,callback)=>{
+                            if((!value)&&this.groupData.subMinOperator===''){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
+                    subMinOperator:[{
+                        validator: (rule,value,callback)=>{
+                            if((!value)&&this.groupData.subMaxOperator===''){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
                     subEqValue:[{ required: true, message: '请输入医学内容',trigger: ['blur'] }],
                 },
             }
@@ -199,6 +209,11 @@
             this.conceptList=[{conceptName:this.groupData.subLibName,conceptId:this.groupData.subConceptId}];
         },
         methods:{
+            minMaxValidate(rule, value, callback){
+                if(this.groupData.dataType==='1'){
+
+                }
+            },
             dataTypeChange(val){
                 this.groupData.subEqOperator=val==='2'?'=':undefined;
                 this.groupData.dataType=val;
@@ -363,6 +378,7 @@
         }
         .el-form-item__error{
             top: auto;
+            white-space: nowrap;
         }
         .el-input-number{
             width: 95px;