xiangpei
2025-03-09 0829704d064b5d843014897a84b42f3625571d97
容缺补办实现
4个文件已修改
57 ■■■■ 已修改文件
src/api/flowable/process.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/flowable/todo.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/task/myProcess/detail/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/task/myProcess/send/index.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/flowable/process.js
@@ -44,6 +44,15 @@
  })
}
// 容缺补交
export function waitCompleteSubmitFormTask(taskId, data) {
  return request({
    url: '/flowable/task/wait/complete/form/' + taskId,
    method: 'post',
    data: data
  })
}
// 取消申请
export function stopProcess(data) {
  return request({
src/api/flowable/todo.js
@@ -132,9 +132,9 @@
  })
}
// 流程节点查看详情表单
export function flowTaskFormDetail(taskId) {
export function flowTaskFormDetail(processInsId, taskId) {
  return request({
    url: '/flowable/task/detail/' + taskId,
    url: '/flowable/task/detail/' + processInsId + '/' + taskId,
    method: 'get',
  })
}
src/views/flowable/task/myProcess/detail/index.vue
@@ -166,7 +166,7 @@
    this.projectName = this.$route.query && this.$route.query.projectName;
    this.flowName = this.$route.query && this.$route.query.flowName;
    // 流程任务重获取变量表单
    this.processVariables( this.taskForm.taskId)
    this.processVariables( this.taskForm.taskId, this.taskForm.procInsId)
    this.getFlowRecordList(this.taskForm.procInsId);
  },
  methods: {
@@ -204,11 +204,11 @@
      })
    },
    /** 获取流程变量内容 */
    processVariables(taskId) {
    processVariables(taskId, processInsId) {
      if (taskId) {
        this.formLoading = true
        // 提交流程申请时填写的表单存入了流程变量中后续任务处理时需要展示
        flowTaskFormDetail(taskId).then(res => {
        flowTaskFormDetail(processInsId, taskId).then(res => {
          this.formDataList = res.data
          if (this.formDataList && this.formDataList.length > 0) {
            this.$nextTick(() => {
src/views/flowable/task/myProcess/send/index.vue
@@ -185,7 +185,7 @@
import SingleUser from '@/components/flow/User/SingleUser'
import MultUser from '@/components/flow/User/MultUser'
import MyRole from '@/components/flow/Role/MyRole'
import {completeSubmitFormTask} from "@/api/flowable/process";
import {completeSubmitFormTask, waitCompleteSubmitFormTask} from "@/api/flowable/process";
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
import LogView from "@/views/projectProcess/components/LogView";
@@ -289,7 +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.isWait = this.$route.query && this.$route.query.isWait === 'true' ? true : false;
    // this.getNextFlowNodeByStart(this.deployId);
    this.getFlowFormData(this.taskId);
  },
@@ -675,19 +675,35 @@
            // 复制对象的属性值给新的对象
            Object.assign(param, formData);
            // 完成任务
            completeSubmitFormTask(this.taskId, param).then(res => {
            if (this.isWait) {
              waitCompleteSubmitFormTask(this.taskId, param).then(res => {
                this.$modal.msgSuccess(res.msg);
                this.submitLoading = false
                this.goBack();
              })
            } else {
              completeSubmitFormTask(this.taskId, param).then(res => {
                this.$modal.msgSuccess(res.msg);
                this.submitLoading = false
                this.goBack();
              })
            }
          })
        } else {
          // 没关联表单直接传空
          if (this.isWait) {
              waitCompleteSubmitFormTask(this.taskId, {}).then(res => {
              this.$modal.msgSuccess(res.msg);
              this.submitLoading = false
              this.goBack();
            })
          })
        } else {
          // 没关联表单直接传空
          completeSubmitFormTask(this.taskId, {}).then(res => {
            this.$modal.msgSuccess(res.msg);
            this.submitLoading = false
            this.goBack();
          })
          } else {
            completeSubmitFormTask(this.taskId, {}).then(res => {
              this.$modal.msgSuccess(res.msg);
              this.submitLoading = false
              this.goBack();
            })
          }
        }
      }).catch((err) => {
        console.log(err)