From 93cf1e4dbecba086178dc9479864d5f3dea17658 Mon Sep 17 00:00:00 2001
From: Pancaihua <75729660@qq.com>
Date: Wed, 13 Nov 2024 22:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/formprocessmapping/index.ts       |  44 ++++
 .../FormProcessMappingForm.vue                | 124 ++++++++++
 src/views/bpm/formprocessmapping/index.vue    | 224 ++++++++++++++++++
 src/views/bpm/model/ModelForm.vue             |  11 +-
 src/views/bpm/model/ModelImportForm.vue       | 141 -----------
 src/views/bpm/model/index.vue                 | 138 +++++------
 6 files changed, 469 insertions(+), 213 deletions(-)
 create mode 100644 src/api/bpm/formprocessmapping/index.ts
 create mode 100644 src/views/bpm/formprocessmapping/FormProcessMappingForm.vue
 create mode 100644 src/views/bpm/formprocessmapping/index.vue
 delete mode 100644 src/views/bpm/model/ModelImportForm.vue

diff --git a/src/api/bpm/formprocessmapping/index.ts b/src/api/bpm/formprocessmapping/index.ts
new file mode 100644
index 0000000..3726b0c
--- /dev/null
+++ b/src/api/bpm/formprocessmapping/index.ts
@@ -0,0 +1,44 @@
+import request from '@/config/axios'
+
+// BPM 表单工作流对应 VO
+export interface FormProcessMappingVO {
+  id: number // 编号
+  name: string // 映射名
+  processKey: string // 流程信息
+  formCustomCreatePath: string // 表单的提交路径
+  formCustomViewPath: string // 表单的查看路径
+  status: number // 状态（0正常 1停用）
+}
+
+// BPM 表单工作流对应 API
+export const FormProcessMappingApi = {
+  // 查询BPM 表单工作流对应分页
+  getFormProcessMappingPage: async (params: any) => {
+    return await request.get({ url: `/bpm/form-process-mapping/page`, params })
+  },
+
+  // 查询BPM 表单工作流对应详情
+  getFormProcessMapping: async (id: number) => {
+    return await request.get({ url: `/bpm/form-process-mapping/get?id=` + id })
+  },
+
+  // 新增BPM 表单工作流对应
+  createFormProcessMapping: async (data: FormProcessMappingVO) => {
+    return await request.post({ url: `/bpm/form-process-mapping/create`, data })
+  },
+
+  // 修改BPM 表单工作流对应
+  updateFormProcessMapping: async (data: FormProcessMappingVO) => {
+    return await request.put({ url: `/bpm/form-process-mapping/update`, data })
+  },
+
+  // 删除BPM 表单工作流对应
+  deleteFormProcessMapping: async (id: number) => {
+    return await request.delete({ url: `/bpm/form-process-mapping/delete?id=` + id })
+  },
+
+  // 导出BPM 表单工作流对应 Excel
+  exportFormProcessMapping: async (params) => {
+    return await request.download({ url: `/bpm/form-process-mapping/export-excel`, params })
+  }
+}
diff --git a/src/views/bpm/formprocessmapping/FormProcessMappingForm.vue b/src/views/bpm/formprocessmapping/FormProcessMappingForm.vue
new file mode 100644
index 0000000..024c67e
--- /dev/null
+++ b/src/views/bpm/formprocessmapping/FormProcessMappingForm.vue
@@ -0,0 +1,124 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="映射名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入映射名" />
+      </el-form-item>
+      <el-form-item label="流程信息" prop="processKey">
+        <el-input v-model="formData.processKey" placeholder="请输入流程信息" />
+      </el-form-item>
+      <el-form-item label="表单的提交路径" prop="formCustomCreatePath">
+        <el-input v-model="formData.formCustomCreatePath" placeholder="请输入表单的提交路径" />
+      </el-form-item>
+      <el-form-item label="表单的查看路径" prop="formCustomViewPath">
+        <el-input v-model="formData.formCustomViewPath" placeholder="请输入表单的查看路径" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { FormProcessMappingApi, FormProcessMappingVO } from '@/api/bpm/formprocessmapping'
+
+/** BPM 表单工作流对应 表单 */
+defineOptions({ name: 'FormProcessMappingForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  processKey: undefined,
+  formCustomCreatePath: undefined,
+  formCustomViewPath: undefined,
+  status: 0
+})
+const formRules = reactive({
+  name: [{ required: true, message: '映射名不能为空', trigger: 'blur' }],
+  processKey: [{ required: true, message: '流程信息不能为空', trigger: 'blur' }],
+  formCustomCreatePath: [{ required: true, message: '表单的提交路径不能为空', trigger: 'blur' }],
+  formCustomViewPath: [{ required: true, message: '表单的查看路径不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await FormProcessMappingApi.getFormProcessMapping(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as FormProcessMappingVO
+    if (formType.value === 'create') {
+      await FormProcessMappingApi.createFormProcessMapping(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await FormProcessMappingApi.updateFormProcessMapping(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    processKey: undefined,
+    formCustomCreatePath: undefined,
+    formCustomViewPath: undefined,
+    status: 0
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/bpm/formprocessmapping/index.vue b/src/views/bpm/formprocessmapping/index.vue
new file mode 100644
index 0000000..da099c5
--- /dev/null
+++ b/src/views/bpm/formprocessmapping/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="映射名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入映射名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="流程信息" prop="processKey">
+        <el-input
+          v-model="queryParams.processKey"
+          placeholder="请输入流程信息"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createTime"-->
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--          type="daterange"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['bpm:form-process-mapping:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['bpm:form-process-mapping:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+<!--      <el-table-column label="编号" align="center" prop="id" />-->
+      <el-table-column label="映射名" align="center" prop="name" />
+      <el-table-column label="流程信息" align="center" prop="processKey" />
+      <el-table-column label="表单的提交路径" align="center" prop="formCustomCreatePath" />
+      <el-table-column label="表单的查看路径" align="center" prop="formCustomViewPath" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['bpm:form-process-mapping:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['bpm:form-process-mapping:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <FormProcessMappingForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { FormProcessMappingApi, FormProcessMappingVO } from '@/api/bpm/formprocessmapping'
+import FormProcessMappingForm from './FormProcessMappingForm.vue'
+
+/** BPM 表单工作流对应 列表 */
+defineOptions({ name: 'FormProcessMapping' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<FormProcessMappingVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  processKey: undefined,
+  formCustomCreatePath: undefined,
+  formCustomViewPath: undefined,
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await FormProcessMappingApi.getFormProcessMappingPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await FormProcessMappingApi.deleteFormProcessMapping(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await FormProcessMappingApi.exportFormProcessMapping(queryParams)
+    download.excel(data, 'BPM 表单工作流对应.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/bpm/model/ModelForm.vue b/src/views/bpm/model/ModelForm.vue
index ce60edc..7b7fa0a 100644
--- a/src/views/bpm/model/ModelForm.vue
+++ b/src/views/bpm/model/ModelForm.vue
@@ -35,7 +35,7 @@
           placeholder="请输入流程名称"
         />
       </el-form-item>
-      <el-form-item v-if="formData.id" label="流程分类" prop="category">
+      <el-form-item  label="流程分类" prop="category">
         <el-select
           v-model="formData.category"
           clearable
@@ -50,13 +50,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="formData.id" label="流程图标" prop="icon">
+      <el-form-item  label="流程图标" prop="icon">
         <UploadImg v-model="formData.icon" :limit="1" height="128px" width="128px" />
       </el-form-item>
       <el-form-item label="流程描述" prop="description">
         <el-input v-model="formData.description" clearable type="textarea" />
       </el-form-item>
-      <div v-if="formData.id">
+      <div>
         <el-form-item label="表单类型" prop="formType">
           <el-radio-group v-model="formData.formType">
             <el-radio
@@ -200,9 +200,8 @@ const submitForm = async () => {
       // 提示，引导用户做后续的操作
       await ElMessageBox.alert(
         '<strong>新建模型成功！</strong>后续需要执行如下 3 个步骤：' +
-          '<div>1. 点击【修改流程】按钮，配置流程的分类、表单信息</div>' +
-          '<div>2. 点击【设计流程】按钮，绘制流程图</div>' +
-          '<div>3. 点击【发布流程】按钮，完成流程的最终发布</div>' +
+          '<div>1. 点击【设计流程】按钮，绘制流程图</div>' +
+          '<div>2. 点击【发布流程】按钮，完成流程的最终发布</div>' +
           '另外，每次流程修改后，都需要点击【发布流程】按钮，才能正式生效！！！',
         '重要提示',
         {
diff --git a/src/views/bpm/model/ModelImportForm.vue b/src/views/bpm/model/ModelImportForm.vue
deleted file mode 100644
index 9a91e1d..0000000
--- a/src/views/bpm/model/ModelImportForm.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" title="导入流程" width="400">
-    <div>
-      <el-upload
-        ref="uploadRef"
-        v-model:file-list="fileList"
-        :action="importUrl"
-        :auto-upload="false"
-        :data="formData"
-        :disabled="formLoading"
-        :headers="uploadHeaders"
-        :limit="1"
-        :on-error="submitFormError"
-        :on-exceed="handleExceed"
-        :on-success="submitFormSuccess"
-        accept=".bpmn, .xml"
-        drag
-        name="bpmnFile"
-      >
-        <Icon class="el-icon--upload" icon="ep:upload-filled" />
-        <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
-        <template #tip>
-          <div class="el-upload__tip" style="color: red">
-            提示：仅允许导入“bpm”或“xml”格式文件！
-          </div>
-          <div>
-            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
-              <el-form-item label="流程标识" prop="key">
-                <el-input
-                  v-model="formData.key"
-                  placeholder="请输入流标标识"
-                  style="width: 250px"
-                />
-              </el-form-item>
-              <el-form-item label="流程名称" prop="name">
-                <el-input v-model="formData.name" clearable placeholder="请输入流程名称" />
-              </el-form-item>
-              <el-form-item label="流程描述" prop="description">
-                <el-input v-model="formData.description" clearable type="textarea" />
-              </el-form-item>
-            </el-form>
-          </div>
-        </template>
-      </el-upload>
-    </div>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script lang="ts" setup>
-import { getAccessToken, getTenantId } from '@/utils/auth'
-
-defineOptions({ name: 'ModelImportForm' })
-
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中
-const formData = ref({
-  key: '',
-  name: '',
-  description: ''
-})
-const formRules = reactive({
-  key: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
-  name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }]
-})
-const formRef = ref() // 表单 Ref
-const uploadRef = ref() // 上传 Ref
-const importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/bpm/model/import'
-const uploadHeaders = ref() // 上传 Header 头
-const fileList = ref([]) // 文件列表
-
-/** 打开弹窗 */
-const open = async () => {
-  dialogVisible.value = true
-  resetForm()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  if (fileList.value.length == 0) {
-    message.error('请上传文件')
-    return
-  }
-  // 提交请求
-  uploadHeaders.value = {
-    Authorization: 'Bearer ' + getAccessToken(),
-    'tenant-id': getTenantId()
-  }
-  formLoading.value = true
-  uploadRef.value!.submit()
-}
-
-/** 文件上传成功 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitFormSuccess = async (response: any) => {
-  if (response.code !== 0) {
-    message.error(response.msg)
-    formLoading.value = false
-    return
-  }
-  // 提示成功
-  message.success('导入流程成功！请点击【设计流程】按钮，进行编辑保存后，才可以进行【发布流程】')
-  dialogVisible.value = false
-  // 发送操作成功的事件
-  emit('success')
-}
-
-/** 上传错误提示 */
-const submitFormError = (): void => {
-  message.error('导入流程失败，请您重新上传！')
-  formLoading.value = false
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  // 重置上传状态和文件
-  formLoading.value = false
-  uploadRef.value?.clearFiles()
-  // 重置表单
-  formData.value = {
-    key: '',
-    name: '',
-    description: ''
-  }
-  formRef.value?.resetFields()
-}
-
-/** 文件数超出提示 */
-const handleExceed = (): void => {
-  message.error('最多只能上传一个文件！')
-}
-</script>
diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue
index 8f67d63..898e5b6 100644
--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -1,12 +1,4 @@
 <template>
-  <doc-alert title="流程设计器（BPMN）" url="https://doc.iocoder.cn/bpm/model-designer-dingding/" />
-  <doc-alert
-    title="流程设计器（钉钉、飞书）"
-    url="https://doc.iocoder.cn/bpm/model-designer-bpmn/"
-  />
-  <doc-alert title="选择审批人、发起人自选" url="https://doc.iocoder.cn/bpm/assignee/" />
-  <doc-alert title="会签、或签、依次审批" url="https://doc.iocoder.cn/bpm/multi-instance/" />
-
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
@@ -58,11 +50,9 @@
           @click="openForm('create')"
           v-hasPermi="['bpm:model:create']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新建流程
-        </el-button>
-        <el-button type="success" plain @click="openImportForm" v-hasPermi="['bpm:model:import']">
-          <Icon icon="ep:upload" class="mr-5px" /> 导入流程
+          <Icon icon="ep:plus" class="mr-5px" /> 新建
         </el-button>
+
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -112,36 +102,35 @@
         width="180"
         :formatter="dateFormatter"
       />
-      <el-table-column label="最新部署的流程定义" align="center">
-        <el-table-column
+      <el-table-column
           label="流程版本"
           align="center"
           prop="processDefinition.version"
           width="100"
-        >
-          <template #default="scope">
-            <el-tag v-if="scope.row.processDefinition">
-              v{{ scope.row.processDefinition.version }}
-            </el-tag>
-            <el-tag v-else type="warning">未部署</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
+      >
+        <template #default="scope">
+          <el-tag v-if="scope.row.processDefinition">
+            v{{ scope.row.processDefinition.version }}
+          </el-tag>
+          <el-tag v-else type="warning">未部署</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
           label="激活状态"
           align="center"
           prop="processDefinition.version"
           width="85"
-        >
-          <template #default="scope">
-            <el-switch
+      >
+        <template #default="scope">
+          <el-switch
               v-if="scope.row.processDefinition"
               v-model="scope.row.processDefinition.suspensionState"
               :active-value="1"
               :inactive-value="2"
               @change="handleChangeState(scope.row)"
-            />
+          />
           </template>
-        </el-table-column>
+      </el-table-column>
         <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180">
           <template #default="scope">
             <span v-if="scope.row.processDefinition">
@@ -149,7 +138,8 @@
             </span>
           </template>
         </el-table-column>
-      </el-table-column>
+<!--      </el-table-column>-->
+
       <el-table-column label="操作" align="center" width="240" fixed="right">
         <template #default="scope">
           <el-button
@@ -158,7 +148,7 @@
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['bpm:model:update']"
           >
-            修改流程
+            修改
           </el-button>
           <el-button
             link
@@ -166,40 +156,47 @@
             @click="handleDesign(scope.row)"
             v-hasPermi="['bpm:model:update']"
           >
-            设计流程
+            设计
           </el-button>
-<!--          <el-button-->
-<!--            link-->
-<!--            type="primary"-->
-<!--            @click="handleSimpleDesign(scope.row.id)"-->
-<!--            v-hasPermi="['bpm:model:update']"-->
-<!--          >-->
-<!--            仿钉钉设计流程-->
-<!--          </el-button>-->
           <el-button
             link
             type="primary"
             @click="handleDeploy(scope.row)"
             v-hasPermi="['bpm:model:deploy']"
           >
-            发布流程
+            发布
           </el-button>
-          <el-button
-            link
-            type="primary"
-            v-hasPermi="['bpm:process-definition:query']"
-            @click="handleDefinitionList(scope.row)"
+          <el-dropdown
+              class="!align-middle ml-5px"
+              @command="(command) => handleCommand(command, scope.row)"
+              v-hasPermi="['bpm:process-definition:query', 'bpm:model:update', 'bpm:model:delete']"
           >
-            流程定义
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['bpm:model:delete']"
-          >
-            删除
-          </el-button>
+            <el-button type="primary" link>更多</el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item
+                    command="handleDefinitionList"
+                    v-if="checkPermi(['bpm:process-definition:query'])"
+                >
+                  历史
+                </el-dropdown-item>
+
+                <el-dropdown-item
+                    command="handleChangeState"
+                    v-if="checkPermi(['bpm:model:update']) && scope.row.processDefinition"
+                >
+                  {{ scope.row.processDefinition.suspensionState === 1 ? '停用' : '启用' }}
+                </el-dropdown-item>
+                <el-dropdown-item
+                    type="danger"
+                    command="handleDelete"
+                    v-if="checkPermi(['bpm:model:delete'])"
+                >
+                  删除
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -215,8 +212,6 @@
   <!-- 表单弹窗：添加/修改流程 -->
   <ModelForm ref="formRef" @success="getList" />
 
-  <!-- 表单弹窗：导入流程 -->
-  <ModelImportForm ref="importFormRef" @success="getList" />
 
   <!-- 弹窗：表单详情 -->
   <Dialog title="表单详情" v-model="formDetailVisible" width="800">
@@ -241,9 +236,9 @@ import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
 import ModelForm from './ModelForm.vue'
-import ModelImportForm from '@/views/bpm/model/ModelImportForm.vue'
 import { setConfAndFields2 } from '@/utils/formCreate'
 import { CategoryApi } from '@/api/bpm/category'
+import {checkPermi} from "@/utils/permission";
 
 defineOptions({ name: 'BpmModel' })
 
@@ -276,6 +271,23 @@ const getList = async () => {
   }
 }
 
+
+/** '更多'操作按钮 */
+const handleCommand = (command: string, row: any) => {
+  switch (command) {
+    case 'handleDefinitionList':
+      handleDefinitionList(row)
+      break
+    case 'handleDelete':
+      handleDelete(row)
+      break
+    case 'handleChangeState':
+      handleChangeState(row)
+      break
+    default:
+      break
+  }
+}
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -294,25 +306,19 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-/** 添加/修改操作 */
-const importFormRef = ref()
-const openImportForm = () => {
-  importFormRef.value.open()
-}
 
 /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const handleDelete = async (row: any) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await ModelApi.deleteModel(id)
+    await ModelApi.deleteModel(row.id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
   } catch {}
 }
-
 /** 更新状态操作 */
 const handleChangeState = async (row) => {
   const state = row.processDefinition.suspensionState