From b1ed46fcf0b28fa9278fc87e95410f7063ce4340 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 25 一月 2024 10:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 6270458..d8ea149 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -253,7 +253,7 @@
openDialog() {
//鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
this.getFormTemplate();
- if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
+ if (this.type === "add") {
this.getCodeRule();
return;
}
@@ -359,7 +359,7 @@
}
})
if (this.$refs.CodeApply) { // 娣诲姞涓�涓垽鏂鍙ワ紝妫�鏌ュ璞℃槸鍚︿负undefined
- this.$refs.CodeApply.changeChildItem(this.secVOList, this.TreeValue, this.type);
+ this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
}
},
//骞翠唬鍙�
@@ -375,7 +375,7 @@
});
if (this.$refs.CodeApply) {
- this.$refs.CodeApply.changeChildItem(this.secVOList, this.TreeValue, this.type);
+ this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
}
},
//灞炴�х爜娈佃祴鍊�
@@ -639,7 +639,7 @@
};
} else if (item.secType == "coderefersec") {
//寮曠敤鐮佹
- params = JSON.parse(item.referValueInfo);
+ params = JSON.parse(item.referValueInfo || item.referConfig);
}
return params;
},
--
Gitblit v1.10.0