From e41c8ce514dffeb999d737ea8dbda30ab8b60aa0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 28 六月 2024 10:56:17 +0800
Subject: [PATCH] 优化
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 25a7495..f4a882f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -266,13 +266,13 @@
<td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
:rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
- :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
+ :style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
- :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;background:${n.v.bg};`">
+ :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" type="number">
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" type="number" @mousewheel.native.prevent>
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
</el-input>
@@ -808,6 +808,7 @@
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
+ this.bushing.forEach(a => {})
}
// this.handleTableData()
this.getTableLists();
@@ -1165,6 +1166,7 @@
let id = str[0]
let pId = str[3]
var list = []
+ // console.log(id, 'r', r , 'c',c,this.tableList)
for (let a in this.tableList) {
if (this.tableList[a].templateId == id) {
list = this.tableList[a].arr
@@ -1229,6 +1231,10 @@
}else if(m.includes('卤')){
let k = m.split('卤')
return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
+ }else if(m.includes('锛�')){
+ return res > m.split('锛�')[1]
+ }else if(m.includes('锛�')){
+ return res < m.split('锛�')[1]
}
})
}
@@ -1346,7 +1352,7 @@
// break;
// }
list.forEach(a => {
- if (a[0].r == item.r && comResult != '') {
+ if (a[0].r == item.r && comResult !== '') {
for (var b in a) {
if (a[b].c == item.c) {
try{
--
Gitblit v1.9.3