2025-07-16

king

1 天以前 b09b821ef36fd1ea979e9a5daa98e95732ac81d5

2025-07-16

 src/tabviews/zshare/actionList/normalbutton/index.jsx

@@ -1063,12 +1063,17 @@
          statusName = line.mkdata.statusName
          sign = line.mkdata.seniorSign || ''
          target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
          let departs = []
  
          line.mkdata.members && line.mkdata.members.forEach(item => {
            if (line.mkdata.approver === 'departmentManager') {
              if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
                checkIds.push(item.worker_id)
                checkUsers.push(item)
              if (item.job_type === 'manage') {
                if (departmentcode === item.parentIds[1]) {
                  checkIds.push(item.worker_id)
                  checkUsers.push(item)
                } else if (item.parentNames[1]) {
                  departs.push(item.parentNames[1])
                }
              }
            } else if (line.mkdata.approver === 'directManager') {
              if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
@@ -1087,7 +1092,12 @@
          if (!target) {
            error = '未查询到工作流目标节点'
          } else if (checkIds.length === 0 && !['startEdge', 'endEdge', 'throughEdge'].includes(line.mknode)) {
            error = '未获取到下一步审批人'
            if (departs.length) {
              departs = Array.from(new Set(departs))
              error = '未获取到下一步审批人，需要' + departs.join('、') + '才可以操作当前功能。'
            } else {
              error = '未获取到下一步审批人'
            }
          } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
            error = '当前用户不在审批人列表中'
          }

 src/utils/utils.js

@@ -2671,12 +2671,17 @@
        statusName = line.mkdata.statusName
        sign = line.mkdata.seniorSign || ''
        target = flow.cells.filter(cell => cell.id === line.target.cell)[0]
        let departs = []

        line.mkdata.members && line.mkdata.members.forEach(item => {
          if (line.mkdata.approver === 'departmentManager') {
            if (item.job_type === 'manage' && departmentcode === item.parentIds[1]) {
              checkIds.push(item.worker_id)
              checkUsers.push(item)
            if (item.job_type === 'manage') {
              if (departmentcode === item.parentIds[1]) {
                checkIds.push(item.worker_id)
                checkUsers.push(item)
              } else if (item.parentNames[1]) {
                departs.push(item.parentNames[1])
              }
            }
          } else if (line.mkdata.approver === 'directManager') {
            if (departmentcode === item.parentIds[1] && item.work_grade > work_grade) {
@@ -2695,7 +2700,12 @@
        if (!target) {
          error = '未查询到工作流目标节点'
        } else if (checkIds.length === 0 && !['startEdge', 'endEdge', 'throughEdge'].includes(line.mknode)) {
          error = '未获取到下一步审批人'
          if (departs.length) {
            departs = Array.from(new Set(departs))
            error = '未获取到下一步审批人，需要' + departs.join('、') + '才可以操作当前功能。'
          } else {
            error = '未获取到下一步审批人'
          }
        } else if (line.approvalMethod === 'countersign' && (!node.checkIds || !node.checkIds.includes(userid))) {
          error = '当前用户不在审批人列表中'
        }