From 825dbe8e9ffbbc0ff084f8bca9d0af22024cdf16 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 09:32:08 +0800
Subject: [PATCH] 功能修复
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 3f82a71..055e498 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -197,14 +197,14 @@
</div>
<div class="center-box">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"
- :style="`width: ${tableWidth}px;`">
+ >
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<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:${item.style.columnlen[n.c]}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="`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':''};`">
+ <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;`">
<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 != '')"
@@ -213,7 +213,7 @@
</el-input>
<el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
:autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
- <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
+ <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
:disabled="state>1">
<el-option label="鏄�" value="鏄�"></el-option>
<el-option label="鍚�" value="鍚�"></el-option>
@@ -355,7 +355,8 @@
noReason: '',
tableWidth: 1000,
currentTable:null,
- tableLists:[]
+ tableLists:[],
+ widthList:[]
}
},
created() {
@@ -511,6 +512,7 @@
},
handleTableData() {
this.excelMethodList = []
+ this.widthList = this.tableList[0].style.columnlen;
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -565,6 +567,7 @@
}
})
if (str != '') {
+ let count2 = 0
for (let i in this.currentSample.insProduct) {
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
.insProduct[i].inspectionItem + this.currentSample.insProduct[i].inspectionItemSubclass === str) {
@@ -573,11 +576,12 @@
id: this.currentSample.insProduct[i].id,
product: this.currentSample.insProduct[i]
})
- break
+ break
}
- if(i == this.currentSample.insProduct.length-1){
- dels.add(b.r)
- }
+ count2++
+ }
+ if(count2 == this.currentSample.insProduct.length){
+ dels.add(b.r)
}
}
}
@@ -647,23 +651,26 @@
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
b.v.v = ''
- this.param[b.i].comValue.push(b)
+ b.i&&this.param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
b.v.v = ''
- this.param[b.i].equipValue.push(b)
+ b.i&&this.param[b.i].equipValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
b.v.v = ''
- this.param[b.i].equipName.push(b)
+ b.i&&this.param[b.i].equipName.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
b.v.v = ''
- if (b.i === undefined) {
+ /* if (b.i === undefined) {
for (var c in this.param) {
this.param[c].resValue = b
}
} else {
+ this.param[b.i].resValue = b
+ } */
+ if(b.i !== undefined){
this.param[b.i].resValue = b
}
}
@@ -729,7 +736,6 @@
} catch (e) {}
})
this.handleExcelMethod()
- console.log(55555555555,this.currentSample.insProduct,this.tableList,this.param)
},
changeInput(m, code) {
let str = code.split('-')
@@ -976,6 +982,18 @@
}
}
},
+ handleWidth(n){
+ let sum = 0;
+ if(n.v.mc&&n.v.mc.cs&&n.v.mc.c!=undefined){
+ for(let i=0;i<n.v.mc.cs;i++){
+ let num = this.widthList[i+n.v.mc.c]?this.widthList[i+n.v.mc.c]:100
+ sum+=num;
+ }
+ }else{
+ sum = this.widthList[n.c]?this.widthList[n.c]:100
+ }
+ return sum
+ },
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
--
Gitblit v1.9.3