From 0ffe7d6e144f5e82f19b148969a9fbb3c50615f6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 26 三月 2024 17:16:49 +0800
Subject: [PATCH] 写表格逻辑
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 229 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 192 insertions(+), 37 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..950995a 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,14 @@
background-color: #fff;
border-radius: 3px;
padding: 20px;
- }
-</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{
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
- }
+ }
.tables{
- width: 800px;
+ /* width: 800px; */
+ margin-bottom: 16px;
}
.tables td{
height: 40px;
@@ -64,7 +43,7 @@
height: 100%;
align-items: center;
justify-content: left;
- padding: 2px;
+ padding: 5px;
box-sizing: border-box;
}
.content-h-0{
@@ -85,9 +64,32 @@
.content-v-2{
align-items: end;
}
+
+ .table_input{
+ width: 100%;
+ height: 100%;
+ }
+</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;">
@@ -120,7 +122,7 @@
<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>
@@ -129,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['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>
+ <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}`)" />
</div>
</td>
</tr>
@@ -145,20 +149,22 @@
<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 +178,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"/>
@@ -181,6 +187,7 @@
</template>
<script>
+import { number } from 'echarts';
import ValueTable from '../../tool/value-table.vue'
export default {
props: ['sonLaboratory','orderId'],
@@ -201,8 +208,8 @@
sonLaboratory: null,
userId: 0
},
- isIndex: true,
- showSelect: true,
+ isIndex: false,
+ showSelect: false,
select: false,
selectMethod:'handleChangeTask',
sort: false,
@@ -217,6 +224,7 @@
select: []
},
},
+ currentId:'',
selectField: {},
requiredAdd: [],
requiredUp: []
@@ -228,6 +236,62 @@
urgentList:[],
currentSample:{},//褰撳墠鏍峰搧淇℃伅
tableList:[],
+ loading: false,
+ ps: {},
+ param: {
+ insValue:{},
+ comValue: {},
+ bestValue: {},
+ 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',
+ },
+ ],
+ excelMethodList:[]
}
},
created() {
@@ -240,6 +304,7 @@
},
watch:{
id(val){
+ this.loading = true
this.$axios.post(this.$api.insOrderPlan.doInsOrder,{
id: val
}).then(res=>{
@@ -251,7 +316,11 @@
})
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.sampleProduct[0]
+ if(this.currentSample.index==undefined)this.currentSample['index'] = 1
+ this.loading = false
this.handleTableData()
+ this.componentData.currentId = val;
+ this.currentKey = 1;
})
}
},
@@ -260,9 +329,10 @@
this.currentSample = row;
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() {
@@ -306,6 +376,7 @@
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,11 +389,53 @@
return m
}
})
+ 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){
+ 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
+ }
+ }
+ })
+ })
+ 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)
+ }
let num0 = mySet0.size;
mySet0.add(m.r)
let num1 = mySet0.size;
@@ -352,6 +465,48 @@
item.arr = arr;
return item
})
+ console.log(this.tableList);
+ this.handleExcelMethod()
+ },
+ changeInput(m,code){
+ console.log(2222222222,m,code)
+ let r = code.split('-')[1]
+ let c = code.split('-')[2]
+ },
+ // 褰撳墠妯℃澘excel鍑芥暟闆嗗鐞�
+ handleExcelMethod(){
+ if(this.excelMethodList.length>0){
+ this.excelMethodList.map(item=>{
+ item.methodName = item.v.f.split('=')[1].split('(')[0];
+ let valueList = [];
+ if(item.v.f.includes(':')){
+ 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]
+ 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
+ for (let i=Number(r0);i<=r1;i++){
+ for(let u=c0;u<c1+1;u++){
+ valueList.push({
+ r:i,
+ c:u
+ })
+ }
+ }
+ item.valueList = valueList;
+ }else{
+ let mode = item.v.f.split('(')[1].split(')')[0];
+ // const result = item.v.f.replace(/+|-|*|%|\/|(|)/g, ' ')
+ }
+ return item;
+ })
+ }
}
}
}
--
Gitblit v1.9.3