From 9783ca8506288ed54aff234a567c11493eb0fd27 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Fri, 19 Jul 2024 11:10:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=9B=9E=E8=BD=A6=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fvcomponents/fvSearchForm/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue
index 3bfba16..bd83ec6 100644
--- a/src/fvcomponents/fvSearchForm/index.vue
+++ b/src/fvcomponents/fvSearchForm/index.vue
@@ -23,6 +23,7 @@
                 v-bind="item.props || {}"
                 v-on="item.on || {}"
                 v-model="form[item.prop]"
+                @keyup.enter.native="getValues"
             >
             </component>
           </template>

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 2/3] =?UTF-8?q?feat=20:=20=E7=A7=91=E5=88=9B=E9=83=A8?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BF=87=E5=AE=A1=E6=89=B9=E8=8A=82?=
 =?UTF-8?q?=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":

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

---
 .../workflow/process/config/ApprovalNodeConfig.vue     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index db7ec03..475e30c 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -58,7 +58,8 @@
       </div>
       <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
         <el-form-item label="选择表单联系人项" prop="text" class="approve-end">
-          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser" placeholder="请选择包含联系人的表单项"
+          <el-select style="width: 80%;" size="small" v-model="nodeProps.formUser"
+                     placeholder="请选择包含联系人的表单项"
                      filterable clearable>
             <el-option v-for="(op,i) in forms" :label="op.title" :value="op.id" :key="i"></el-option>
           </el-select>
@@ -101,12 +102,13 @@
     <!--        <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>
+    <el-form-item label="科创部矩阵" prop="text">
+      <el-switch inactive-text="审批" active-text="跳过" v-if="nodeProps.assignedType === 'SELF'"
+                 v-model="nodeProps.dstiMatrix"></el-switch>
+    </el-form-item>
     <el-form-item v-if="nodeProps.matrixApproval && nodeProps.assignedType === 'SELF'" label="是否跳过自己" prop="text">
       <!--      {{nodeProps.skipSelf}}-->
       <el-switch inactive-text="不跳过" active-text="跳过" v-model="nodeProps.skipSelf"></el-switch>