From 0bdbe50ac8a4dcc1ee760e35416b825a984dd85d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 16:59:43 +0800
Subject: [PATCH] 1.检验任务的扫码报检需要和样品管理联动,扫码报检之后样品也会入库(扫码报检也是需要弹框去选具体哪个货架),另外再加一个扫码出库的步骤,就是将该样品出库
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index c8ae3ed..5696dcd 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -87,7 +87,7 @@
<el-form-item class="fomItemInput1">
<template v-slot="label">
鍏紡锛�
- <el-tooltip v-for="formula in formulas" class="itemFomItem" effect="dark" :content="formula.content"
+ <el-tooltip v-for="(formula, key) in formulas" class="itemFomItem" effect="dark" :content="formula.content" :key="key"
placement="top">
<label>{{ formula.label }}()</label>
</el-tooltip>
@@ -573,14 +573,14 @@
});
this.domains.forEach((i, index) => {
let isIncludes = false
- if (this.configForm.formula && this.configForm.formula != "") {
+ if (this.configForm.formula && this.configForm.formula !== "") {
for (let formula in this.formulas) {
if (this.configForm.formula.includes(this.formulas[formula].label)) {
isIncludes = true
}
}
}
- if (isIncludes === false) {
+ if (isIncludes === false && this.configForm.formula !== "") {
i.formula = "(" + this.configForm.formula + ")";
} else {
i.formula = this.configForm.formula;
--
Gitblit v1.9.3