From 2e078e11d17ac645df50117c17a8c129a65edeb2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 27 三月 2024 17:39:19 +0800
Subject: [PATCH] 修改结论
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 523 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 448 insertions(+), 75 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e72e9ee..fa0ff0f 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;
}
@@ -24,33 +22,19 @@
background-color: #fff;
border-radius: 3px;
padding: 20px;
+ position: relative;
}
-</style>
-<style>
- .el-form-item__label{
- color: #000;
- }
- .el-drawer__header::before {
- content: "";
- display: inline-block;
- width: 4px;
- height: 30.24px;
- background: #3A7BFA;
- border-radius: 10px;
- margin-left: 32px;
- margin-right: 8.5px;
- }
- .el-drawer__header{
- color: #303133;
- }
- .center{
+ .center-box{
+ height: 100%;
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
+ overflow-y: auto;
}
.tables{
- width: 800px;
+ /* width: 800px; */
+ margin-bottom: 16px;
}
.tables td{
height: 40px;
@@ -64,7 +48,7 @@
height: 100%;
align-items: center;
justify-content: left;
- padding: 2px;
+ padding: 5px;
box-sizing: border-box;
}
.content-h-0{
@@ -85,17 +69,55 @@
.content-v-2{
align-items: end;
}
+
+ .table_input{
+ width: 100%;
+ height: 100%;
+ }
+
+ .collection{
+ width: 50px;
+ height: 100%;
+ margin-left: 5px;
+ border-color: transparent;
+ background-color: #409eff;
+ color: #fff;
+ border-radius: 4px;
+ font-size: 12px;
+ }
+
+ .collection:active{
+ opacity: .7;
+ }
+</style>
+<style>
+ .el-form-item__label{
+ color: #000;
+ }
+ .el-drawer__header::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 30.24px;
+ background: #3A7BFA;
+ border-radius: 10px;
+ margin-left: 32px;
+ margin-right: 8.5px;
+ }
+ .el-drawer__header{
+ color: #303133;
+ }
</style>
<template>
- <div>
+ <div v-loading="loading">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
- <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
- <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
- </el-col>
- </el-row>
+ <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
+ <el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
+ </el-col>
+ </el-row>
<div class="search">
<el-form :inline="true" :model="searchForm" class="form-inline" label-width="100px">
<el-form-item label="濮旀墭缂栧彿:">
@@ -120,45 +142,76 @@
<el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鏍峰搧浣嶆暟:" >
- <span v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</span>
+ <el-tag v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</el-tag>
</el-form-item>
</el-form>
</div>
<div class="center">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
+ <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">
<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};font-family:${n.v.ff};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen['0']}px;height:${item.style.rowlen[i]}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>
+ <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" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" />
+ <el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea" :autosize="{ minRows: 1}" v-model="n.v.v"/>
+ <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v">
+ <el-option label="鏄�" value="鏄�"></el-option>
+ <el-option label="鍚�" value="鍚�"></el-option>
+ </el-select>
+ <span :style="`font-family:${n.v.ff} !important;`" v-else-if="getInspectionValueType(n.i) == 4">/</span>
+ <el-button type="primary" icon="el-icon-edit" size="mini" circle v-if="getInspectionItemType(n.i) == 1" style="border: 0;margin-left: 2px;" @click="getSystemValue(n)">
+ </el-button>
+ </template>
+ <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>
+ <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)">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </template>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
</td>
</tr>
</tbody>
</table>
+ </div>
</div>
<el-drawer
title="鏍峰搧鍒囨崲"
:visible.sync="sampleVisible"
- size="50%">
- <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">
+ :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">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</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="妫�娴嬬姸鎬�" 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>
@@ -172,7 +225,7 @@
<el-drawer
title="浠诲姟鍒囨崲"
:visible.sync="taskVisible"
- size="45%">
+ :size="500">
<ValueTable class="value-table" ref="insOrderPlan"
:url="$api.insOrderPlan.selectInsOrderPlanList" :componentData="componentData"
:key="upIndex"/>
@@ -201,8 +254,8 @@
sonLaboratory: null,
userId: 0
},
- isIndex: true,
- showSelect: true,
+ isIndex: false,
+ showSelect: false,
select: false,
selectMethod:'handleChangeTask',
sort: false,
@@ -217,6 +270,7 @@
select: []
},
},
+ currentId:'',
selectField: {},
requiredAdd: [],
requiredUp: []
@@ -228,6 +282,13 @@
urgentList:[],
currentSample:{},//褰撳墠鏍峰搧淇℃伅
tableList:[],
+ loading: false,
+ ps: {},
+ param: {},
+ currentKey:1,
+ comparisonList:[],
+ excelMethodList:[],
+ equipOptions:[],
}
},
created() {
@@ -237,9 +298,11 @@
mounted() {
this.getTypeDicts()
this.getInsStateDicts()
+ this.getComparisonList()
},
watch:{
id(val){
+ this.loading = true
this.$axios.post(this.$api.insOrderPlan.doInsOrder,{
id: val
}).then(res=>{
@@ -251,18 +314,41 @@
})
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.sampleProduct[0]
+ this.currentSample.insProduct.forEach(a=>{
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: [],
+ equipValue:null,
+ intResult: null
+ }
+ })
+ if(this.currentSample.index==undefined)this.currentSample['index'] = 1
+ this.loading = false
this.handleTableData()
+ this.componentData.currentId = val;
+ this.currentKey = 1;
})
}
},
methods: {
handleChangeSample(row, column, event){
this.currentSample = row;
+ this.currentSample.insProduct.forEach(a=>{
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: [],
+ equipValue:null,
+ intResult: null
+ }
+ })
this.handleTableData()
this.sampleVisible = false;
+ this.currentKey=row.index
},
handleChangeTask(row){
- this.id = row[0].id;
+ if(row.length > 0)this.id = row[0].id;
this.taskVisible = false;
},
getTypeDicts() {
@@ -302,10 +388,19 @@
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;
},
handleTableData(){
+ this.excelMethodList = []
const mySet1 = new Set();
this.tableList = JSON.parse(JSON.stringify(this.currentSample.insProduct)).filter(m=>{
let num0 = mySet1.size;
@@ -318,41 +413,319 @@
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 = []
+ 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,
+ product: this.currentSample.insProduct[i]
+ })
+ 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
+ if (a.template[b].v.ps!=undefined&&a.template[b].v.ps.value==='鍗曚綅'){
+ a.template[b].v.v = id.product.unit
+ }
+ }
+ }
+ })
+ })
+ this.tableList.forEach(a=>{
+ let arrs = []
+ let set = new Set()
+ let count1 = 0
+ let conclusionList=[];//缁撹鍒楄〃
+ let finalList = [];//鏈�缁堝�煎垪琛�
+ 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==='搴忓彿'){
+ count1++
+ b.v.v = count1
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='瑕佹眰鍊�'){
+ b.v.v = this.getAsk(b.i)
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽��'){
+ b.v.v = ''
+ 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)
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='璁惧'){
+ b.v.v = ''
+ this.param[b.i].equipValue = b
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='鏈�缁堝��'){
+ b.v.v = ''
+ if(b.i===undefined){
+ for(var c in this.param){
+ this.param[c].resValue.push(b)
+ }
+ }else{
+ this.param[b.i].resValue.push(b)
+ }
+ }
+ if (b.v.ps!=undefined&&b.v.ps.value==='缁撹'){
+ for(var c in this.param){
+ this.param[c].insResult = b
}
- if(m.v.mc){
- if(m.v.mc.rs||m.v.mc.cs){
- arrItem.push(m)
+ conclusionList.forEach((n,i)=>{
+ if(n.r==b.r&&n.c==b.c){
+ console.log(b.r,b.c,)
+ b.v.f = `(${this.comparisonList.find(j=>j.value==(finalList[i].c)).label}${finalList[i].r+1})`
}
- }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)
- }
+ })
+ }
+ set.add(b.r)
+ if(b.v.f){
+ this.excelMethodList.push(b)
}
- })
- arr.push(arrItem)
- item.arr = arr;
- return item
+ })
+ 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
+ })
+ /* this.currentSample.insProduct.forEach(a=>{
+ for(var i=0;i<a.param.comValue.length;i++){
+ this.param[a.id].comValue[i].v.v = a.param.comValue[i].v.v
+ }
+ }) */
+ this.handleExcelMethod()
+ },
+ changeInput(m,code){
+ let str = code.split('-')
+ let r = str[1]
+ let c = str[2]
+ let id = str[0]
+ let pId = str[3]
+ 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)){
+ 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,item.r,item.c,this.excelMethodList)
+ if(item.methodName=='鑷畾涔夋柟娉�'&&item.v.ps&&item.v.ps.value=='缁撹'){
+ if(this.tableList.find(m=>m.id==item.i)){
+ let ask = this.tableList.find(m=>m.id==item.i).ask.split('&');
+ let res = Object.values(comValue)[0]
+ let comp = ask.map((m,i)=>{
+ if(m.includes('=')){
+ return res == m.split('=')[1]
+ }
+ if(m.includes('鈮�')){
+ return res >= m.split('鈮�')[1]
+ }
+ if(m.includes('鈮�')){
+ return res <= m.split('鈮�')[1]
+ }
+ if(m.includes('<')){
+ return res < m.split('<')[1]
+ }
+ if(m.includes('>')){
+ return res > m.split('>')[1]
+ }
+ })
+ if(comp.every(m=>m)){
+ item.v.v = 1
+ }else{
+ item.v.v = 0
+ }
+ console.log(33333333333,this.param)
+ }
+ }else{
+ 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.forEach(a=>{
+ if(a[0].r == item.r){
+ for(var b in a){
+ if(a[b].c == item.c){
+ a[b].v.v = parseFloat(comResult.toFixed(2))
+ break
+ }
+ }
+ }
+ })
+ this.changeInput(comResult,`${code.split('-')[0]}-${item.r}-${item.c}-${pId}`)//鏀瑰彉鏈�缁堝��
+ }
+ }
})
+ },
+ handleExcelMethod(){
+ if(this.excelMethodList.length>0){
+ this.excelMethodList.map(item=>{
+ item.methodName = item.v.f.split('=').length>1&&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(':')){
+ valueList = [];
+ let r0 = null;
+ let c0 = null;
+ let r1 = null;
+ let c1 = null;
+ 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.label==start.split('')[0]).value
+ r0 = start.split('')[1]-1
+ 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++){
+ valueList.push({
+ r:i,
+ c:u
+ })
+ }
+ }
+ item.valueList = valueList;
+ }else{
+ valueList = []
+ let regex= /[=\+\-\*\%\(\)\s]/g
+ let mode = item.v.f.replace(regex, ' ').split(' ');
+ mode.filter(m=>m).forEach(m=>{
+ let r = m.split('')[1]-1
+ let c = this.comparisonList.find(j=>j.label==m.split('')[0]).value
+ valueList.push({c,r})
+ })
+ }
+ item.valueList = valueList;
+ return item;
+ })
+ }
+ },
+ getInspectionValueType(id){
+ for(var a in this.currentSample.insProduct){
+ if(this.currentSample.insProduct[a].id == id){
+ return this.currentSample.insProduct[a].inspectionValueType
+ }
+ }
+ },
+ getInspectionItemType(id){
+ for(var a in this.currentSample.insProduct){
+ if(this.currentSample.insProduct[a].id == id){
+ return this.currentSample.insProduct[a].inspectionItemType
+ }
+ }
+ },
+ getAsk(id){
+ for(var a in this.currentSample.insProduct){
+ if(this.currentSample.insProduct[a].id == id){
+ return this.currentSample.insProduct[a].ask
+ }
+ }
+ },
+ getSystemValue(n){
+ this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
+ for(var a in this.currentSample.insProduct){
+ if(this.currentSample.insProduct[a].id == n.i){
+ this.currentSample.insProduct[a].inspectionItemType = 0
+ }
+ }
+ },
+ getEquipOptions(e,id){
+ if(e){
+ let category = this.tableList.find(m=>m.id==id).deviceGroup
+ this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {category}).then(res => {
+ if (res.code === 200 && res.data) {
+ console.log(1111111,res.data)
+ }
+ }).catch(error => {
+ console.error(error)
+ })
+ }
}
- }
- }
+ }
+}
</script>
--
Gitblit v1.9.3