From 57c1d0346cac57d731da2b8badf2b12cafb7d525 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期三, 27 三月 2024 15:20:12 +0800 Subject: [PATCH] 检验任务 --- src/components/do/b1-inspect-order-plan/Inspection.vue | 55 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index 2b83064..9613d18 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -26,6 +26,7 @@ align-items: center; justify-content: center; flex-wrap: wrap; + overflow-y: auto; } .tables{ /* width: 800px; */ @@ -138,7 +139,15 @@ :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;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}`"> - <el-input v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'" class="table_input" v-model="n.v.v" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" /> + <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'"> + <el-input v-if="item.inspectionValueType == 1" class="table_input" v-model="n.v.v" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" /> + <el-input v-else-if="item.inspectionValueType == 2" class="table_input" type="textarea" :autosize="{ minRows: 1}" v-model="n.v.v"/> + <el-select v-else-if="item.inspectionValueType == 5" class="table_input" v-model="n.v.v"> + <el-option label="鏄�" value="鏄�"></el-option> + <el-option label="鍚�" value="鍚�"></el-option> + </el-select> + <span v-else-if="item.inspectionValueType == 4" class="table_input">/</span> + </template> <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='缁撹'"> <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span> <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span> @@ -242,12 +251,7 @@ tableList:[], loading: false, ps: {}, - param: { - insValue:{}, - comValue: {}, - bestValue: {}, - result: {} - }, + param: {}, currentKey:1, comparisonList:[], excelMethodList:[] @@ -276,6 +280,13 @@ }) this.sampleProduct = res.data.sampleProduct this.currentSample = this.sampleProduct[0] + this.currentSample.insProduct.forEach(a=>{ + this.param[a.id] = { + insValue: [], + comValue: [], + resValue: [] + } + }) if(this.currentSample.index==undefined)this.currentSample['index'] = 1 this.loading = false this.handleTableData() @@ -287,6 +298,13 @@ methods: { handleChangeSample(row, column, event){ this.currentSample = row; + this.currentSample.insProduct.forEach(a=>{ + this.param[a.id] = { + insValue: [], + comValue: [], + resValue: [] + } + }) this.handleTableData() this.sampleVisible = false; this.currentKey=row.index @@ -423,12 +441,21 @@ } if (b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽��'){ b.v.v = '' + this.param[b.i].insValue.push(b) } if (b.v.ps!=undefined&&b.v.ps.value==='璁$畻鍊�'){ b.v.v = '' + this.param[b.i].comValue.push(b) } if (b.v.ps!=undefined&&b.v.ps.value==='鏈�缁堝��'){ b.v.v = '' + if(b.i===undefined){ + for(var c in this.param){ + this.param[c].resValue.push(b) + } + }else{ + this.param[b.i].resValue.push(b) + } } if (b.v.ps!=undefined&&b.v.ps.value==='缁撹'){ conclusionList.forEach((n,i)=>{ @@ -467,14 +494,19 @@ }) a.arr = arrs }) + /* this.currentSample.insProduct.forEach(a=>{ + for(var i=0;i<a.param.comValue.length;i++){ + this.param[a.id].comValue[i].v.v = a.param.comValue[i].v.v + } + }) */ this.handleExcelMethod() }, changeInput(m,code){ - // console.log(m,'code:',code,this.excelMethodList) let str = code.split('-') let r = str[1] let c = str[2] let id = str[0] + let pId = str[3] var list = [] for(let a in this.tableList){ if(this.tableList[a].templateId == id){ @@ -546,7 +578,7 @@ default: break; } - list.map(a=>{ + list.forEach(a=>{ if(a[0].r == item.r){ for(var b in a){ if(a[b].c == item.c){ @@ -555,9 +587,8 @@ } } } - return a }) - this.changeInput(comResult,`${code.split('-')[0]}-${item.r}-${item.c}-${id}`)//鏀瑰彉鏈�缁堝�� + this.changeInput(comResult,`${code.split('-')[0]}-${item.r}-${item.c}-${pId}`)//鏀瑰彉鏈�缁堝�� } } }) @@ -604,6 +635,6 @@ }) } } - }, + } } </script> -- Gitblit v1.9.3