From 1126ce99813e9400522a40e816bfa7b02e47183a Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 26 三月 2024 17:16:15 +0800
Subject: [PATCH] 检验任务
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 142 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 43 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 46e74b3..e205682 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -7,13 +7,11 @@
.search {
width: 100%;
margin-bottom: 10px;
- height: 140px;
background-color: #fff;
border-radius: 3px;
}
.search .form-inline {
- height: 50px;
padding-top: 20px;
padding-left: 50px;
}
@@ -45,7 +43,7 @@
height: 100%;
align-items: center;
justify-content: left;
- padding: 2px;
+ padding: 5px;
box-sizing: border-box;
}
.content-h-0{
@@ -66,6 +64,11 @@
.content-v-2{
align-items: end;
}
+
+ .table_input{
+ width: 100%;
+ height: 100%;
+ }
</style>
<style>
.el-form-item__label{
@@ -128,13 +131,15 @@
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<td
+ :id='item.templateId+"-"+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};font-family:${n.v.ff};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':''};`">
+ :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>{{ n.v.v}}</span>
+ <span v-if="n.v.ps===undefined || n.v.ps.value!='妫�楠屽��'" :style="`font-family:${n.v.ff} !important;`">{{ n.v.v}}</span>
+ <input v-else class="table_input"/>
</div>
</td>
</tr>
@@ -144,7 +149,7 @@
<el-drawer
title="鏍峰搧鍒囨崲"
:visible.sync="sampleVisible"
- size="50%">
+ :size="500">
<el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
:current-row-key="currentKey" :row-key="record=>record.index"
v-if="sampleVisible">
@@ -153,13 +158,13 @@
<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="妫�娴嬬姸鎬�" min-width="100px" show-overflow-tooltip>
+ <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="95px" 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>
</template>
</el-table-column>
- <el-table-column prop="isLeave" label="鏄惁鐣欐牱" min-width="100px" show-overflow-tooltip>
+ <el-table-column prop="isLeave" label="鏄惁鐣欐牱" width="95px" show-overflow-tooltip align="center">
<template slot-scope="scope">
<span>{{ scope.row.isLeave==0?'鍚�':'鏄�' }}</span>
</template>
@@ -221,7 +226,7 @@
currentId:'',
selectField: {},
requiredAdd: [],
- requiredUp: [],
+ requiredUp: []
},
upIndex: 0,
insOrder: {},
@@ -231,6 +236,13 @@
currentSample:{},//褰撳墠鏍峰搧淇℃伅
tableList:[],
loading: false,
+ ps: {},
+ param: {
+ insValue:{},
+ comValue: {},
+ bestValue: {},
+ result: {}
+ },
currentKey:1,
}
},
@@ -328,40 +340,84 @@
return m
}
})
- this.tableList.map(item=>{
- const mySet0 = new Set();
- let arr = [];
- let arrItem = [];
- item.template.forEach((m,i)=>{
- let num0 = mySet0.size;
- mySet0.add(m.r)
- let num1 = mySet0.size;
- if(num0<num1){
- if(arrItem.length>0){
- arr.push(arrItem)
- arrItem = []
- }
- if(m.v.mc){
- if(m.v.mc.rs||m.v.mc.cs){
- arrItem.push(m)
- }
- }else{
- arrItem.push(m)
- }
- }else{
- if(m.v.mc){
- if(m.v.mc.rs||m.v.mc.cs){
- arrItem.push(m)
- }
- }else{
- arrItem.push(m)
- }
- }
- })
- arr.push(arrItem)
- item.arr = arr;
- return item
- })
+ this.tableList.forEach(a=>{
+ let dels = []
+ 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].inspectionItemSubclass === b.v.v && this.currentSample.insProduct[i].templateId === a.templateId){
+ ids.push({
+ r: b.r,
+ id: this.currentSample.insProduct[i].id
+ })
+ break
+ }
+ count++
+ }
+ if(count === this.currentSample.insProduct.length){
+ dels.push(b)
+ }
+ }
+ })
+ 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
+ }
+ }
+ }
+ a.template.splice(b, 1)
+ b-=1
+ }
+ }
+ })
+ ids.forEach(id=>{
+ for(let b=0;b<a.template.length;b++){
+ if(a.template[b].r === id.r){
+ a.template[b].i = id.id
+ }
+ }
+ })
+ })
+ this.tableList.forEach(a=>{
+ let arrs = []
+ let set = new Set()
+ a.template.forEach(b=>{
+ set.add(b.r)
+ })
+ set = Array.sort(set)
+ set.forEach(b=>{
+ 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
+ }
+ }
+ }
+ }
+ })
+ arrs.push(arr)
+ })
+ a.arr = arrs
+ })
}
}
}
--
Gitblit v1.9.3