From fea238ef154738ab2e08d6f5c043c85e17b4355d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 18 Jan 2025 19:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91Bpm=EF=BC=9A=E7=BC=96=E8=BE=91=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E2=80=9C=E8=B0=81=E5=8F=AF=E4=BB=A5=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E2=80=9D=E9=BB=98=E8=AE=A4=E5=B0=B1=E6=98=AF=E2=80=9C?=
 =?UTF-8?q?=E5=85=A8=E4=BD=93=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/model/form/BasicInfo.vue | 5 +++--
 src/views/bpm/model/form/index.vue     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/bpm/model/form/BasicInfo.vue b/src/views/bpm/model/form/BasicInfo.vue
index 591ccab1..cca91334 100644
--- a/src/views/bpm/model/form/BasicInfo.vue
+++ b/src/views/bpm/model/form/BasicInfo.vue
@@ -62,7 +62,7 @@
       <el-radio-group v-model="modelData.visible">
         <el-radio
           v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-          :key="dict.value"
+          :key="dict.value as string"
           :value="dict.value"
         >
           {{ dict.label }}
@@ -132,10 +132,11 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
 import { UserVO } from '@/api/system/user'
+import { CategoryVO } from '@/api/bpm/category'
 
 const props = defineProps({
   categoryList: {
-    type: Array,
+    type: Array as PropType<CategoryVO[]>,
     required: true
   },
   userList: {
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue
index 43e5c0a7..5c8d06d1 100644
--- a/src/views/bpm/model/form/index.vue
+++ b/src/views/bpm/model/form/index.vue
@@ -78,7 +78,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { useMessage } from '@/hooks/web/useMessage'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
-import { CategoryApi } from '@/api/bpm/category'
+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'
@@ -136,7 +136,6 @@ const formData: any = ref({
   formCustomViewPath: '',
   visible: true,
   startUserType: undefined,
-  managerUserType: undefined,
   startUserIds: [],
   managerUserIds: []
 })
@@ -149,7 +148,7 @@ provide('modelData', formData)
 
 // 数据列表
 const formList = ref([])
-const categoryList = ref([])
+const categoryList = ref<CategoryVO[]>([])
 const userList = ref<UserApi.UserVO[]>([])
 
 /** 初始化数据 */
@@ -158,6 +157,7 @@ const initData = async () => {
   if (modelId) {
     // 修改场景
     formData.value = await ModelApi.getModel(modelId)
+    formData.value.startUserType = formData.value.startUserIds?.length > 0 ? 1 : 0
     // 复制场景
     if (route.params.type === 'copy') {
       delete formData.value.id
@@ -166,6 +166,7 @@ const initData = async () => {
     }
   } else {
     // 新增场景
+    formData.value.startUserType = 0 // 全体
     formData.value.managerUserIds.push(userStore.getUser.id)
   }