From 0f58e968b1ce35d59bc94eeec4311f19e48953e9 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Tue, 21 Jan 2025 08:25:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20BPM-=E6=9B=B4=E5=A4=9A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE-=E8=87=AA=E5=8A=A8=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/constants.ts                     |  6 ++++++
 src/views/bpm/model/form/ExtraSettings.vue | 21 +++++++++++++++++++++
 src/views/bpm/model/form/index.vue         |  3 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 692a45fb..75bf765a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -457,3 +457,9 @@ export const BpmProcessInstanceStatus = {
   REJECT: 3, // 审批不通过
   CANCEL: 4 // 已取消
 }
+
+export const BpmAutoApproveType = {
+  NONE: 1, // 不自动通过
+  APPROVE_ALL: 2, // 仅审批一次，后续重复的审批节点均自动通过
+  APPROVE_SEQUENT: 3, // 仅针对连续审批的节点自动通过
+}
diff --git a/src/views/bpm/model/form/ExtraSettings.vue b/src/views/bpm/model/form/ExtraSettings.vue
index e512cffe..d2e6d2cc 100644
--- a/src/views/bpm/model/form/ExtraSettings.vue
+++ b/src/views/bpm/model/form/ExtraSettings.vue
@@ -58,11 +58,29 @@
         </div>
       </div>
     </el-form-item>
+    <el-form-item class="mb-20px">
+      <template #label>
+        <el-text size="large" tag="b">自动去重</el-text>
+      </template>
+      <div class="flex flex-col">
+        <div>
+          <el-text> 同一审批人在流程中重复出现时： </el-text>
+        </div>
+        <el-radio-group v-model="modelData.autoApprovalType">
+          <div class="flex flex-col">
+            <el-radio :value="1">不自动通过</el-radio>
+            <el-radio :value="2">仅审批一次，后续重复的审批节点均自动通过</el-radio>
+            <el-radio :value="3">仅针对连续审批的节点自动通过</el-radio>
+          </div>
+        </el-radio-group>
+      </div>
+    </el-form-item>
   </el-form>
 </template>
 
 <script setup lang="ts">
 import dayjs from 'dayjs'
+import { BpmAutoApproveType } from '@/utils/constants'
 
 const modelData = defineModel<any>()
 
@@ -130,6 +148,9 @@ const initData = () => {
       length: 5
     }
   }
+  if (!modelData.value.autoApprovalType) {
+    modelData.value.autoApprovalType = BpmAutoApproveType.NONE
+  }
 }
 defineExpose({ initData })
 </script>
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 4bc1cfc0..17953818 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -153,7 +153,8 @@ const formData: any = ref({
     infix: '',
     postfix: '',
     length: 5
-  }
+  },
+  autoApprovalType: 1
 })
 
 //流程数据

From 0215e8d4a8e1ef1f4022f9c27c7dbb4a1449c206 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Tue, 21 Jan 2025 08:27:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?BpmAutoApproveType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/form/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 17953818..84e74d89 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -86,7 +86,7 @@ import * as FormApi from '@/api/bpm/form'
 import { CategoryApi, CategoryVO } from '@/api/bpm/category'
 import * as UserApi from '@/api/system/user'
 import { useUserStoreWithOut } from '@/store/modules/user'
-import { BpmModelFormType, BpmModelType } from '@/utils/constants'
+import { BpmModelFormType, BpmModelType, BpmAutoApproveType } from '@/utils/constants'
 import BasicInfo from './BasicInfo.vue'
 import FormDesign from './FormDesign.vue'
 import ProcessDesign from './ProcessDesign.vue'
@@ -154,7 +154,7 @@ const formData: any = ref({
     postfix: '',
     length: 5
   },
-  autoApprovalType: 1
+  autoApprovalType: BpmAutoApproveType.NONE
 })
 
 //流程数据