|
@@ -107,6 +107,7 @@
|
|
|
<div class="btnBox">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled = "isReady"
|
|
|
@click="submitForm('save')"
|
|
|
>校验并保存数据</el-button>
|
|
|
<el-button
|
|
@@ -171,7 +172,8 @@
|
|
|
isEdit: false,
|
|
|
saveDisable: false ,
|
|
|
hasQuestion: 1, //是否有问题词
|
|
|
- disNameExist: false //诊断名称是否存在
|
|
|
+ disNameExist: true, //诊断名称是否存在
|
|
|
+ isReady:false
|
|
|
}
|
|
|
},
|
|
|
created(){
|
|
@@ -390,8 +392,10 @@
|
|
|
}
|
|
|
|
|
|
if(disFeatureList[i].type == '3' && !disFeatureList[i].result ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
|
|
|
- const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
|
|
|
- let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
|
+ const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
|
|
|
+ // const regex2 = new RegExp(`、\\s*、{1,}`)
|
|
|
+ // const regex2 = new RegExp(`([^0-9]|\\s{0,1})${disFeatureList[i].code}([^0-9]|\\s{0,1})`)
|
|
|
+ let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
|
if(hasError) {
|
|
|
if(!disFeatureList[i].relation) {
|
|
|
disFeatureList[i].verifyRelation = "数据异常"
|
|
@@ -485,8 +489,10 @@
|
|
|
id: this.id,
|
|
|
modifier: this.modifier
|
|
|
}
|
|
|
+ this.isReady = true
|
|
|
return api.diagBaseVerifyData(param).then((res) => {
|
|
|
const data = res.data.data
|
|
|
+ this.isReady=false
|
|
|
if(type =='save') {
|
|
|
if(data.hasQuestion) {
|
|
|
this.warning('校验完成请先调整错误数据,该数据已保存')
|
|
@@ -514,7 +520,7 @@
|
|
|
}
|
|
|
this.hasQuestion = data.hasQuestion
|
|
|
|
|
|
- })
|
|
|
+ }).catch(()=>{this.isReady=false})
|
|
|
},
|
|
|
|
|
|
showConfirmDialog(msg, resolve) {
|
|
@@ -603,7 +609,6 @@
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
-
|
|
|
<style lang="less">
|
|
|
@import '../../less/common.less';
|
|
|
.AddDiagBaseWrapper {
|