From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 03753a0..dee79ce 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -196,15 +196,14 @@
</el-radio-group>
</div>
<div class="center-box">
- <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"
- :style="`width: ${tableWidth}px;`">
+ <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"
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}`">
+ :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}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}`" :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
<template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
<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 != '')"
@@ -213,7 +212,7 @@
</el-input>
<el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
:autosize="{ minRows: 1}" v-model="n.v.v" :disabled="state>1" />
- <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
+ <el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
:disabled="state>1">
<el-option label="鏄�" value="鏄�"></el-option>
<el-option label="鍚�" value="鍚�"></el-option>
@@ -355,7 +354,8 @@
noReason: '',
tableWidth: 1000,
currentTable:null,
- tableLists:[]
+ tableLists:[],
+ widthList:[]
}
},
created() {
@@ -511,6 +511,7 @@
},
handleTableData() {
this.excelMethodList = []
+ this.widthList = this.tableList[0].style.columnlen;
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -673,13 +674,15 @@
}
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
- 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})`
- }
- })
+ if(b.i!==undefined){
+ 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) {
@@ -734,7 +737,6 @@
} catch (e) {}
})
this.handleExcelMethod()
- console.log(55555555555,this.currentSample.insProduct,this.tableList,this.param)
},
changeInput(m, code) {
let str = code.split('-')
@@ -920,7 +922,6 @@
this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'resValue':
- console.log(this.param)
this.tableList[0].lastValue = value.v.v
break;
case 'insResult':
@@ -981,6 +982,18 @@
}
}
},
+ handleWidth(n){
+ let sum = 0;
+ if(n.v.mc&&n.v.mc.cs&&n.v.mc.c!=undefined){
+ for(let i=0;i<n.v.mc.cs;i++){
+ let num = this.widthList[i+n.v.mc.c]?this.widthList[i+n.v.mc.c]:100
+ sum+=num;
+ }
+ }else{
+ sum = this.widthList[n.c]?this.widthList[n.c]:100
+ }
+ return sum
+ },
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
@@ -1021,7 +1034,7 @@
}).then(res => {
if (res.code === 200 && res.data) {
this.equipOptions = res.data.map(m => {
- m.value = m.factoryNo
+ m.value = m.managementNumber
m.label = m.deviceName
return m
})
@@ -1100,10 +1113,8 @@
})
},
saveInsContext(){
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
}).then(res => {
if (res.code == 201) {
this.$message.error('淇濆瓨澶辫触')
--
Gitblit v1.9.3