From fd35a7076c61a789853a34511dbb1689e5658678 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 一月 2024 14:17:26 +0800
Subject: [PATCH] 生产调度bug修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3bbd00e..2e2a60c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -492,8 +492,7 @@
},
created(){
this.dataForm.id = this.$route.query.id
- this.resultVal = this.$route.query.resultVal
- console.log("aa--",this.resultVal);
+ this.resultVal = this.$route.params.resultVal
if(this.resultVal == null){
let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
val == undefined ? null : this.resultVal=val
@@ -893,10 +892,12 @@
for(var i=0;i<row.testValueList.length;i++){
let val = row.testValueList[i]
let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
- if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
- row.testValueList[i] = null
- this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁")
- isTrue = false
+ if(val.slice(-1)!='.'){
+ if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
+ row.testValueList[i] = null
+ this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁")
+ isTrue = false
+ }
}
}
if(!isTrue){
--
Gitblit v1.9.3