From bd01e4c94b65b9c1bc3a941c60b35bda8958fad9 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 19 Jul 2024 14:22:17 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E7=A7=91=E5=88=9B=E9=83=A8=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BF=87=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/process/DefaultNodeProps.js           | 1 +
 src/views/workflow/process/config/ApprovalNodeConfig.vue | 3 +++
 src/views/workflow/process/nodes/ApprovalNode.vue        | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/views/workflow/process/DefaultNodeProps.js b/src/views/workflow/process/DefaultNodeProps.js
index a780129..7ab000e 100644
--- a/src/views/workflow/process/DefaultNodeProps.js
+++ b/src/views/workflow/process/DefaultNodeProps.js
@@ -9,6 +9,7 @@ export const APPROVAL_PROPS = {
     assignedUser: [] //审批人列表
   },
   matrixApproval: true,
+  dstiMatrix: false,
   skipSelf: true,
   timeLimit: { //边界事件
     timeout: { //超时提醒时间
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 332daaf..db7ec03 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -101,6 +101,9 @@
     <!--        <i class="el-icon-question" style="margin-left: 10px; font-size: medium; color: #b0b0b1"></i>-->
     <!--      </el-tooltip>-->
     <!--    </el-form-item>-->
+    <el-form-item label="科创部矩阵" prop="text">
+      <el-switch inactive-text="审批" active-text="跳过" v-model="nodeProps.dstiMatrix"></el-switch>
+    </el-form-item>
     <el-form-item label="是否使用矩阵审批" prop="text">
       <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
     </el-form-item>
diff --git a/src/views/workflow/process/nodes/ApprovalNode.vue b/src/views/workflow/process/nodes/ApprovalNode.vue
index 183ec0a..ebe9e94 100644
--- a/src/views/workflow/process/nodes/ApprovalNode.vue
+++ b/src/views/workflow/process/nodes/ApprovalNode.vue
@@ -67,6 +67,8 @@ const content = computed(() => {
       }
     case "SELF":
       return '发起人自己'
+    case "DSTI_MATRIX":
+      return '科创部用户跳过'
     case "SELF_SELECT":
       return config.selfSelect.multiple ? '发起人自选多人' : '发起人自选一人'
     case "LEADER_TOP":