Skip to content

Commit fea238e

Browse files
committed
【代码优化】Bpm:编辑流程时,“谁可以发起”默认就是“全体”
1 parent 7349a0d commit fea238e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/views/bpm/model/form/BasicInfo.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<el-radio-group v-model="modelData.visible">
6363
<el-radio
6464
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
65-
:key="dict.value"
65+
:key="dict.value as string"
6666
:value="dict.value"
6767
>
6868
{{ dict.label }}
@@ -132,10 +132,11 @@
132132
<script lang="ts" setup>
133133
import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
134134
import { UserVO } from '@/api/system/user'
135+
import { CategoryVO } from '@/api/bpm/category'
135136
136137
const props = defineProps({
137138
categoryList: {
138-
type: Array,
139+
type: Array as PropType<CategoryVO[]>,
139140
required: true
140141
},
141142
userList: {

src/views/bpm/model/form/index.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import { useRoute, useRouter } from 'vue-router'
7878
import { useMessage } from '@/hooks/web/useMessage'
7979
import * as ModelApi from '@/api/bpm/model'
8080
import * as FormApi from '@/api/bpm/form'
81-
import { CategoryApi } from '@/api/bpm/category'
81+
import { CategoryApi, CategoryVO } from '@/api/bpm/category'
8282
import * as UserApi from '@/api/system/user'
8383
import { useUserStoreWithOut } from '@/store/modules/user'
8484
import { BpmModelFormType, BpmModelType } from '@/utils/constants'
@@ -136,7 +136,6 @@ const formData: any = ref({
136136
formCustomViewPath: '',
137137
visible: true,
138138
startUserType: undefined,
139-
managerUserType: undefined,
140139
startUserIds: [],
141140
managerUserIds: []
142141
})
@@ -149,7 +148,7 @@ provide('modelData', formData)
149148
150149
// 数据列表
151150
const formList = ref([])
152-
const categoryList = ref([])
151+
const categoryList = ref<CategoryVO[]>([])
153152
const userList = ref<UserApi.UserVO[]>([])
154153
155154
/** 初始化数据 */
@@ -158,6 +157,7 @@ const initData = async () => {
158157
if (modelId) {
159158
// 修改场景
160159
formData.value = await ModelApi.getModel(modelId)
160+
formData.value.startUserType = formData.value.startUserIds?.length > 0 ? 1 : 0
161161
// 复制场景
162162
if (route.params.type === 'copy') {
163163
delete formData.value.id
@@ -166,6 +166,7 @@ const initData = async () => {
166166
}
167167
} else {
168168
// 新增场景
169+
formData.value.startUserType = 0 // 全体
169170
formData.value.managerUserIds.push(userStore.getUser.id)
170171
}
171172

0 commit comments

Comments
 (0)