xiangpei
2025-03-09 2cd8b0ca2746c6f4467995e2f0ed7bd62aa77131
容缺查询,TODO:容缺完成时调新的接口
2个文件已修改
75 ■■■■■ 已修改文件
src/views/flowable/task/myProcess/send/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectProcess/detail/index.vue 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/task/myProcess/send/index.vue
@@ -18,11 +18,11 @@
                  <div class="op-list">
                    <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '挂起' || submitLoading" v-loading="submitLoading" @click="submitForm">确认并提交</el-button>
<!--                    <el-button size="small" type="primary" disabled @click="submitForm">协同办理(功能开发中)</el-button>-->
                    <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '挂起'" @click="openDelegation(formDataList[0].beforeNodeName)">转办</el-button>
                    <el-button v-if="formDataObj.canJump" :disabled="formDataObj.taskStatus === '挂起'" size="small" type="primary" @click="jumpTask()">跳过</el-button>
                    <el-button v-if="formDataObj.canWait" :disabled="formDataObj.taskStatus === '挂起'" size="small" type="primary" @click="waitTask()">容缺</el-button>
                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '挂起'" size="small" type="primary" @click="hangup">挂起</el-button>
                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '挂起'" size="small" type="primary" @click="cancelHangup">结束挂起</el-button>
                    <el-button size="small" type="primary" v-if="!isWait" :disabled="formDataObj.taskStatus === '挂起'" @click="openDelegation(formDataList[0].beforeNodeName)">转办</el-button>
                    <el-button v-if="formDataObj.canJump && !isWait" :disabled="formDataObj.taskStatus === '挂起'" size="small" type="primary" @click="jumpTask()">跳过</el-button>
                    <el-button v-if="formDataObj.canWait && !isWait" :disabled="formDataObj.taskStatus === '挂起'" size="small" type="primary" @click="waitTask()">容缺</el-button>
                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '挂起' && !isWait" size="small" type="primary" @click="hangup">挂起</el-button>
                    <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '挂起' && !isWait" size="small" type="primary" @click="cancelHangup">结束挂起</el-button>
                  </div>
                  <div class="current">当前阶段:<span>{{formDataObj.beforeNodeName}}</span><span v-if="formDataObj.taskStatus === 'HANGUP'">(挂起中)</span></div>
                </div>
@@ -205,6 +205,7 @@
  props: {},
  data() {
    return {
      isWait: false,
      jumpDesc: '', // 跳过说明
      rejectLoading: false, // 驳回按钮加载
      submitLoading: false, // 提交按钮加载
@@ -288,6 +289,7 @@
    this.procDefId  = this.$route.query && this.$route.query.procDefId;
    this.procInsId  = this.$route.query && this.$route.query.procInsId;
    this.goBackParams  = this.$route.query && this.$route.query.goBackParams;
    this.isWait = this.$route.query && this.$route.query.isWait;
    // this.getNextFlowNodeByStart(this.deployId);
    this.getFlowFormData(this.taskId);
  },
src/views/projectProcess/detail/index.vue
@@ -19,7 +19,7 @@
      <div class="search-warp">
        <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">全部事项<span v-if="detailData && detailData.statistics">({{detailData.statistics.totalTaskNum}})</span></div>
        <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">待办事项<span v-if="detailData && detailData.statistics">({{detailData.statistics.todoTaskNum}})</span></div>
        <div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">当前环节</div>
        <div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">容缺事项</div>
        <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">剩余事项<span v-if="detailData && detailData.statistics">({{detailData.statistics.remainingTaskNum}})</span></div>
        <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">按时完成<span v-if="detailData && detailData.statistics">({{detailData.statistics.timelyFinishedTaskNum}})</span></div>
        <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">超时事项(0)</div>
@@ -73,45 +73,6 @@
            :formatter="candidateFormatter"
          >
          </el-table-column>
<!--          <el-table-column-->
<!--            prop="promoterUnitName"-->
<!--            label="发起单位"-->
<!--          >-->
<!--          </el-table-column>-->
<!--          <el-table-column-->
<!--            prop="promoterName"-->
<!--            label="发起人"-->
<!--          >-->
<!--          </el-table-column>-->
<!--          <el-table-column-->
<!--            align="center"-->
<!--            prop="handlerType"-->
<!--            label="处理方类型"-->
<!--          >-->
<!--            <template slot-scope="scope">-->
<!--              <el-tag v-if="scope.row.handlerType === 'USER'">人员账号</el-tag>-->
<!--              <el-tag type="success" v-else-if="scope.row.handlerType === 'DEPT'">单位</el-tag>-->
<!--              <el-tag type="info" v-else-if="scope.row.handlerType === 'ROLE'">角色</el-tag>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--          <el-table-column-->
<!--            prop="handlerUnitName"-->
<!--            label="处理单位"-->
<!--            :formatter="unitFormatter"-->
<!--          >-->
<!--          </el-table-column>-->
<!--          <el-table-column-->
<!--            prop="handlerName"-->
<!--            label="候选处理人"-->
<!--            :formatter="candidateFormatter"-->
<!--          >-->
<!--          </el-table-column>-->
<!--          <el-table-column-->
<!--            prop="handlerName"-->
<!--            label="实际处理人"-->
<!--            :formatter="finalFinishedFormatter"-->
<!--          >-->
<!--          </el-table-column>-->
          <el-table-column
            align="center"
            prop="taskStatus"
@@ -415,7 +376,7 @@
      }
    },
    showHandle(row) {
      if (row.taskStatus === '待办' || row.taskStatus === '挂起') {
      if (row.taskStatus === '待办' || row.taskStatus === '挂起' || row.taskStatus === '容缺') {
        if (row.handlerType === "USER") {
          return row.handlerId.indexOf(this.$store.state.user.id) !== -1
        } else if (row.handlerType === "DEPT") {
@@ -428,6 +389,24 @@
      }
    },
    goToDo(row) {
      if (row.taskStatus === '容缺') {
        this.$router.push({
          path: '/flowable/task/myProcess/send/index',
          query: {
            deployId: row.deployId,
            procDefId: row.processDefId,
            procInsId: row.processInsId,
            processName: row.taskName,
            flowName: this.queryParams.processName,
            projectName: this.detailData.projectName,
            taskId: row.taskId,
            showAuditing: false,
            projectId: this.queryParams.projectId,
            isWait: true,
            goBackParams: this.queryParams
          }
        })
      } else {
      // 查询该任务是否配置了需要审批
      let params = {
        processDefId: row.processDefId,
@@ -447,10 +426,12 @@
            taskId: row.taskId,
            showAuditing: res.data,
            projectId: this.queryParams.projectId,
              isWait: false,
            goBackParams: this.queryParams
          }
        })
      })
      }
    },
    goToProcessDetail(row) {
      this.$router.push({ path: '/flowable/task/myProcess/detail/index',