From b314e87e7292bfcc31b5b884af158a65da646c83 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 22 一月 2024 15:26:07 +0800
Subject: [PATCH] 原材料检验修改
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 10 ++++++----
src/views/quality/processconfiguration/index.vue | 2 +-
src/views/quality/rawMaterial/index.vue | 1 -
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index d6d25d3..4338b63 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -304,7 +304,7 @@
fun: this.Submitreview,
show: {
key: 'state',
- val: ['0']
+ val: [0]
}
})
}
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 661b2ea..ecdd037 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -393,7 +393,6 @@
formatJudgeState(row, column, cellValue){
if(cellValue != undefined && cellValue != null && cellValue != ''){
if(cellValue == 0){
- console.log(cellValue);
return "<span style='color:#E84738;'>涓嶅悎鏍�</span>"
}
return "<span style='color:#34BD66;'>鍚堟牸</span>"
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 00bbc6d..2e2a60c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -892,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