From aa6bb1f2363c33e1d3a6c03e984b928160dcca5c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十二月 2023 16:32:09 +0800
Subject: [PATCH] 修改工艺文件
---
src/views/quality/processInspect/processInspect-form.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index eb6f40d..01a072a 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>
@@ -100,13 +104,13 @@
default-expand-all style="width: 100%"
ref="table"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
- <el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
- <el-table-column prop="iunit" label="鍗曚綅" width="240"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="240"></el-table-column>
+ <el-table-column type="index" label="搴忓彿" show-overflow-tooltip width="60"></el-table-column>
+ <el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="140"></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
- label="妫�娴嬪��" width="240" style="text-align: center;">
+ label="妫�娴嬪��" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
@@ -132,12 +136,12 @@
</el-col>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<span v-if="resultVal != null && scope.row.iname != null"
v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:80%" v-model="scope.row.eId" v-if="scope.row.iname != null"
+ <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
filterable @change="updateDevice(scope.row, scope.$index)">
<el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
:label="item.code + '-' + item.name"></el-option>
@@ -151,8 +155,8 @@
</div>
</template>
</el-table-column>
- <el-table-column
- label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ <el-table-column show-overflow-tooltip
+ label="妫�楠屾弿杩�" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
@@ -188,8 +192,8 @@
<el-table border height="90" :data="inspectionResultForm"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
:cell-style="{ textAlign: 'center' }">
- <el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="materialCode" width="200" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="material" width="200" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
@@ -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