From 66afa3c24982b479a7c13bd8a0fb335435e8ecff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 七月 2023 10:25:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index b928062..24b66f7 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1588,7 +1588,10 @@
this.isShowformulaEdit = true;
}else if(column.property == 'enumString'){
this.enumVisible=true;
- this.tableData=JSON.parse(this.CurrentCell.enumString)
+ if(this.attrSelectList[0].enumString != ""){
+ this.tableData=JSON.parse(this.attrSelectList[0].enumString)
+ return
+ }
}else if(column.property == 'parentCode'){
gridCodeClassifyTemplateAttr({
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
@@ -1632,7 +1635,11 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList.length === 1) {
this.enumVisible = true;
- this.tableData=JSON.parse(this.attrSelectList[0].enumString)
+ if(this.attrSelectList[0].enumString != ""){
+ this.tableData=JSON.parse(this.attrSelectList[0].enumString)
+ return
+ }
+
}
},
enumBeforeClose(done){
--
Gitblit v1.9.3