From ff017259dac281ca30195b4d2d337f14c24f9332 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 19 十二月 2024 14:16:25 +0800
Subject: [PATCH] 完成cnas8.7搬迁
---
src/components/do/b1-inspect-order-plan/humidity.vue | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/humidity.vue b/src/components/do/b1-inspect-order-plan/humidity.vue
index 8bf256a..3fc68d0 100644
--- a/src/components/do/b1-inspect-order-plan/humidity.vue
+++ b/src/components/do/b1-inspect-order-plan/humidity.vue
@@ -16,7 +16,7 @@
<el-option
v-for="item in equipOptions"
:key="item.value"
- :label="item.label"
+ :label="item.value"
:value="item.value">
</el-option>
</el-select>
@@ -52,6 +52,15 @@
</el-select>
</td>
</tr>
+ <tr v-if="item.inspectionItemSubclass&&item.inspectionItemSubclass.includes('浣�')">
+ <td>鐢佃皟缁撴灉</td>
+ <td v-for="(m,i) in item.list0" :key="i">
+ <el-input v-model="m.value" :placeholder="'绗�'+(i+1)+'娆�'" size="small" :disabled="state>1" style="display: inline-block;width: 50%;" @change="save(item)"></el-input>
+ <el-button icon="el-icon-minus" circle size="mini" type="danger"
+ :disabled="state>1" style="margin: 5px;display: inline-block;" @click="deleteList(item.list0,i,m)" ></el-button>
+ <el-button icon="el-icon-plus" circle size="mini" type="primary" :disabled="state>1" style="margin: 5px;display: inline-block;" v-if="i==item.list0.length-1&&i<4" @click="addList(item.list0,item.list0.length-1)"></el-button>
+ </td>
+ </tr>
<tr style="background-color: #F0F1F5;">
<td colspan="2">鏃堕棿</td>
<td colspan="1">娓╁害</td>
@@ -60,21 +69,21 @@
</tr>
<tr v-for="(m,i) in item.list" :key="i+item.id">
<td colspan="2">
- <el-time-picker
- v-model="m.time"
- placeholder="鏃堕棿" size="small" editable format="HH:mm" value-format="HH:mm" style="width: 100%;" @change="save(item)" :disabled="state>1">
- </el-time-picker>
+ <el-date-picker
+ v-model="m.time"
+ placeholder="鏃堕棿" size="small" editable format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" style="width: 100%;" @change="save(item)" :disabled="state>1" type="datetime">
+ </el-date-picker>
</td>
<td colspan="1">
- <el-input v-model="m.temperature" placeholder="娓╁害" size="small" @blur ="handleReplace(m,'鈩�','temperature',item)" :disabled="state>1"></el-input>
+ <el-input v-model="m.temperature" placeholder="娓╁害" size="small" @change ="a=>handleReplace(m,'鈩�','temperature',item)" :disabled="state>1"></el-input>
</td>
<td colspan="1">
- <el-input v-model="m.humidity" placeholder="婀垮害" size="small" @blur ="handleReplace(m,'%rh','humidity',item)" :disabled="state>1"></el-input>
+ <el-input v-model="m.humidity" placeholder="婀垮害" size="small" @change ="a=>handleReplace(m,'%rh','humidity',item)" :disabled="state>1"></el-input>
</td>
<td colspan="2">
<el-button icon="el-icon-minus" circle size="mini" type="danger"
@click="deleteList(item.list,i,item)" :disabled="state>1" style="margin: 5px;"></el-button>
- <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(item.list,i)" :disabled="state>1" style="margin: 5px;"></el-button>
+ <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(item.list,i,'out')" :disabled="state>1" style="margin: 5px;"></el-button>
</td>
</tr>
</template>
@@ -113,7 +122,9 @@
if(!item.insProductResult){
// 鍒濆鍖�
this.$set(item,'list',[])
+ this.$set(item,'list0',[])
item.list.push({})
+ item.list0.push({})
item.list.forEach(m=>{
this.$set(m,'time','')
this.$set(m,'temperature','')
@@ -131,8 +142,17 @@
this.$set(m,'temperature',m.temperature)
this.$set(m,'humidity',m.humidity)
})
- this.$set(item,'equipValue',item.insProductResult.equipValue)
- this.$set(item,'equipName',item.insProductResult.equipName)
+ if(item.insProductResult.comValue){
+ this.$set(item,'list0',JSON.parse(item.insProductResult.comValue))
+ item.list0.forEach((m,i)=>{
+ this.$set(m,'value',m.value)
+ })
+ }else{
+ this.$set(item,'list0',[])
+ item.list0.push({})
+ }
+ this.$set(item,'equipValue',item.insProductResult.equipValue?JSON.parse(item.insProductResult.equipValue)[0].v:'')
+ this.$set(item,'equipName',item.insProductResult.equipName?JSON.parse(item.insProductResult.equipName)[0].v:'')
this.$set(item,'beforeCheck',item.insProductResult.beforeCheck)
this.$set(item,'afterCheck',item.insProductResult.afterCheck)
}
@@ -149,12 +169,18 @@
})
}
},
- addList(arr,i){
- arr.splice(i+1,0,{
- time:'',
- temperature:'',
- humidity:''
- })
+ addList(arr,i,type){
+ if(type=='out'){
+ arr.splice(i+1,0,{
+ value:'',
+ })
+ }else{
+ arr.splice(i+1,0,{
+ time:'',
+ temperature:'',
+ humidity:''
+ })
+ }
},
async methodFocus(item){
this.equipOptions = await this.getEquipOptions(item)
@@ -208,6 +234,7 @@
this.$axios.post(this.$api.insOrderPlan.saveInsContext3, {
insProductId:item.id,
insValue:JSON.stringify(item.list),
+ comValue:JSON.stringify(item.list0),
equipValue:item.equipValue,
equipName:item.equipName,
num:this.num,
@@ -249,4 +276,7 @@
display: flex;
align-items: center;
}
+ >>>.el-input__inner {
+ text-align: center;
+ }
</style>
--
Gitblit v1.9.3