From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/components/Process/panel/TaskConfPanel.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/Process/panel/TaskConfPanel.vue b/src/components/Process/panel/TaskConfPanel.vue
index 88718ff..fc80fea 100644
--- a/src/components/Process/panel/TaskConfPanel.vue
+++ b/src/components/Process/panel/TaskConfPanel.vue
@@ -242,12 +242,14 @@
},
editDept() {
this.$nextTick(() => {
+ this.deptKey += '1'
this.$refs.dept.setCheckList(this.delegationDeptSelect)
})
this.deptShow = true
},
editSingleUser() {
if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
+ this.singleUserKey += '1'
this.$nextTick(() => {
this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
})
@@ -256,6 +258,7 @@
},
editRole() {
if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
+ this.roleKey += '1'
this.$nextTick(() => {
this.$refs.role.setChecked(this.delegationRoleSelect)
})
@@ -443,17 +446,18 @@
// 璁捐鍣ㄥ彸渚ц〃鍗曟暟鎹洖鏄�
checkValuesEcho(formData) {
if (formData.expId) {
+ console.log("456")
this.getExpList(formData.expId);
this.typeButDisable = true
this.expButDisable = false
} else {
this.typeButDisable = false
this.expSelect = null
- if ("candidateGroups" === formData.userType || "candidateDeptGroups" === formData.userType) {
- this.getRoleOrDeptReview(formData.candidateGroups)
- } else {
- this.getUserList(formData[formData.userType], formData.userType);
- }
+ }
+ if ("candidateGroups" === formData.userType || "candidateDeptGroups" === formData.userType) {
+ this.getRoleOrDeptReview(formData.candidateGroups)
+ } else {
+ this.getUserList(formData[formData.userType], formData.userType);
}
},
@@ -489,8 +493,9 @@
this.typeButDisable = false
// 鏍规嵁id绛涢�夊嚭鏄鑹茶繕鏄儴闂�
const roleAndDeptIds = ids.split(",");
- const deptIds = roleAndDeptIds.filter(item => item.includes("dept"));
- const roleIds = roleAndDeptIds.filter(item => !item.includes("dept"));
+ console.log("woc", roleAndDeptIds)
+ const deptIds = roleAndDeptIds.filter(item => item.includes("dept") || item === '${data_launch}');
+ const roleIds = roleAndDeptIds.filter(item => !item.includes("dept") && item !== '${data_launch}');
if (roleIds && roleIds.length > 0) { // 瑙掕壊
const targetRoleList = this.modelerStore.roleList?.filter(i => roleIds.includes(i.roleId.toString()))
--
Gitblit v1.8.0