From 0b1c5e6680c2986b54866b8dded31c4d9c497fdc Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 四月 2024 17:26:47 +0800
Subject: [PATCH] 消息通知页面
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 148 +++++++++++++++++++++++++++++++++----------------
1 files changed, 99 insertions(+), 49 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index de2ae89..6946ec5 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -38,11 +38,16 @@
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,12 +59,14 @@
.content {
display: flex;
- width: 100%;
+ /* width: 100px; */
height: 100%;
align-items: center;
justify-content: left;
padding: 5px;
box-sizing: border-box;
+ overflow: hidden;
+ user-select: none;
}
.content-h-0 {
@@ -171,12 +178,14 @@
</div>
<div class="center">
<div class="center-box">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
+ <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">
- <!-- 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"
- :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':''};`">
+ 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}`">
<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"
@@ -265,8 +274,10 @@
</template>
<script>
- import { set } from 'shelljs';
-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: {
@@ -325,7 +336,8 @@
userId: 0,
reviewLoading: false,
reviewDia: false,
- noReason: ''
+ noReason: '',
+ tableWidth: 1000
}
},
created() {
@@ -358,7 +370,7 @@
insValue: [],
comValue: [],
resValue: null,
- equipValue: null,
+ equipValue: [],
insResult: null
}
})
@@ -379,7 +391,7 @@
insValue: [],
comValue: [],
resValue: null,
- equipValue: null,
+ equipValue: [],
insResult: null
}
})
@@ -447,7 +459,7 @@
const mySet1 = new Set();
this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m => {
let num0 = mySet1.size;
- if(m.templateId!=null){
+ if (m.templateId != null) {
mySet1.add(JSON.stringify({
template: m.template,
templateId: m.templateId
@@ -465,6 +477,7 @@
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++) {
@@ -472,48 +485,59 @@
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 = []
+ let set3 = new Set()
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) {
- 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) {
- break
- }
+ let size1 = set3.size
+ let size2 = set3.add(b.r).size
+ if (size1 < size2) {
+ let str = ''
+ let count4 = 0
+ a.template.forEach(c => {
+ if (b.r === c.r) {
+ if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
+ if (count4 === 0) {
+ str += c.v.v
+ count4 += 1
}
- count2++
- }
- if (count2 <= a.template.length) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i]
- })
- break
+ } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
+ if (count4 === 1) {
+ str += c.v.v
+ count4 += 1
+ }
}
}
- count++
- }
- if (count === this.currentSample.insProduct.length) {
- dels.add(b.r)
+ })
+ if (str != '') {
+ 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 ===
+ null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass) === str) {
+ ids.push({
+ r: b.r,
+ id: this.currentSample.insProduct[i].id,
+ product: this.currentSample.insProduct[i]
+ })
+ break
+ }
+ if(i == this.currentSample.insProduct.length-1){
+ dels.add(b.r)
+ }
+ }
}
}
})
- console.log(dels);
dels.forEach(del => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === del) {
@@ -522,16 +546,38 @@
}
}
})
- /* ids.forEach(id => {
+ 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
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 => {
+ let size1 = set2.size
+ let size2 = set2.add(b.mc).size
+ if (b.mc != undefined && size1 < size2) {
+ b.v.mc.rs = 0
+ b.v.mc.cs = 0
+ a.template.forEach(c => {
+ if (b.mc === c.mc) {
+ if (b.r === c.r) {
+ b.v.mc.cs += 1
+ }
+ if (b.c === c.c) {
+ b.v.mc.rs += 1
+ }
+ }
+ })
+ }
+ })
})
this.tableList.forEach(a => {
let arrs = []
@@ -542,7 +588,8 @@
conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
a.template.forEach(b => {
- if (b.v.ps != undefined && b.v.ps.value === '搴忓彿') {
+ if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
+ .length === 4)) {
count1++
b.v.v = count1
}
@@ -552,42 +599,41 @@
if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
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.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.v.ps != undefined && b.v.ps.value === '缁撹') {
- /* for (var c in this.param) {
- this.param[c].insResult = b
- }
+ this.param[b.i].insResult = b
conclusionList.forEach((n, i) => {
if (n.r == b.r && n.c == b.c) {
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) {
this.excelMethodList.push(b)
}
})
+ console.log(this.param);
set = Array.sort(set)
set.forEach(b => {
let arr = []
@@ -599,6 +645,10 @@
arrs.push(arr)
})
a.arr = arrs
+ this.tableWidth = 0
+ for (let i = 0; i < arrs[0].length; i++) {
+ this.tableWidth += (a.style.columnlen[i] === undefined ? 100 : a.style.columnlen[i])
+ }
})
this.currentSample.insProduct.forEach(a => {
try {
--
Gitblit v1.9.3