From f294efb8c01ad8b0704a92d51c14dbd55d898874 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 23 十月 2025 16:49:46 +0800
Subject: [PATCH] 拆分原材料和外购成品的业务流程(报检、下单、检验)
---
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 7be6506..012b6d4 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -17,19 +17,19 @@
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
tooltip-effect="dark" height="100%">
<el-table-column type="index" label="搴忓彿" align="center" width="65"></el-table-column>
- <el-table-column prop="deviceName" align="center" min-width="100" label="璁惧鍚嶇О"></el-table-column>
+ <el-table-column prop="deviceName" align="center" min-width="100" label="璁惧鍚嶇О" show-overflow-tooltip></el-table-column>
<el-table-column prop="sample" align="center" label="妫�楠屽璞�" show-overflow-tooltip
min-width="150"></el-table-column>
- <el-table-column prop="inspectionItemClass" align="center" label="妫�楠岄」鍒嗙被" min-width="120"></el-table-column>
- <el-table-column prop="inspectionItem" align="center" label="妫�楠岄」" min-width="100"></el-table-column>
- <el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠屽瓙椤�" min-width="100"></el-table-column>
- <el-table-column prop="referx" align="center" label="鍙傜収X" min-width="100"></el-table-column>
- <el-table-column prop="x" align="center" label="X"></el-table-column>
- <el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100"></el-table-column>
- <el-table-column prop="y" align="center" label="Y"></el-table-column>
- <el-table-column prop="anotherName" align="center" label="鍒悕" min-width="100"></el-table-column>
- <el-table-column prop="matchingName" align="center" label="鍖归厤鍚嶇О" min-width="100"></el-table-column>
- <el-table-column prop="formula" align="center" label="鍏紡"></el-table-column>
+ <el-table-column prop="inspectionItemClass" align="center" label="妫�楠岄」鍒嗙被" min-width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItem" align="center" label="妫�楠岄」" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠屽瓙椤�" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="referx" align="center" label="鍙傜収X" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="x" align="center" label="X" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="y" align="center" label="Y" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="anotherName" align="center" label="鍒悕" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="matchingName" align="center" label="鍖归厤鍚嶇О" min-width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="formula" align="center" label="鍏紡" show-overflow-tooltip></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="120" align="center">
<template slot-scope="scope">
<el-button type="text" @click="dataConfig(scope.row)">鏁伴噰閰嶇疆</el-button>
@@ -98,7 +98,7 @@
:content="formula.content" :key="key" placement="top">
<label>{{ formula.label }}()</label>
</el-tooltip>
- <el-input type="textarea" autosi:autosize="{ minRows: 2, maxRows: 4}" ze placeholder="璇疯緭鍏ュ唴瀹�"
+ <el-input type="textarea" autosize:autosize="{ minRows: 2, maxRows: 4}" placeholder="璇疯緭鍏ュ唴瀹�"
v-model="configForm.formula" @change="evalResult">
</el-input>
</template>
@@ -476,6 +476,7 @@
structureItemParameterId: row.structureItemParameterId
}).then(res => {
const data = res.data;
+ console.log("鏁伴噰閰嶇疆--",data)
if (data[0]) {
this.domains.splice(0, 1);
let formula = data[0].formula
@@ -527,7 +528,7 @@
}
}
}
- if (isIncludes === false && this.configForm.formula !== "" && this.configForm.formula !== undefined) {
+ if (isIncludes === false && this.configForm.formula !== "" && this.configForm.formula !== null && this.configForm.formula !== undefined) {
i.formula = "(" + this.configForm.formula + ")";
} else {
i.formula = this.configForm.formula;
--
Gitblit v1.9.3