From 2f724ca42f3357dd894e38ef2bd2e996b181e2d8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 19 四月 2024 10:19:53 +0800
Subject: [PATCH] 检验模板调整
---
src/components/view/a5-capacity-scope.vue | 21 ++-------------------
src/components/do/b1-inspect-order-plan/Inspection.vue | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 23 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..5d9fe00 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -178,6 +178,7 @@
<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':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
+ {{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"
@@ -465,6 +466,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,11 +474,13 @@
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 => {
@@ -513,7 +517,6 @@
}
}
})
- console.log(dels);
dels.forEach(del => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === del) {
@@ -522,16 +525,25 @@
}
}
})
- /* 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=>{
+ if(b.mc!=undefined&&set2.add(b.mc)){
+ console.log(b.v);
+ }
+ })
})
this.tableList.forEach(a => {
let arrs = []
@@ -558,7 +570,7 @@
b.v.v = ''
// 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
}
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 8e820b8..05ce114 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -70,11 +70,6 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
- <div class="search_label">璁惧缁勶細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -122,7 +117,6 @@
entity: {
inspectionItem: null,
laboratory: null,
- deviceGroup: null,
orderBy: {
field: 'id',
order: 'asc'
@@ -158,7 +152,6 @@
select:[]
},
method:{select:[]},
- deviceGroup:{select:[]},
templateId:{
select:[]
},
@@ -184,14 +177,13 @@
select:[]
},
method:{select:[],choose: true},
- deviceGroup:{select:[]},
sample: {select:[]},
sonLaboratory: {select:[]},
unit: {select:[]},
dic:{select:[]},
},
- requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
- requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
+ requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'],
+ requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample']
},
testObjectData: {
entity: {
@@ -238,7 +230,6 @@
this.selectEnumByCategoryForInspectionValueType()
this.obtainItemParameterList()
this.selectStandardMethods()
- this.selectEnumByCategoryForDevice()
this.selectTestObjectByName()
this.getStandardTemplate()
this.selectEnumByCategoryForSLaboratory()
@@ -310,14 +301,6 @@
}).then(res => {
this.itemParameterData.selectField.inspectionValueType.select = res.data
this.itemParameterData.tagField.inspectionValueType.select = res.data
- })
- },
- selectEnumByCategoryForDevice() {
- this.$axios.post(this.$api.enums.selectEnumByCategory, {
- category: "璁惧鍒嗙被"
- }).then(res => {
- this.itemParameterData.selectField.deviceGroup.select = res.data
- this.itemParameterData.tagField.deviceGroup.select = res.data
})
},
selectEnumByCategoryForSLaboratory() {
--
Gitblit v1.9.3