Merge branch 'master' into dev

zxl

2025-03-03 c78889e71d16d26c03ff59746db47c6d4d2b98e0

Merge branch 'master' into dev

 src/views/flowable/task/myProcess/send/index.vue

@@ -30,19 +30,18 @@
                  <!--     前置节点可驳回         -->
                  <div class="reject-but">
                    <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeName)">驳 回</el-button>
                    <div style="margin-left: 10px" v-if="formDataObj.events.length > 0">
                      <el-popover
                        placement="right-start"
                        title="任务日志"
                        width="600"
                        trigger="hover"
                      >
                        <div v-if="formDataObj.events.length > 0">
                          <log-view :log-list="formDataObj.events"/>
                        </div>
                        <el-button slot="reference">任务日志</el-button>
                      </el-popover>
                    </div>
                    <el-popover
                      style="margin-left: 10px" v-if="formDataObj.events.length > 0"
                      placement="right-start"
                      title="任务日志"
                      width="600"
                      trigger="hover"
                    >
                      <div v-if="formDataObj.events.length > 0">
                        <log-view :log-list="formDataObj.events"/>
                      </div>
                      <el-button slot="reference">任务日志</el-button>
                    </el-popover>
                  </div>
                  <div class="before">前置阶段：<span>{{formDataObj.beforeNodeName}}</span></div>
                </div>
@@ -189,6 +188,7 @@
import {completeSubmitFormTask} from "@/api/flowable/process";
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
import LogView from "@/views/projectProcess/components/LogView";
import {rejectTask} from "@/api/flowable/process";
import {cancelTaskHangup, taskDelegation, taskHangup, taskJump} from "@/api/projectProcess/projectProcess";

@@ -200,6 +200,7 @@
    MyDept,
    SingleUser,
    MultUser,
    LogView
  },
  props: {},
  data() {

 src/views/projectProcess/index.vue

@@ -412,9 +412,9 @@
      this.nowProcessInsId = row.processInsId ? row.processInsId : '';
      const numericPattern = /^\d+(\.\d+)?$/;
      if (numericPattern.test(row.id)) {
        this.projectType = "ENGINEERING"
      } else {
        this.projectType = "PROJECT"
      } else {
        this.projectType = "ENGINEERING"
      }
      // // 防止：id没变不触发监听
      // this.$refs.runProcess.setSelect(row.flowableProcessId);