Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-12 b16ae10a5c76b319a7034af4039cd8071db79802

Merge remote-tracking branch 'origin/master'

 src/components/Process/panel/TaskConfPanel.vue

@@ -446,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);
      }
    },

@@ -492,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()))

 src/components/Process/panel/taskPanel.vue

@@ -329,7 +329,7 @@
      if (StrUtil.isNotBlank(val)) {
        // 根据id筛选出是角色还是部门
        const roleAndDeptIds = val.split(",");
        const deptIds = roleAndDeptIds.filter(item => item.includes("dept"));
        const deptIds = roleAndDeptIds.filter(item => item.includes("dept") || item === '${data_launch}');
        const roleIds = roleAndDeptIds.filter(item => !item.includes("dept"));
        // 谁有值就是谁
        if (roleIds && roleIds.length > 0) {

 src/components/flow/Role/MyRole.vue

@@ -106,7 +106,6 @@
  watch: {
  },
  mounted() {
    console.log("我家在了")
    this.getList();
  },
  methods: {

 src/views/projectProcess/components/RunProcess.vue

@@ -99,8 +99,8 @@
        />
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="danger" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">启动流程</el-button>
        <el-button type="primary" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">流程变更</el-button>
        <el-button type="danger" v-loading="startLoading" @click="startProcess" :disabled="(nowProcessInsId !== '') || (selectProcessDefId === '')">启动流程</el-button>
        <el-button type="primary" v-loading="setLoading" @click="changeProcess" :disabled="((nowProcessDefId === selectProcessDefId) && nowProcessInsId !== '') || selectProcessDefId === '' || nowProcessInsId === ''">流程变更</el-button>
      </span>
    </el-dialog>
  </div>
@@ -122,10 +122,6 @@
      required: true,  // 项目id、名称
      type: Object
    },
    // processList: {  // 流程列表
    //   required: true,
    //   type: Array
    // },
    nowProcessDefId: {  // 当前项目绑定的定义id
      required: true,
      type: String
@@ -153,6 +149,8 @@
  },
  data() {
    return {
      startLoading: false,
      setLoading: false,
      processList: [],
      total:0,
      queryParams: {
@@ -205,8 +203,10 @@
    },
    // 启动流程
    startProcess() {
      this.startLoading = true
      startProcess(this.projectInfo.projectId, this.selectProcessDefId).then(res => {
        this.$message.success(res.msg);
        this.startLoading = false
        this.handleClose()
      })
    },
@@ -220,8 +220,10 @@
        projectId: this.projectInfo.projectId,
        processDefId: this.selectProcessDefId
      }
      this.setLoading = true
      projectSetProcess(data).then(res => {
        this.$message.success("变更成功")
        this.setLoading = false
        this.handleClose()
      })
    },