Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2024-01-25 36653c98622c8a74cb850575b2001457121b794c

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -892,12 +892,14 @@
            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(val.slice(-1)!='.'){
              if(!reg.test(val) && !['是','否'].includes(val)){
                  row.testValueList[i] = null
                  this.$message.error("请输入6位数字或选择是否")
                  isTrue = false
              }
            }
            }
            if(!isTrue){
              return
            }