From 2514ee4fe0471be59f67723a85a64dee88db8c67 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 27 三月 2024 10:52:01 +0800
Subject: [PATCH] 表格坐标转换
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 205 +++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 103 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 950995a..749da2f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -138,8 +138,13 @@
: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}`">
- <span v-if="n.v.ps===undefined || n.v.ps.value!='妫�楠屽��'" :style="`font-family:${n.v.ff} !important;`">{{ n.v.v}}</span>
- <el-input v-else class="table_input" v-model="n.v.v" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}`)" />
+ <el-input v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'" class="table_input" v-model="n.v.v" @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}`)" />
+ <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>
+ <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
</td>
</tr>
@@ -187,7 +192,6 @@
</template>
<script>
-import { number } from 'echarts';
import ValueTable from '../../tool/value-table.vue'
export default {
props: ['sonLaboratory','orderId'],
@@ -245,52 +249,7 @@
result: {}
},
currentKey:1,
- comparisonList:[
- {
- 0:'0',
- 1:'A',
- },
- {
- 0:'1',
- 1:'B',
- },
- {
- 0:'2',
- 1:'C',
- },
- {
- 0:'3',
- 1:'D',
- },
- {
- 0:'4',
- 1:'E',
- },
- {
- 0:'5',
- 1:'F',
- },
- {
- 0:'6',
- 1:'G',
- },
- {
- 0:'7',
- 1:'H',
- },
- {
- 0:'8',
- 1:'I',
- },
- {
- 0:'9',
- 1:'J',
- },
- {
- 0:'10',
- 1:'K',
- },
- ],
+ comparisonList:[],
excelMethodList:[]
}
},
@@ -301,6 +260,7 @@
mounted() {
this.getTypeDicts()
this.getInsStateDicts()
+ this.getComparisonList()
},
watch:{
id(val){
@@ -372,6 +332,14 @@
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;
},
@@ -393,13 +361,14 @@
let dels = []
let ids = []
a.template.forEach(b=>{
- if(b.v.ps!=undefined&&b.v.ps.value==='妫�楠屽瓙椤�'){
+ 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
+ id: this.currentSample.insProduct[i].id,
+ product: this.currentSample.insProduct[i]
})
break
}
@@ -413,6 +382,16 @@
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
}
@@ -422,64 +401,78 @@
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
+ }
}
}
})
})
- console.log(this.tableList);
- // return
- this.tableList.map(item=>{
- const mySet0 = new Set();
- let arr = [];
- let arrItem = [];
- item.template.forEach((m,i)=>{
- if(m.v.f){
- this.excelMethodList.push(m)
+ this.tableList.forEach(a=>{
+ let arrs = []
+ let set = new Set()
+ let count1 = 0
+ 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 = ''
+ }
+ set.add(b.r)
+ if(b.v.f){
+ this.excelMethodList.push(b)
}
- 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
- })
- console.log(this.tableList);
+ })
+ 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.handleExcelMethod()
},
changeInput(m,code){
- console.log(2222222222,m,code)
+ console.log(m,'code:',code,this.excelMethodList)
let r = code.split('-')[1]
let c = code.split('-')[2]
+ this.excelMethodList.forEach(item=>{
+ if(item.valueList.find(m=>m.r==r&&m.c==c)){
+ console.log('褰撳墠鐨勬柟娉�',item.methodName)
+ console.log('褰撳墠鐨勬暟鎹」',item.valueList)
+ console.log('褰撳墠鐨勬暟鍊奸」','r:',item.r,'c:',item.c)
+ this.changeInput('璁＄畻鐨勭粨鏋�',`${code.split('-')[0]}-${item.r}-${item.c}`)//鏀瑰彉鏈�缁堝��
+ }
+ })
},
- // 褰撳墠妯℃澘excel鍑芥暟闆嗗鐞�
handleExcelMethod(){
if(this.excelMethodList.length>0){
this.excelMethodList.map(item=>{
- item.methodName = item.v.f.split('=')[1].split('(')[0];
+ if(item.v.f.includes(':')){}
+ item.methodName = 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;
@@ -487,12 +480,12 @@
let mode = item.v.f.split('(')[1].split(')')[0];
let start = mode.split(':')[0]
let end = mode.split(':')[1]
- r0 = this.comparisonList.find(j=>j['1']==start.split('')[0])[`0`]
- c0 = start.split('')[1]-1
- r1 = this.comparisonList.find(j=>j['1']==end.split('')[0])[`0`]
- c1 = end.split('')[1]-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+1;u++){
+ for(let u=c0;u<=c1;u++){
valueList.push({
r:i,
c:u
@@ -501,13 +494,19 @@
}
item.valueList = valueList;
}else{
- let mode = item.v.f.split('(')[1].split(')')[0];
- // const result = item.v.f.replace(/+|-|*|%|\/|(|)/g, ' ')
+ valueList = []
+ let regex= /[\+\-\*\%\(\)\s]/g
+ let mode = item.v.f.replace(regex, ' ').split(' ');
+ mode.forEach(m=>{
+ let r = m.split('')[1]-1
+ let c = this.comparisonList.find(j=>j.label==m.split('')[0]).value
+ valueList.push({c,r})
+ })
}
return item;
})
}
- }
- }
- }
+ }
+ },
+}
</script>
--
Gitblit v1.9.3