From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index bbd676c..24b66f7 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1588,6 +1588,10 @@
this.isShowformulaEdit = true;
}else if(column.property == 'enumString'){
this.enumVisible=true;
+ 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,
@@ -1631,6 +1635,11 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.attrSelectList.length === 1) {
this.enumVisible = true;
+ if(this.attrSelectList[0].enumString != ""){
+ this.tableData=JSON.parse(this.attrSelectList[0].enumString)
+ return
+ }
+
}
},
enumBeforeClose(done){
@@ -1736,18 +1745,20 @@
if(this.CurrentCell){
this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
+ this.injectHandleReset()
}else {
this.$set(this.attrSelectList[0], 'classifyInvokeLevelName', data);
this.$set(this.attrSelectList[0], 'classifyInvokeLevel', JSON.stringify(this.injectOption));
+ this.injectHandleReset()
}
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- this.injectOption.type = "";
- this.injectOption.set = "";
- this.injectOption.change = "";
- this.injectOption.injectNum = "";
+ this.injectOption.type = "鍒嗙被鍚嶇О";
+ this.injectOption.set = "鏈�灏忓眰";
+ this.injectOption.change = "鏄�";
+ this.injectOption.injectNum = "0";
},
// 鍒嗙被娉ㄥ叆鍙栨秷
injectRemove() {
--
Gitblit v1.9.3