From dbdc40f3b084afdb3737d29c5d7a1a53a1327ea1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 16:54:54 +0800
Subject: [PATCH] 完善温升、热循环检验
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 78 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f5ace4a..eeaebea 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -64,6 +64,7 @@
white-space: normal;
}
.thermal-table{
+ min-width: calc(100% - 10px);
margin: 5px 5px 0;
table-layout: fixed;
}
@@ -592,17 +593,17 @@
<el-divider></el-divider>
<h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">鐑惊鐜楠屽師濮嬭褰�</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
- <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
- <el-input clearable v-model="thermalCyclingInfo.model" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
- <el-input clearable v-model="thermalCyclingInfo.methodName" disabled size="small" placeholder=""></el-input>
- </el-form-item>
- <el-form-item label="寰幆娆℃暟:" style="margin-bottom: 0;" v-if="thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
- <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px" size="small" @change="thermalCyclingChange"></el-input-number>
- </el-form-item>
- <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
<el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
+ <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.model" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.methodName" disabled size="small" placeholder=""></el-input>
</el-form-item>
</el-form>
<el-divider></el-divider>
@@ -617,9 +618,6 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇О:" >
- <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
- </el-form-item>
<el-form-item label="浠櫒缂栧彿:">
<el-select v-model="equipForm.code1" placeholder="璇烽�夋嫨" size="small">
<el-option
@@ -630,7 +628,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 10px;" @click="handleAddThermal">鏂板</el-button>
+ <el-form-item label="寰幆娆℃暟:" v-if="thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
+ <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
+ </el-form-item>
+ <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal">鏂板</el-button>
<el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal">鍒犻櫎</el-button>
</el-form>
<div class="table-container" v-loading="thermalCyclingLoading">
@@ -648,7 +649,7 @@
<el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
<span style="font-size: 12px;margin-left: 13px;margin-right: 13px;"> 鈩�</span>
</div>
- <div style="display: flex;align-items: center;" v-if="item.name!='鐜娓╁害'||thermalCyclingInfo.inspectionItemClass!='鐩存祦鐢甸樆'">
+ <div style="display: flex;align-items: center;" v-if="item.name!='鐜娓╁害'&&thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
<label style="width: 100px;white-space: nowrap;font-size: 12px;">鐩存祦鐢甸樆:</label>
<el-input clearable size="small" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
<span style="margin-left: 5px;font-size: 12px;"> 惟/km</span>
@@ -1398,6 +1399,13 @@
if (res.code == 201) return
let {productVos,sampleVo} = res.data
this.thermalCyclingInfo = {...this.thermalCyclingInfo,...sampleVo}
+ if(this.thermalCyclingInfo.inspectionItem>1){
+ for(let i in this.param){
+ if(this.param[i].inspectionItemSubclass){
+ delete this.param[i]
+ }
+ }
+ }
if(productVos.length>0){
this.thermalCyclingInfo.inspectionItemClass = productVos[0].insProduct.inspectionItemClass
productVos.forEach(item=>{
@@ -1430,6 +1438,7 @@
case 'insValue':
let insValue = JSON.parse(insProductResult[i])
if(insValue&&insValue.length>0){
+ this.thermalCyclingInfo.length = 0
this.thermalCyclingInfo.arr.forEach(a=>{
if(a.name==obj.inspectionItemSubclass){
a.arr = []
@@ -1438,6 +1447,7 @@
value0:insValue[i].v,
value1:insValue[i].w,
})
+ this.thermalCyclingInfo.length++
}
a.insResult = obj.insResult
}
@@ -1448,9 +1458,9 @@
i:obj.id,
r:0,
c:0,
+ w:m.w,
v:{
- v:m.v,
- w:m.w
+ v:m.v
}
})
})
@@ -1464,6 +1474,18 @@
v:obj.insResult
}
}
+ }else{
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ a.insResult = null
+ a.arr = []
+ a.arr.push(
+ {
+ value0:'',
+ value1:''
+ }
+ )
+ })
+ this.thermalCyclingInfo.length = 1
}
})
}
@@ -1624,7 +1646,7 @@
}
}
})
- // console.log(1111,this.param)
+ console.log(1111,this.param)
this.saveInsContext()
},
// 鐑惊鐜�---缁撴潫
@@ -1958,7 +1980,7 @@
}
]
obj.insResult = null;
- }else{}
+ }
return obj
})
this.thermalCyclingInfo.arr = arr;
@@ -2216,10 +2238,19 @@
} catch (e) {}
try {
let equipValue = JSON.parse(a.insProductResult.equipValue)
+ this.param[a.id].equipValue = []
+ for (let i = 0; i < equipValue.length; i++) {
+ this.param[a.id].equipValue.push({
+ v:{
+ v:''
+ }
+ })
+ }
for (let i = 0; i < equipValue.length; i++) {
if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
// 娓╁害寰幆璁惧璧嬪��
this.$set(this.equipForm,`code`+i,equipValue[i].v)
+ this.param[a.id].equipValue[i].v.v = equipValue[i].v
}else{
this.param[a.id].equipValue[i].v.v = equipValue[i].v
if(equipValue[i].v){
@@ -2244,10 +2275,19 @@
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
+ this.param[a.id].equipName = []
+ for (let i = 0; i < equipName.length; i++) {
+ this.param[a.id].equipName.push({
+ v:{
+ v:''
+ }
+ })
+ }
for (let i = 0; i < equipName.length; i++) {
if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`value`+i,equipName[i].v)
+ this.param[a.id].equipName[i].v.v = equipName[i].v
}else{
this.param[a.id].equipName[i].v.v = equipName[i].v
}
--
Gitblit v1.9.3