From 0119182fc7947e3bd2299a24bba7e25e913dbddc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 22 十二月 2023 09:47:40 +0800
Subject: [PATCH] modified: src/api/plan/productionschedul.js modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index f0c5d4f..811d792 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -424,6 +424,12 @@
},
getResultInfo(data){
console.log("鎵弿鍚庢墽琛�",data);
+ if(!data.includes("part_no")){
+ this.$message({
+ message: '鏈瘑鍒嚭浜屼綅鐮侀浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
let obj=JSON.parse(data)
let info={"code":obj["part_no"]}
console.log("鍊�",info);
@@ -573,7 +579,7 @@
required: null,
rpId: null,
name: null,
- unit: null,
+ unit: 'mm',
userName: null,
testValue: '',
testValueList: [],
@@ -709,7 +715,7 @@
let isTrue = true
for(var i=0;i<row.testValueList.length;i++){
let val = row.testValueList[i]
- let reg = /^[0-9]*[1-9][0-9]*$/
+ let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
this.$message.error("璇疯緭鍏ユ暟瀛楁垨閫夋嫨鏄惁")
row.testValueList[i] = null
@@ -767,7 +773,7 @@
required: null,
rpId: null,
name: null,
- unit: null,
+ unit: 'mm',
userName: null,
testValue: null,
testValueList: [],
--
Gitblit v1.9.3