From d67b3fe1341e508fc48be3de9bf403d76482d94c Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 14 六月 2024 18:09:14 +0800
Subject: [PATCH] 标准库导入
---
src/components/do/b1-ins-order/equip-config.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/equip-config.vue b/src/components/do/b1-ins-order/equip-config.vue
index 019079d..f44df90 100644
--- a/src/components/do/b1-ins-order/equip-config.vue
+++ b/src/components/do/b1-ins-order/equip-config.vue
@@ -2,7 +2,7 @@
<div class="ins_order_config">
<div>
<el-row class="title">
- <el-col :span="6" style="padding-left: 20px;">鐢电紗閰嶇疆</el-col>
+ <el-col :span="6" style="padding-left: 20px;">瀛愭牱鍝侀厤缃�</el-col>
<el-col :span="18" style="text-align: right;">
<el-button size="medium" type="primary" @click="addChild" v-if="active==1">娣诲姞瀛愭牱鍝�</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-if="active==1">淇� 瀛�</el-button>
@@ -220,11 +220,11 @@
})
},
save() {
- if(this.sampleList.length === 0){
+ if (this.sampleList.length === 0) {
this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
return
}
- this.parentSample.forEach(a=>{
+ this.parentSample.forEach(a => {
a.childSampleList = this.sampleList
})
this.$message.success('宸蹭繚瀛�')
@@ -240,7 +240,7 @@
this.selectStandardTree = true
},
selectSample(val) {
- if(val === null)return
+ if (val === null) return
this.sampleIds = [val.id]
},
rowClick(row, column, event) {
@@ -275,7 +275,7 @@
},
handleChangeModel(e) {
let num = this.selectTree.split('-').length;
- if (num == 4) {
+ if (num != 5) {
this.selectTree = this.selectTree + ' - ' + e
} else {
let arr = this.selectTree.split('-')
@@ -458,7 +458,13 @@
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
this.addObj.sampleType = trees[2]
- this.addObj.sample = trees[3]
+ if(trees[3]===''){
+ this.addObj.sample = (trees[4] == undefined ? null : trees[4])
+ }else if(trees[3]===undefined){
+ this.addObj.sample = trees[2]
+ }else{
+ this.addObj.sample = trees[3]
+ }
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.selectStandardTree = false
this.sample.joinName = null
@@ -496,7 +502,11 @@
},
getNodeParent(val) {
if (val.parent != null) {
- this.selectTree += ' - ' + val.label
+ if (val.data.children === null) {
+ this.selectTree += ' - ' + val.label + ' - ' + ''
+ } else {
+ this.selectTree += ' - ' + val.label
+ }
this.getNodeParent(val.parent)
}
},
--
Gitblit v1.9.3