From cd60a218f5c1547dbc62cf4be78c31132b0f7628 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 四月 2024 17:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 6946ec5..e45dc8f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -114,11 +114,11 @@
}
</style>
<style>
- .el-form-item__label {
+ .inspection .el-form-item__label {
color: #000;
}
- .el-drawer__header::before {
+ .inspection .el-drawer__header::before {
content: "";
display: inline-block;
width: 4px;
@@ -129,8 +129,14 @@
margin-right: 8.5px;
}
- .el-drawer__header {
+ .inspection .el-drawer__header {
color: #303133;
+ }
+
+ .inspection .el-input-group__append{
+ padding: 0 10px;
+ color: #3A7BFA;
+ background-color: #fff;
}
</style>
<template>
@@ -190,7 +196,9 @@
<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 || (n.u != userId && n.u != undefined && n.u != '')||state>1"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)" />
+ @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>
<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"
@@ -200,10 +208,6 @@
</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)" :disabled="(n.u != userId && n.u != undefined && n.u != '')||state>1">
- </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>
@@ -483,8 +487,12 @@
for (var i = 0; i < b.v.mc.cs; i++) {
for (var i2 = 0; i2 < b.v.mc.rs; i2++) {
if (a.template[c].c === b.c + i && a.template[c].r === b.r + i2) {
- a.template[c].v.v = this.HaveJson(b).v.v
- a.template[c].v.ps = this.HaveJson(b).v.ps
+ let bb = this.HaveJson(b)
+ a.template[c].v.v = bb.v.v
+ a.template[c].v.ps = bb.v.ps
+ a.template[c].v.fc = bb.v.fc
+ a.template[c].v.fs = bb.v.fs
+ a.template[c].v.ht = bb.v.ht
a.template[c].mc = count
break
}
@@ -522,8 +530,7 @@
if (str != '') {
for (let i in this.currentSample.insProduct) {
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
- .insProduct[i].inspectionItem + (this.currentSample.insProduct[i].inspectionItemSubclass ===
- null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass) === str) {
+ .insProduct[i].inspectionItem + this.currentSample.insProduct[i].inspectionItemSubclass === str) {
ids.push({
r: b.r,
id: this.currentSample.insProduct[i].id,
@@ -554,7 +561,7 @@
a.template[b].v.v = id.product.unit
}
if (a.template[b].v.ps != undefined && a.template[b].v.ps.value === '璇曢獙鏂规硶') {
- a.template[b].v.v = id.product.method
+ a.template[b].v.v = id.product.methodS
}
}
}
@@ -633,7 +640,6 @@
this.excelMethodList.push(b)
}
})
- console.log(this.param);
set = Array.sort(set)
set.forEach(b => {
let arr = []
@@ -665,7 +671,10 @@
}
} catch (e) {}
try {
- this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
+ let equipValue = JSON.parse(a.insProductResult.equipValue)
+ for (var i = 0; i < equipValue.length; i++) {
+ this.param[a.id].equipValue[i].v.v = equipValue[i].v
+ }
} catch (e) {}
try {
this.param[a.id].resValue.v.v = a.lastValue
@@ -710,10 +719,10 @@
}
})
})
- // 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('&');
+ 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('&');
let res = Object.values(comValue)[0]
let comp = ask.map((m, i) => {
if (m.includes('=')) {
@@ -737,17 +746,7 @@
} else {
item.v.v = 0
}
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ this.saveInsContext()
}
} else {
let comResult = 0;
@@ -792,7 +791,7 @@
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))
+ a[b].v.v = parseFloat(comResult.toFixed(3))
break
}
}
@@ -971,6 +970,19 @@
console.error(error)
this.submitLoading = false;
})
+ },
+ saveInsContext(){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, this.param, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
}
}
}
--
Gitblit v1.9.3