From 93bb83a3376eb619a4a2673373f15849cd99337d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 19:46:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 2d674d4..31f055e 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -41,8 +41,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ <el-form-item label="浜у搧缂栧彿锛�">
+ <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -50,7 +50,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specs" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ <el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -113,7 +113,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row,true)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
@@ -417,7 +417,23 @@
this.processInspectVo.material = sample.material
this.technologyList = sample.children
},
- changeState(row) {
+ changeState(row,isChecked) {
+ console.log(row);
+ const _than = this
+ if(isChecked){
+ let isNumber = true
+ for(var i=0;i<row.empiricalValueAddss.length;i++){
+ let val = row.empiricalValueAddss[i]
+ if(!/^[0-9]*[1-9][0-9]*$/.test(val)){
+ row.empiricalValueAddss[i] = null
+ _than.$message.error("璇疯緭鍏ユ暟瀛�")
+ isNumber = false
+ }
+ }
+ if(!isNumber){
+ return
+ }
+ }
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
@@ -433,7 +449,6 @@
ppid: row.iid,
inspectionValue: str,
note : row.inote
-
}
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
--
Gitblit v1.9.3