From 9a34ff2378be183e5dd80dc1b7ac98579589ff62 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 15 七月 2024 18:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-device-management.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index c9a0423..f7973f5 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -438,7 +438,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -700,6 +700,23 @@
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
})
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
+ })
})
},
handleClose() {
@@ -940,10 +957,6 @@
}
if(!this.configForm.y){
this.$message.error('璇峰～鍐橸');
- return
- }
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
return
}
--
Gitblit v1.9.3