From 704daaa5499c432a486c6961fa3f7f5531839126 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 27 三月 2024 11:55:29 +0800
Subject: [PATCH] 检验任务
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 162 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 99 insertions(+), 63 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index dc04d13..5212e05 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -131,15 +131,20 @@
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<td
- :id='item.templateId+"-"+n.r+"-"+n.c'
+ :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c'
v-for="(n,j) in m"
:key="j"
: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;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}`">
- <span v-if="n.v.ps===undefined || n.v.ps.value!='妫�楠屽��'" :style="`font-family:${n.v.ff} !important;`">{{ n.v.v}}</span>
- <el-input v-else class="table_input" v-model="n.v.v" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}`)" />
+ <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-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>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
+ </template>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
</td>
</tr>
@@ -187,7 +192,6 @@
</template>
<script>
-import { number } from 'echarts';
import ValueTable from '../../tool/value-table.vue'
export default {
props: ['sonLaboratory','orderId'],
@@ -245,52 +249,7 @@
result: {}
},
currentKey:1,
- comparisonList:[
- {
- 0:'0',
- 1:'A',
- },
- {
- 0:'1',
- 1:'B',
- },
- {
- 0:'2',
- 1:'C',
- },
- {
- 0:'3',
- 1:'D',
- },
- {
- 0:'4',
- 1:'E',
- },
- {
- 0:'5',
- 1:'F',
- },
- {
- 0:'6',
- 1:'G',
- },
- {
- 0:'7',
- 1:'H',
- },
- {
- 0:'8',
- 1:'I',
- },
- {
- 0:'9',
- 1:'J',
- },
- {
- 0:'10',
- 1:'K',
- },
- ],
+ comparisonList:[],
excelMethodList:[]
}
},
@@ -301,6 +260,7 @@
mounted() {
this.getTypeDicts()
this.getInsStateDicts()
+ this.getComparisonList()
},
watch:{
id(val){
@@ -372,6 +332,14 @@
this.componentData.tagField.insState.select = data
})
},
+ getComparisonList(){
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "琛ㄦ牸鍧愭爣杞崲"
+ }).then(res => {
+ let data = res.data
+ this.comparisonList = data;
+ })
+ },
tableRowClassName({ row, rowIndex }){
row.index = rowIndex + 1;
},
@@ -393,13 +361,14 @@
let dels = []
let ids = []
a.template.forEach(b=>{
- if(b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽瓙椤�'){
+ if (b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽瓙椤�'){
let count = 0
for(let i in this.currentSample.insProduct){
if(this.currentSample.insProduct[i].inspectionItemSubclass === b.v.v && this.currentSample.insProduct[i].templateId === a.templateId){
ids.push({
r: b.r,
- id: this.currentSample.insProduct[i].id
+ id: this.currentSample.insProduct[i].id,
+ product: this.currentSample.insProduct[i]
})
break
}
@@ -432,6 +401,9 @@
for(let b=0;b<a.template.length;b++){
if(a.template[b].r === id.r){
a.template[b].i = id.id
+ if (a.template[b].v.ps!=undefined&&a.template[b].v.ps.value==='鍗曚綅'){
+ a.template[b].v.v = id.product.unit
+ }
}
}
})
@@ -439,7 +411,21 @@
this.tableList.forEach(a=>{
let arrs = []
let set = new Set()
+ let count1 = 0
a.template.forEach(b=>{
+ if (b.v.ps!=undefined&&b.v.ps.value==='搴忓彿'){
+ count1++
+ b.v.v = count1
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽��'){
+ b.v.v = ''
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='璁＄畻鍊�'){
+ b.v.v = ''
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='鏈�缁堝��'){
+ b.v.v = ''
+ }
set.add(b.r)
if(b.v.f){
this.excelMethodList.push(b)
@@ -473,22 +459,72 @@
this.handleExcelMethod()
},
changeInput(m,code){
- console.log(m,'code:',code,this.excelMethodList)
- let r = code.split('-')[1]
- let c = code.split('-')[2]
+ // console.log(m,'code:',code,this.excelMethodList)
+ let str = code.split('-')
+ let r = str[1]
+ let c = str[2]
+ let id = str[0]
+ var list = []
+ for(let a in this.tableList){
+ if(this.tableList[a].templateId == id){
+ list = this.tableList[a].arr
+ break
+ }
+ }
this.excelMethodList.forEach(item=>{
if(item.valueList.find(m=>m.r==r&&m.c==c)){
- console.log('褰撳墠鐨勬柟娉�',item.methodName)
- console.log('褰撳墠鐨勬暟鎹」',item.valueList)
- console.log('褰撳墠鐨勬暟鍊奸」','r:',item.r,'c:',item.c)
- this.changeInput('璁＄畻鐨勭粨鏋�',`${code.split('-')[0]}-${item.r}-${item.c}`)//鏀瑰彉鏈�缁堝��
+ var comValue = {}
+ item.valueList.forEach(a=>{
+ list.forEach(b=>{
+ if(b[0].r==a.r){
+ b.forEach(c=>{
+ if(c.c==a.c){
+ if(!isNaN(parseFloat(c.v.v))){
+ var tableCode = ''
+ for(var d in this.comparisonList){
+ if(c.c == this.comparisonList[d].value){
+ tableCode = this.comparisonList[d].label
+ break
+ }
+ }
+ comValue[(tableCode + c.r)] = parseFloat(c.v.v)
+ }
+ }
+ })
+ }
+ })
+ })
+ // console.log('褰撳墠鐨勬柟娉�',item.methodName)
+ let comResult = 0
+ switch(item.methodName){
+ case 'AVERAGE':
+ let sum = 0
+ for(var a in comValue){
+ sum += comValue[a]
+ }
+ comResult = sum / Object.keys(comValue).length
+ break;
+ default:
+ break;
+ }
+ list.map(a=>{
+ if(a[0].r == item.r){
+ for(var b in a){
+ if(a[b].c == item.c){
+ a[b].v.v = comResult.toFixed(2)
+ break
+ }
+ }
+ }
+ return a
+ })
+ this.changeInput(comResult,`${code.split('-')[0]}-${item.r}-${item.c}-${id}`)//鏀瑰彉鏈�缁堝��
}
})
},
handleExcelMethod(){
if(this.excelMethodList.length>0){
this.excelMethodList.map(item=>{
- if(item.v.f.includes(':')){}
item.methodName = item.v.f.split('=')[1].split('(')&&item.v.f.split('=')[1].split('(')[0]?item.v.f.split('=')[1].split('(')[0]:'鑷畾涔夋柟娉�';
let valueList = [];
if(item.v.f.includes(':')){
@@ -500,9 +536,9 @@
let mode = item.v.f.split('(')[1].split(')')[0];
let start = mode.split(':')[0]
let end = mode.split(':')[1]
- c0 = this.comparisonList.find(j=>j['1']==start.split('')[0])[`0`]
+ c0 = this.comparisonList.find(j=>j.label==start.split('')[0]).value
r0 = start.split('')[1]-1
- c1 = this.comparisonList.find(j=>j['1']==end.split('')[0])[`0`]
+ c1 = this.comparisonList.find(j=>j.label==end.split('')[0]).value
r1 = end.split('')[1]-1
for (let i=Number(r0);i<=r1;i++){
for(let u=c0;u<=c1;u++){
@@ -519,7 +555,7 @@
let mode = item.v.f.replace(regex, ' ').split(' ');
mode.forEach(m=>{
let r = m.split('')[1]-1
- let c = this.comparisonList.find(j=>j['1']==m.split('')[0])[`0`]
+ let c = this.comparisonList.find(j=>j.label==m.split('')[0]).value
valueList.push({c,r})
})
}
--
Gitblit v1.9.3