Merge remote-tracking branch 'origin/master'

luohairen

2024-12-10 bd63da40b4f5a5130bbb73fc654e7aaa25cacce6

 src/views/projectProcess/detail/index.vue

@@ -1,5 +1,6 @@
<template>
  <div class="app-container" v-loading.fullscreen.lock="loading">
  <div class="app-container">
    <div v-loading="loading">
    <div class="top">
      <div class="project-title">
        <h2>项目名称：{{detailData.projectName}}</h2>
@@ -31,7 +32,7 @@
          <el-input v-model="queryParams.taskName" placeholder="任务名称"></el-input>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="getList">查询</el-button>
            <el-button type="primary" @click="search">查询</el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -52,13 +53,13 @@
         >
        </el-table-column>
        <el-table-column
          prop="promoterName"
          label="发起人"
            prop="promoterUnitName"
            label="发起单位"
        >
        </el-table-column>
        <el-table-column
          prop="promoterUnitName"
          label="发起单位"
            prop="promoterName"
            label="发起人"
        >
        </el-table-column>
        <el-table-column
@@ -89,15 +90,15 @@
    </div>
    <div class="table" style="margin-top: 15px">
      <el-pagination
        v-if="total > queryParams.pageSize"
        @size-change="getList"
        @current-change="getList"
          @size-change="sizeChange"
          @current-change="pageChange"
        :current-page.sync="queryParams.currentPage"
        :page-sizes="[5, 10, 20]"
        :page-size="100"
        layout="sizes, prev, pager, next"
        :total="total">
      </el-pagination>
      </div>
    </div>
  </div>
</template>
@@ -142,7 +143,9 @@
        if (row.handlerType === "USER") {
          return this.$store.state.user.id === row.handlerId
        } else if (row.handlerType === "DEPT") {
          return this.$store.state.user.id === row.handlerId
          console.log(this.$store.state.user.deptId, "部门id", row.handlerUnitId)
          return this.$store.state.user.deptId === row.handlerUnitId
          // return this.$store.state.user.name === '市发展改革委' || this.$store.state.user.name === '市住建局'
        } else if (row.handlerType === "ROLE") {
          return this.$auth.hasRole(row.handlerUnitName)
        }
@@ -151,47 +154,46 @@
      }
    },
    goToDo(row) {
      // TODO 这里的判断条件根据实际情况设置
      // let params = {
      //   processDefId: row.processDefId,
      //   taskId: row.taskId
      // }
      // getTaskIsAuditing(params).then(res => {
      //
      // })
      // if (this.showHandle(row)) {
        console.log("zhe")
      // 查询该任务是否配置了需要审批
      let params = {
        processDefId: row.processDefId,
        taskId: row.taskId
      }
      getTaskIsAuditing(params).then(res => {
        this.$router.push({
          path: '/flowable/task/myProcess/send/index',
          query: {
            deployId: row.deployId,
            procDefId: row.processDefId,
            processName: row.taskName,
            taskId: row.taskId
            taskId: row.taskId,
            showAuditing: res.data,
            goBackParams: this.queryParams
          }
        })
      // } else {
      //   this.$router.push({
      //     path: '/flowable/task/todo/detail/index',
      //     query: {
      //       taskName: row.taskName,
      //       startUser: row.promoterName,
      //       deployId: row.deployId,
      //       taskId: row.taskId,
      //       procInsId: row.processInsId,
      //       executionId: row.executionId
      //     }
      //   })
      // }
      })
    },
    goToProcessDetail(row) {
      this.$router.push({ path: '/flowable/task/myProcess/detail/index',
        query: {
          procInsId: row.processInsId,
          deployId: row.deployId,
          taskId: row.taskId
          taskId: row.taskId,
          goBackParams: this.queryParams
        }})
    },
    search() {
      this.queryParams.currentPage = 1;
      this.getList()
    },
    sizeChange(pageSize) {
      this.queryParams.pageSize = pageSize;
      this.getList()
    },
    pageChange(pageNum) {
      this.queryParams.currentPage = pageNum;
      this.getList()
    },
    getList() {
      // 获取任务列表
      getProjectProcessDetailTaskList(this.queryParams).then(res => {