|
@@ -91,9 +91,26 @@
|
|
},
|
|
},
|
|
validatePass() { //验证成功回调,调取接口
|
|
validatePass() { //验证成功回调,调取接口
|
|
//仍需验证标签明细是否选择
|
|
//仍需验证标签明细是否选择
|
|
- if (this.itemsTypes.includes(+this.dataPub.region2)&&this.options.length==0) {
|
|
|
|
|
|
+ console.log('this.options',this.options)
|
|
|
|
+ let isNull = true
|
|
|
|
+ let options2 = []
|
|
|
|
+ for (let i = 0; i < this.options.length; i++) {
|
|
|
|
+ if(this.options[i].name.trim() != '') {
|
|
|
|
+ isNull = false
|
|
|
|
+ options2.push(this.options[i])
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ this.options = options2;
|
|
|
|
+ if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '至少填一个选项',
|
|
|
|
+ type: 'warning'
|
|
|
|
+ });
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if(this.dataPub.region8 > this.dataPub.region9) {
|
|
this.$message({
|
|
this.$message({
|
|
- message: '至少填一个选项',
|
|
|
|
|
|
+ message: '最小年龄不能大于最大年龄',
|
|
type: 'warning'
|
|
type: 'warning'
|
|
});
|
|
});
|
|
return;
|
|
return;
|
|
@@ -121,7 +138,8 @@
|
|
"minValue": this.dataPub.minNormalVal, //化验最小正常值
|
|
"minValue": this.dataPub.minNormalVal, //化验最小正常值
|
|
"maxValue": this.dataPub.maxNormalVal, //化验最大正常值
|
|
"maxValue": this.dataPub.maxNormalVal, //化验最大正常值
|
|
"questionDetails": this.options,
|
|
"questionDetails": this.options,
|
|
- "questionMappings": [] //映射关系,
|
|
|
|
|
|
+ "questionMappings": [], //映射关系,
|
|
|
|
+ "formulaCode": isEdit?data.formulaCode : ''
|
|
}
|
|
}
|
|
};
|
|
};
|
|
this.showSaveDialog(param);
|
|
this.showSaveDialog(param);
|