From e04fbe73f7785155bffe3db30a7ead37f9200f06 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 16:09:32 +0800
Subject: [PATCH] 对接测试项目统计接口
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 141 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 61 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f368245..92b0b8d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -31,18 +31,22 @@
background-color: #fff;
border-radius: 3px;
padding: 20px;
- overflow: auto;
}
.center-box {
display: flex;
align-items: center;
justify-content: center;
+ flex-direction: column;
flex-wrap: wrap;
+ width: 100%;
+ /* overflow-x: hidden; */
+ overflow-x: scroll;
}
.tables {
- margin-bottom: 16px;
+ table-layout:fixed;
+ margin: 5px 5px 16px;
}
.tables td {
@@ -54,7 +58,7 @@
.content {
display: flex;
- width: 100%;
+ width: 100px;
height: 100%;
align-items: center;
justify-content: left;
@@ -172,12 +176,13 @@
<div class="center">
<div class="center-box">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
- <tbody>
- <tr v-for="(m,i) in item.arr" :key="i">
+ <tbody style="overflow: auto;">
+ <tr v-for="(m,i) in item.arr" :key="i" style="overflow: auto;">
+ <!-- v-if="n.v.mc==undefined || n.v.mc.rs!=undefined" :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" -->
<td :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}`">
+ <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" :style="`width:${item.style.columnlen[n.c]}px !important;`">
+ {{n.mc}}
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'">
<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 != '')||state>1"
@@ -201,10 +206,10 @@
<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>
- <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧'">
- <el-select v-model="n.v.v" placeholder="璇烽�夋嫨" @visible-change="e=>getEquipOptions(e,n.i)"
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧缂栫爜'">
+ <el-select v-model="n.v.v" placeholder="璁惧" @visible-change="e=>getEquipOptions(e,n.i)"
:disabled="state>1">
- <el-option v-for="item in equipOptions" :key="item.value" :label="item.label" :value="item.label">
+ <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
</el-option>
</el-select>
</template>
@@ -224,7 +229,7 @@
</el-table-column>
<el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" min-width="100px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="95px" show-overflow-tooltip>
+ <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
<el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
@@ -265,7 +270,8 @@
</template>
<script>
- import ValueTable from '../../tool/value-table.vue'
+ import { set } from 'shelljs';
+import ValueTable from '../../tool/value-table.vue'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -446,61 +452,78 @@
const mySet1 = new Set();
this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
let num0 = mySet1.size;
- mySet1.add(JSON.stringify({
- template: m.template,
- templateId: m.templateId
- }))
+ if(m.templateId!=null){
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ }
let num1 = mySet1.size;
if (num1 > num0) {
return m
}
})
this.tableList.forEach(a => {
- let dels = []
+ let mcList = []
+ a.template.forEach(b => {
+ if (b.v.mc != undefined && b.v.mc.cs != undefined && b.v.mc.rs != undefined) {
+ mcList.push(b)
+ }
+ })
+ let count = 0
+ mcList.forEach(b => {
+ for (var c in a.template) {
+ for (var i = 0; i < b.v.mc.cs; i++) {
+ for (var i2 = 0; i2 < b.v.mc.rs; i2++) {
+ if (a.template[c].c === b.c + i && a.template[c].r === b.r + i2) {
+ a.template[c].v.v = this.HaveJson(b).v.v
+ a.template[c].v.ps = this.HaveJson(b).v.ps
+ a.template[c].mc = count
+ break
+ }
+ }
+ }
+ }
+ count++
+ })
+ })
+ this.tableList.forEach(a => {
+ let dels = new Set()
let ids = []
a.template.forEach(b => {
if (b.v.ps != undefined && b.v.ps.value === '妫�楠岄」') {
let count = 0
for (let i in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample.insProduct[i].inspectionItem === b.v.v) {
+ if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
+ .insProduct[i].inspectionItem === b.v.v) {
let count2 = 0
for (var c in a.template) {
if (a.template[c].r === b.r && a.template[c].v.ps != undefined && a.template[c].v.ps.value === '妫�楠屽瓙椤�') {
- if(this.currentSample.insProduct[i].inspectionItemSubclass === a.template[c].v.v){
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i]
- })
+ if (this.currentSample.insProduct[i].inspectionItemSubclass === a.template[c].v.v) {
break
}
}
count2++
}
- if (count2 < a.template.length) {
+ if (count2 <= a.template.length) {
+ ids.push({
+ r: b.r,
+ id: this.currentSample.insProduct[i].id,
+ product: this.currentSample.insProduct[i]
+ })
break
}
}
count++
}
if (count === this.currentSample.insProduct.length) {
- dels.push(b)
+ dels.add(b.r)
}
}
})
dels.forEach(del => {
for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === del.r) {
- if (a.template[b].v.mc != undefined) {
- if (a.template[b].v.mc.rs != undefined && a.template[b].v.mc.rs > 1) {
- if (a.template[b].r === a.template[b].v.mc.r) {
- a.template[b].r += 1
- a.template[b].v.mc.r += 1
- a.template[b].v.mc.rs -= 1
- continue
- }
- }
- }
+ if (a.template[b].r === del) {
a.template.splice(b, 1)
b -= 1
}
@@ -513,7 +536,16 @@
if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '鍗曚綅') {
a.template[b].v.v = id.product.unit
}
+ if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '璇曢獙鏂规硶') {
+ a.template[b].v.v = id.product.method
+ }
}
+ }
+ })
+ let set2 = new Set()
+ a.template.forEach(b=>{
+ if(b.mc!=undefined&&set2.add(b.mc)){
+ console.log(b.v);
}
})
})
@@ -534,30 +566,30 @@
b.v.v = this.getAsk(b.i)
}
if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
- // b.v.v = ''
+ b.v.v = ''
b.u = ''
- this.param[b.i].insValue.push(b)
+ // 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)
+ // this.param[b.i].comValue.push(b)
}
- if (b.v.ps != undefined && b.v.ps.value === '璁惧') {
+ if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
b.v.v = ''
- this.param[b.i].equipValue = b
+ // this.param[b.i].equipValue = 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.v.ps != undefined && b.v.ps.value === '缁撹') {
- for (var c in this.param) {
+ /* for (var c in this.param) {
this.param[c].insResult = b
}
conclusionList.forEach((n, i) => {
@@ -565,7 +597,7 @@
b.v.f =
`(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
}
- })
+ }) */
}
set.add(b.r)
if (b.v.f) {
@@ -577,20 +609,7 @@
let arr = []
a.template.forEach(c => {
if (c.r === b) {
- if (arr.length === 0) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
- } else {
- for (let d = 0; d < arr.length; d++) {
- if (c.c < arr[d].c) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.splice(d, 0, c)
- break
- }
- if (d === arr.length - 1) {
- if (c.v.mc == undefined || Object.keys(c.v.mc).length == 4) arr.push(c)
- break
- }
- }
- }
+ arr.push(c)
}
})
arrs.push(arr)
@@ -841,7 +860,7 @@
}).then(res => {
if (res.code === 200 && res.data) {
this.equipOptions = res.data.map(m => {
- m.value = m.id
+ m.value = m.factoryNo
m.label = m.deviceName
return m
})
--
Gitblit v1.9.3