Merge branch 'master' into dev

zxl

2025-03-03 c78889e71d16d26c03ff59746db47c6d4d2b98e0

 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()))