|
@@ -239,18 +239,18 @@
|
|
|
<el-option v-for="(it,i) in sex" :key="i" :label="it.name" :value="it.name"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="年龄:" class="ages">
|
|
|
+ <el-form-item label="年龄:" class="ages is-required">
|
|
|
<el-input v-model.number="minAge" type="number" @input="inputAge"></el-input>
|
|
|
<span class="ageLine">~</span>
|
|
|
<el-input v-model.number="maxAge" type="number" @input="inputAge"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
- v-if="data.type=='实验室检查套餐'" label="最大值与最小值:" class="ages">
|
|
|
+ v-if="data.type=='实验室检查子项目'" label="最大值与最小值:" class="ages">
|
|
|
<el-input v-model.number="minValue" type="number" @input="inputAge"></el-input>
|
|
|
<span class="ageLine">~</span>
|
|
|
<el-input v-model.number="maxValue" type="number" @input="inputAge"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-if="data.type=='实验室检查套餐'" label="范围:" class="range">
|
|
|
+ <el-form-item v-if="data.type=='实验室检查子项目'" label="范围:" class="range">
|
|
|
<el-select v-model="rangeSelect">
|
|
|
<el-option v-for="(it,i) in range" :key="i" :label="it.name" :value="it.name"></el-option>
|
|
|
</el-select>
|
|
@@ -771,9 +771,13 @@ export default {
|
|
|
this.warning('请先选择标准词');
|
|
|
return;
|
|
|
}
|
|
|
+ if(this.data.type == '疾病' && !this.icdCode){
|
|
|
+ this.warning('请输入ICD10编码');
|
|
|
+ return;
|
|
|
+ }
|
|
|
// 年龄为必填项--2019-6-5需求
|
|
|
if (this.showMore == 1) {
|
|
|
- if ((!this.minAge && this.minAge != 0) || !this.maxAge) {
|
|
|
+ if ((!this.minAge && this.minAge !== 0) || !this.maxAge) {
|
|
|
this.warning('年龄不能为空,区间为0-200');
|
|
|
return;
|
|
|
}
|
|
@@ -786,8 +790,11 @@ export default {
|
|
|
this.warning('年龄必须是0-200');
|
|
|
return;
|
|
|
}
|
|
|
+ if(this.minValue >= this.maxValue){
|
|
|
+ this.warning('最小值小于最大值');
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
// 过滤同义词空数据
|
|
|
let realData = [];
|
|
|
if (this.id) {
|
|
@@ -1082,6 +1089,7 @@ td {
|
|
|
}
|
|
|
/deep/.ages {
|
|
|
margin-top: 20px;
|
|
|
+ position: relative;
|
|
|
.el-input {
|
|
|
display: inline-block;
|
|
|
width: auto;
|