From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b7b216e..4e7f56e 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -138,6 +138,12 @@
color: #3A7BFA;
background-color: #fff;
}
+
+ .inspection .center-box .el-input__inner{
+ font-size: 12px;
+ padding: 0 6px;
+ text-align: center;
+ }
</style>
<template>
<div v-loading="loading" class="inspection">
@@ -193,9 +199,9 @@
: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}`">
- <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��'">
+ <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 != '')||state>1"
+ :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
@change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)">
<el-button slot="append" type="primary" icon="el-icon-edit" size="mini" v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
</el-input>
@@ -214,9 +220,9 @@
<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==='璁惧缂栫爜'">
+ <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧缂栫爜' && state==1">
<el-select v-model="n.v.v" placeholder="璁惧" @visible-change="e=>getEquipOptions(e,n.i)"
- :disabled="state>1">
+ remote @change="(val)=>changeEquip(val, n)">
<el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
</el-option>
</el-select>
@@ -261,12 +267,12 @@
<ValueTable class="value-table" ref="insOrderPlan" :url="$api.insOrderPlan.selectInsOrderPlanList"
:componentData="componentData" :key="upIndex" />
</el-drawer>
- <el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="400px">
- <div class="body" style="display: flex;" v-if="reviewDia">
- <div class="search_label" style="width: 120px;"><span class="required-span">* </span>涓嶉�氳繃鍘熷洜锛�</div>
- <div class="search_input">
+ <el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="500px">
+ <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
+ <div class="search_label" style="width: 150px;"><span class="required-span">* </span>涓嶉�氳繃鐨勭悊鐢憋細</div>
+ <div class="search_input" style="width: 100%;">
<el-input size="small" clearable v-model="noReason" type="textarea"
- :autosize="{ minRows: 3, maxRows: 5}"></el-input>
+ :autosize="{ minRows: 4}"></el-input>
</div>
</div>
<span slot="footer" class="dialog-footer">
@@ -375,6 +381,7 @@
comValue: [],
resValue: null,
equipValue: [],
+ equipName: [],
insResult: null
}
})
@@ -396,6 +403,7 @@
comValue: [],
resValue: null,
equipValue: [],
+ equipName: [],
insResult: null
}
})
@@ -616,6 +624,10 @@
b.v.v = ''
this.param[b.i].equipValue.push(b)
}
+ if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
+ b.v.v = ''
+ this.param[b.i].equipName.push(b)
+ }
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
b.v.v = ''
if (b.i === undefined) {
@@ -677,6 +689,12 @@
}
} catch (e) {}
try {
+ let equipName = JSON.parse(a.insProductResult.equipName)
+ for (var i = 0; i < equipName.length; i++) {
+ this.param[a.id].equipName[i].v.v = equipName[i].v
+ }
+ } catch (e) {}
+ try {
this.param[a.id].resValue.v.v = a.lastValue
this.param[a.id].insResult.v.v = a.insResult
} catch (e) {}
@@ -719,7 +737,6 @@
}
})
})
- console.log(item);
if (item.methodName == '鑷畾涔夋柟娉�' && item.v.ps!=undefined && item.v.ps.value == '缁撹') {
if (this.currentSample.insProduct.find(m => m.id == item.i)) {
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&');
@@ -796,7 +813,7 @@
break;
}
list.forEach(a => {
- if (a[0].r == item.r) {
+ if (a[0].r == item.r && comResult != '') {
for (var b in a) {
if (a[b].c == item.c) {
a[b].v.v = parseFloat(comResult.toFixed(3))
@@ -805,7 +822,7 @@
}
}
})
- this.changeInput(comResult, `${code.split('-')[0]}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
+ this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
}
}
})
@@ -826,9 +843,9 @@
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
+ r0 = start.replace(/[a-zA-Z]/g, "") - 1
c1 = this.comparisonList.find(j => j.label == end.split('')[0]).value
- r1 = end.split('')[1] - 1
+ r1 = end.replace(/[a-zA-Z]/g, "") - 1
for (let i = Number(r0); i <= Number(r1); i++) {
for (let u = Number(c0); u <= Number(c1); u++) {
valueList.push({
@@ -837,7 +854,6 @@
})
}
}
- item.valueList = valueList;
} else {
valueList = []
let regex = /[=\+\-\*\%\(\)\/\s]/g
@@ -895,9 +911,11 @@
},
getEquipOptions(e, id) {
if (e) {
- let category = this.currentSample.insProduct.find(m => m.id == id).deviceGroup
+ this.equipOptions = []
+ let product = this.currentSample.insProduct.find(m => m.id == id)
this.$axios.post(this.$api.deviceScope.selectDeviceByCategory, {
- category
+ inspectionItem: product.inspectionItem,
+ inspectionItemSubclass: product.inspectionItemSubclass
}).then(res => {
if (res.code === 200 && res.data) {
this.equipOptions = res.data.map(m => {
@@ -991,6 +1009,17 @@
}
this.$message.success('宸蹭繚瀛�')
})
+ },
+ changeEquip(val,n){
+ for(let i in this.equipOptions){
+ if(this.equipOptions[i].value === val){
+ for(let i1 in this.param[n.i].equipName){
+ if(this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r){
+ this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
+ }
+ }
+ }
+ }
}
}
}
--
Gitblit v1.9.3