From 2f0f12423dfc7e1dc66c0023ca1b83b2f8b13642 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 25 十二月 2023 15:15:41 +0800
Subject: [PATCH] 原材料检验-附件上传功能2
---
src/views/quality/processInspect/processInspect-form.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index eb6f40d..42cef67 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename"
:disabled="processInspectVo.id != null" v-model="processInspectVo.material"
size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
@@ -38,6 +39,7 @@
:label="item.material" :value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -50,8 +52,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
<el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
@@ -304,12 +308,19 @@
getDeviceResultInfo(val){
console.log("鎵弿鍚庢暟鎹�",val);
let id=val.split("id@")[1]
- let filterData=this.deviceList.filter(item=>{
+ if(id!=undefined&&id!=''&&id!=null){
+ let filterData=this.deviceList.filter(item=>{
return item.id==id
})[0]
console.log(filterData);
this.row.eId=Number(id)
this.updateDevice(this.row)
+ }else{
+ this.$message({
+ message: '鏈瘑鍒嚭浜屼綅鐮佽閲忓櫒鍏蜂俊鎭紒',
+ type: 'warning'
+ });
+ }
},
codeDevice(row,index){
this.row=row
@@ -481,7 +492,7 @@
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)){
+ if(!/(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/.test(val)){
row.empiricalValueAddss[i] = null
_than.$message.error("璇疯緭鍏ユ暟瀛�")
isNumber = false
--
Gitblit v1.9.3