From 221918bba28d2384d03c596a68256d7832e4a0e0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 06 一月 2025 13:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/bpm/model/CategoryDraggableModel.vue | 50 ++++++++++++--------------------------------------
1 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 7bd58d7..f3b5a42 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -64,6 +64,7 @@
</div>
</div>
</div>
+
<!-- 模型列表 -->
<el-collapse-transition>
<div v-show="isExpand">
@@ -90,7 +91,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="可见范围" prop="startUserIds" min-width="100">
+ <el-table-column label="可见范围" prop="startUserIds" min-width="150">
<template #default="scope">
<el-text v-if="!scope.row.startUsers || scope.row.startUsers.length === 0">
全部可见
@@ -110,7 +111,7 @@
</el-text>
</template>
</el-table-column>
- <el-table-column label="表单信息" prop="formType" min-width="200">
+ <el-table-column label="表单信息" prop="formType" min-width="150">
<template #default="scope">
<el-button
v-if="scope.row.formType === BpmModelFormType.NORMAL"
@@ -161,16 +162,6 @@
:disabled="!isManagerUser(scope.row)"
>
修改
- </el-button>
- <el-button
- link
- class="!ml-5px"
- type="primary"
- @click="handleDesign(scope.row)"
- v-hasPermi="['bpm:model:update']"
- :disabled="!isManagerUser(scope.row)"
- >
- 设计
</el-button>
<el-button
link
@@ -236,11 +227,6 @@
</template>
</Dialog>
- <!-- 弹窗：表单详情 -->
- <Dialog title="表单详情" v-model="formDetailVisible" width="800">
- <form-create :rule="formDetailPreview.rule" :option="formDetailPreview.option" />
- </Dialog>
-
<!-- 表单弹窗：添加流程模型 -->
<ModelForm :categoryId="categoryInfo.code" ref="modelFormRef" @success="emit('success')" />
</template>
@@ -254,7 +240,7 @@
import * as ModelApi from '@/api/bpm/model'
import * as FormApi from '@/api/bpm/form'
import { setConfAndFields2 } from '@/utils/formCreate'
-import { BpmModelFormType, BpmModelType } from '@/utils/constants'
+import { BpmModelFormType } from '@/utils/constants'
import { checkPermi } from '@/utils/permission'
import { useUserStoreWithOut } from '@/store/modules/user'
import { useAppStore } from '@/store/modules/app'
@@ -340,25 +326,6 @@
// 刷新列表
emit('success')
} catch {}
-}
-
-/** 设计流程 */
-const handleDesign = (row: any) => {
- if (row.type == BpmModelType.BPMN) {
- push({
- name: 'BpmModelEditor',
- query: {
- modelId: row.id
- }
- })
- } else {
- push({
- name: 'SimpleModelDesign',
- query: {
- modelId: row.id
- }
- })
- }
}
/** 发布流程 */
@@ -501,7 +468,14 @@
/** 添加流程模型弹窗 */
const modelFormRef = ref()
const openModelForm = (type: string, id?: number) => {
- modelFormRef.value.open(type, id)
+ if (type === 'create') {
+ push({ name: 'BpmModelCreate' })
+ } else {
+ push({
+ name: 'BpmModelUpdate',
+ params: { id }
+ })
+ }
}
watch(() => props.categoryInfo.modelList, updateModeList, { immediate: true })
--
Gitblit v1.9.3