diff --git a/yudao-ui-admin-vue3/src/api/bpm/model/index.ts b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts
index a2a0c7780..d47b30c10 100644
--- a/yudao-ui-admin-vue3/src/api/bpm/model/index.ts
+++ b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts
@@ -1,5 +1,28 @@
 import request from '@/config/axios'
-import { ModelVO } from './types'
+
+export type ProcessDefinitionVO = {
+  id: string
+  version: number
+  deploymentTIme: string
+  suspensionState: number
+}
+
+export type ModelVO = {
+  id: number
+  formName: string
+  key: string
+  name: string
+  description: string
+  category: string
+  formType: number
+  formId: number
+  formCustomCreatePath: string
+  formCustomViewPath: string
+  processDefinition: ProcessDefinitionVO
+  status: number
+  remark: string
+  createTime: string
+}
 
 export const getModelPageApi = async (params) => {
   return await request.get({ url: '/bpm/model/page', params })
diff --git a/yudao-ui-admin-vue3/src/api/bpm/model/types.ts b/yudao-ui-admin-vue3/src/api/bpm/model/types.ts
deleted file mode 100644
index 36f4aab1b..000000000
--- a/yudao-ui-admin-vue3/src/api/bpm/model/types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type ProcessDefinitionVO = {
-  id: string
-  version: number
-  deploymentTIme: string
-  suspensionState: number
-}
-
-export type ModelVO = {
-  id: number
-  formName: string
-  key: string
-  name: string
-  description: string
-  category: string
-  formType: number
-  formId: number
-  formCustomCreatePath: string
-  formCustomViewPath: string
-  processDefinition: ProcessDefinitionVO
-  status: number
-  remark: string
-  createTime: string
-}
diff --git a/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue b/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
index 7f32f6f4e..f70d52bfe 100644
--- a/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
+++ b/yudao-ui-admin-vue3/src/components/DictTag/src/DictTag.vue
@@ -33,6 +33,9 @@ export default defineComponent({
       if (!props.type) {
         return null
       }
+      if (!props.value) {
+        return null
+      }
       getDictObj(props.type, props.value.toString())
       return (
         <ElTag
diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
index d232846b1..1c836b119 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin-vue3/src/views/bpm/model/index.vue
@@ -1,214 +1,540 @@
-<script setup lang="ts" name="Model">
-import dayjs from 'dayjs'
-import { DICT_TYPE } from '@/utils/dict'
-import { useTable } from '@/hooks/web/useTable'
-import type { FormExpose } from '@/components/Form'
-import type { ModelVO } from '@/api/bpm/model/types'
-import { rules, allSchemas } from './model.data'
+<template>
+  <ContentWrap>
+    <!-- 列表 -->
+    <XTable @register="registerTable">
+      <template #toolbar_buttons>
+        <!-- 操作：新增 -->
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          title="新建流程"
+          v-hasPermi="['bpm:model:create']"
+          @click="handleCreate"
+        />
+        <!-- 操作：导入 -->
+        <XButton
+          type="warning"
+          preIcon="ep:upload"
+          :title="'导入流程'"
+          @click="handleImport"
+          style="margin-left: 10px"
+        />
+      </template>
+      <!-- 流程名称 -->
+      <template #name_default="{ row }">
+        <XTextButton :title="row.name" @click="handleBpmnDetail(row.id)" />
+      </template>
+      <!-- 表单信息 -->
+      <template #formId_default="{ row }">
+        <XTextButton
+          :title="forms.find((form) => form.id === row.formId)?.name || row.formId"
+          @click="handleFormDetail(row.id)"
+        />
+      </template>
+      <!-- 流程版本 -->
+      <template #version_default="{ row }">
+        <el-tag v-if="row.processDefinition">v{{ row.processDefinition.version }}</el-tag>
+        <el-tag type="warning" v-else>未部署</el-tag>
+      </template>
+      <!-- 激活状态 -->
+      <template #status_default="{ row }">
+        <el-switch
+          v-if="row.processDefinition"
+          v-model="row.processDefinition.suspensionState"
+          :active-value="1"
+          :inactive-value="2"
+          @change="handleChangeState(row)"
+        />
+      </template>
+      <!-- 操作 -->
+      <template #actionbtns_default="{ row }">
+        <XTextButton
+          preIcon="ep:edit"
+          title="修改流程"
+          v-hasPermi="['bpm:model:update']"
+          @click="handleUpdate(row.id)"
+        />
+        <XTextButton
+          preIcon="ep:setting"
+          title="设计流程"
+          v-hasPermi="['bpm:model:update']"
+          @click="handleDesign(row)"
+        />
+        <XTextButton
+          preIcon="ep:user"
+          title="分配规则"
+          v-hasPermi="['bpm:task-assign-rule:query']"
+          @click="handleAssignRule(row)"
+        />
+        <XTextButton
+          preIcon="ep:position"
+          title="发布流程"
+          v-hasPermi="['bpm:model:deploy']"
+          @click="handleDeploy(row)"
+        />
+        <XTextButton
+          preIcon="ep:aim"
+          title="流程定义"
+          v-hasPermi="['bpm:process-definition:query']"
+          @click="handleDefinitionList(row.id)"
+        />
+        <!-- 操作：删除 -->
+        <XTextButton
+          preIcon="ep:delete"
+          :title="t('action.del')"
+          v-hasPermi="['bpm:model:delete']"
+          @click="handleDelete(row.id)"
+        />
+      </template>
+    </XTable>
+
+    <!-- 对话框(添加 / 修改流程) -->
+    <XModal v-model="dialogVisible" :title="dialogTitle" width="600">
+      <el-form
+        :loading="dialogLoading"
+        el-form
+        ref="saveFormRef"
+        :model="saveForm"
+        :rules="rules"
+        label-width="110px"
+      >
+        <el-form-item label="流程标识" prop="key">
+          <el-input
+            v-model="saveForm.key"
+            placeholder="请输入流标标识"
+            style="width: 330px"
+            :disabled="!!saveForm.id"
+          />
+          <el-tooltip
+            v-if="!saveForm.id"
+            class="item"
+            effect="light"
+            content="新建后，流程标识不可修改！"
+            placement="top"
+          >
+            <i style="padding-left: 5px" class="el-icon-question"></i>
+          </el-tooltip>
+          <el-tooltip
+            v-else
+            class="item"
+            effect="light"
+            content="流程标识不可修改！"
+            placement="top"
+          >
+            <i style="padding-left: 5px" class="el-icon-question"></i>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item label="流程名称" prop="name">
+          <el-input
+            v-model="saveForm.name"
+            placeholder="请输入流程名称"
+            :disabled="!!saveForm.id"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item v-if="saveForm.id" label="流程分类" prop="category">
+          <el-select
+            v-model="saveForm.category"
+            placeholder="请选择流程分类"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in getDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="流程描述" prop="description">
+          <el-input type="textarea" v-model="saveForm.description" clearable />
+        </el-form-item>
+        <div v-if="saveForm.id">
+          <el-form-item label="表单类型" prop="formType">
+            <el-radio-group v-model="saveForm.formType">
+              <el-radio
+                v-for="dict in getDictOptions(DICT_TYPE.BPM_MODEL_FORM_TYPE)"
+                :key="parseInt(dict.value)"
+                :label="parseInt(dict.value)"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="saveForm.formType === 10" label="流程表单" prop="formId">
+            <el-select v-model="saveForm.formId" clearable style="width: 100%">
+              <el-option v-for="form in forms" :key="form.id" :label="form.name" :value="form.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="saveForm.formType === 20"
+            label="表单提交路由"
+            prop="formCustomCreatePath"
+          >
+            <el-input
+              v-model="saveForm.formCustomCreatePath"
+              placeholder="请输入表单提交路由"
+              style="width: 330px"
+            />
+            <el-tooltip
+              class="item"
+              effect="light"
+              content="自定义表单的提交路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/create"
+              placement="top"
+            >
+              <i style="padding-left: 5px" class="el-icon-question"></i>
+            </el-tooltip>
+          </el-form-item>
+          <el-form-item
+            v-if="saveForm.formType === 20"
+            label="表单查看路由"
+            prop="formCustomViewPath"
+          >
+            <el-input
+              v-model="saveForm.formCustomViewPath"
+              placeholder="请输入表单查看路由"
+              style="width: 330px"
+            />
+            <el-tooltip
+              class="item"
+              effect="light"
+              content="自定义表单的查看路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/view"
+              placement="top"
+            >
+              <i style="padding-left: 5px" class="el-icon-question"></i>
+            </el-tooltip>
+          </el-form-item>
+        </div>
+      </el-form>
+      <template #footer>
+        <!-- 按钮：保存 -->
+        <XButton
+          type="primary"
+          :loading="dialogLoading"
+          @click="submitForm()"
+          :title="t('action.save')"
+        />
+        <!-- 按钮：关闭 -->
+        <XButton
+          :loading="dialogLoading"
+          @click="dialogVisible = false"
+          :title="t('dialog.close')"
+        />
+      </template>
+    </XModal>
+
+    <!-- 导入流程 -->
+    <XModal v-model="importDialogVisible" width="400" title="导入流程">
+      <div>
+        <el-upload
+          ref="uploadRef"
+          :action="importUrl"
+          :headers="uploadHeaders"
+          :drag="true"
+          :limit="1"
+          :multiple="true"
+          :show-file-list="true"
+          :disabled="uploadDisabled"
+          :on-exceed="handleExceed"
+          :on-success="handleFileSuccess"
+          :on-error="excelUploadError"
+          :auto-upload="false"
+          accept=".bpmn, .xml"
+          name="bpmnFile"
+          :data="importForm"
+        >
+          <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+          <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="importFormRef"
+                :model="importForm"
+                :rules="rules"
+                label-width="120px"
+                status-icon
+              >
+                <el-form-item label="流程标识" prop="key">
+                  <el-input
+                    v-model="importForm.key"
+                    placeholder="请输入流标标识"
+                    style="width: 250px"
+                  />
+                </el-form-item>
+                <el-form-item label="流程名称" prop="name">
+                  <el-input v-model="importForm.name" placeholder="请输入流程名称" clearable />
+                </el-form-item>
+                <el-form-item label="流程描述" prop="description">
+                  <el-input type="textarea" v-model="importForm.description" clearable />
+                </el-form-item>
+              </el-form>
+            </div>
+          </template>
+        </el-upload>
+      </div>
+      <template #footer>
+        <!-- 按钮：保存 -->
+        <XButton
+          type="warning"
+          preIcon="ep:upload-filled"
+          :title="t('action.save')"
+          @click="submitFileForm"
+        />
+        <XButton title="取 消" @click="uploadClose" />
+      </template>
+    </XModal>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+// 全局相关的 import
+import { onMounted, ref, unref } from 'vue'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { FormInstance, UploadInstance } from 'element-plus'
+
+// 业务相关的 import
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import * as FormApi from '@/api/bpm/form'
 import * as ModelApi from '@/api/bpm/model'
+import { allSchemas, rules } from './model.data'
 
 const { t } = useI18n() // 国际化
-const message = useMessage()
+const message = useMessage() // 消息弹窗
+const router = useRouter() // 路由
 
 // ========== 列表相关 ==========
-const { register, tableObject, methods } = useTable<ModelVO>({
-  getListApi: ModelApi.getModelPageApi,
-  delListApi: ModelApi.deleteModelApi
+const [registerTable, { reload }] = useXTable({
+  allSchemas: allSchemas,
+  getListApi: ModelApi.getModelPageApi
 })
-const { getList, setSearchParams, delList } = methods
+const forms = ref() // 流程表单的下拉框的数据
 
-// ========== CRUD 相关 ==========
-const actionLoading = ref(false) // 遮罩层
-const actionType = ref('') // 操作按钮的类型
-const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('edit') // 弹出层标题
-const formRef = ref<FormExpose>() // 表单 Ref
-
-// 设置标题
-const setDialogTile = (type: string) => {
-  dialogTitle.value = t('action.' + type)
-  actionType.value = type
-  dialogVisible.value = true
-}
-
-// 新增操作
-const handleCreate = () => {
-  setDialogTile('create')
-}
-
-// 修改操作
-const handleUpdate = async (row: ModelVO) => {
-  setDialogTile('update')
-  // 设置数据
-  const res = await ModelApi.getModelApi(row.id)
-  unref(formRef)?.setValues(res)
-}
-
-// 提交按钮
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  if (!elForm) return
-  elForm.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      // 提交请求
-      try {
-        const data = unref(formRef)?.formModel as ModelVO
-        if (actionType.value === 'create') {
-          await ModelApi.createModelApi(data)
-          message.success(t('common.createSuccess'))
-        } else {
-          await ModelApi.updateModelApi(data)
-          message.success(t('common.updateSuccess'))
-        }
-        // 操作成功，重新加载列表
-        dialogVisible.value = false
-        await getList()
-      } finally {
-        actionLoading.value = false
-      }
+// 设计流程
+const handleDesign = (row) => {
+  console.log(row, '设计流程')
+  router.push({
+    name: 'modelEditor',
+    query: {
+      modelId: row.id
     }
   })
 }
 
-/** 流程表单的详情按钮操作 */
-const handleChangeState = async (row: ModelVO) => {
+// 跳转到指定流程定义列表
+const handleDefinitionList = (row) => {
+  router.push({
+    name: 'BpmProcessDefinitionList',
+    query: {
+      modelId: row.id
+    }
+  })
+}
+
+// 流程表单的详情按钮操作
+const handleFormDetail = (row) => {
+  // TODO 芋艿：表单组件开发中
+  console.log(row)
+  message.success('动态表单开发中，预计 2 月底完成')
+}
+
+// 流程图的详情按钮操作
+const handleBpmnDetail = (row) => {
+  // TODO 芋艿：流程组件开发中
+  console.log(row)
+  message.success('流程组件开发中，预计 2 月底完成')
+}
+
+// 点击任务分配按钮
+const handleAssignRule = (row) => {
+  router.push({
+    name: 'BpmTaskAssignRuleList',
+    query: {
+      modelId: row.id
+    }
+  })
+}
+
+// ========== 新建/修改流程 ==========
+const dialogVisible = ref(false)
+const dialogTitle = ref('新建模型')
+const dialogLoading = ref(false)
+const saveForm = ref({})
+const saveFormRef = ref<FormInstance>()
+
+// 设置标题
+const setDialogTile = async (type: string) => {
+  dialogTitle.value = t('action.' + type)
+  dialogVisible.value = true
+}
+
+// 新增操作
+const handleCreate = async () => {
+  resetForm()
+  await setDialogTile('create')
+}
+
+// 修改操作
+const handleUpdate = async (rowId: number) => {
+  resetForm()
+  await setDialogTile('create')
+  // 设置数据
+  saveForm.value = await ModelApi.getModelApi(rowId)
+}
+
+// 提交按钮
+const submitForm = async () => {
+  // 参数校验
+  const elForm = unref(saveFormRef)
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+
+  // 提交请求
+  dialogLoading.value = true
+  try {
+    const data = saveForm.value as ModelApi.ModelVO
+    if (!data.id) {
+      await ModelApi.createModelApi(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ModelApi.updateModelApi(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+  } finally {
+    // 刷新列表
+    await reload()
+    dialogLoading.value = false
+  }
+}
+
+// 重置表单
+const resetForm = () => {
+  saveForm.value = {
+    formType: 10,
+    name: '',
+    courseSort: '',
+    description: '',
+    formId: '',
+    formCustomCreatePath: '',
+    formCustomViewPath: ''
+  }
+  saveFormRef.value?.resetFields()
+}
+
+// ========== 删除 / 更新状态 / 发布流程 ==========
+// 删除流程
+const handleDelete = (rowId) => {
+  message.delConfirm('是否删除该流程！！').then(async () => {
+    await ModelApi.deleteModelApi(rowId)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    reload()
+  })
+}
+
+// 更新状态操作
+const handleChangeState = (row) => {
+  const id = row.id
   const state = row.processDefinition.suspensionState
   const statusState = state === 1 ? '激活' : '挂起'
+  const content = '是否确认' + statusState + '流程名字为"' + row.name + '"的数据项?'
   message
-    .confirm(
-      '是否确认' + statusState + '流程名字为"' + row.name + '"的数据项?',
-      t('common.reminder')
-    )
+    .confirm(content)
     .then(async () => {
-      ModelApi.updateModelStateApi(row.id, state).then(() => {
-        message.success(t('common.updateSuccess'))
-        getList()
-      })
+      await ModelApi.updateModelStateApi(id, state)
+      message.success(t('部署成功'))
+      // 刷新列表
+      reload()
+    })
+    .catch(() => {
+      // 取消后，进行恢复按钮
+      row.processDefinition.suspensionState = state === 1 ? 2 : 1
     })
-    .catch(() => {})
 }
-// ========== 详情相关 ==========
-const detailData = ref() // 详情 Ref
 
-// 详情操作
-const handleDetail = async (row: ModelVO) => {
-  // 设置数据
-  detailData.value = row
-  setDialogTile('detail')
+// 发布流程
+const handleDeploy = (row) => {
+  message.confirm('是否部署该流程！！').then(async () => {
+    await ModelApi.deployModelApi(row.id)
+    message.success(t('部署成功'))
+    // 刷新列表
+    reload()
+  })
+}
+
+// ========== 导入流程 ==========
+const uploadRef = ref<UploadInstance>()
+let importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/bpm/model/import'
+const uploadHeaders = ref()
+const importDialogVisible = ref(false)
+const uploadDisabled = ref(false)
+const importFormRef = ref<FormInstance>()
+const importForm = ref({
+  key: '',
+  name: '',
+  description: ''
+})
+
+// 导入流程弹窗显示
+const handleImport = () => {
+  importDialogVisible.value = true
+}
+// 文件数超出提示
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+// 上传错误提示
+const excelUploadError = (): void => {
+  message.error('导入流程失败，请您重新上传！')
+}
+
+// 提交文件上传
+const submitFileForm = () => {
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  uploadDisabled.value = true
+  uploadRef.value!.submit()
+}
+// 文件上传成功
+const handleFileSuccess = async (response: any): Promise<void> => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    return
+  }
+  // 重置表单
+  uploadClose()
+  // 提示，并刷新
+  message.success('导入流程成功！请点击【设计流程】按钮，进行编辑保存后，才可以进行【发布流程】')
+  await reload()
+}
+// 关闭文件上传
+const uploadClose = () => {
+  // 关闭弹窗
+  importDialogVisible.value = false
+  // 重置上传状态和文件
+  uploadDisabled.value = false
+  uploadRef.value!.clearFiles()
+  // 重置表单
+  importForm.value = {
+    key: '',
+    name: '',
+    description: ''
+  }
+  importFormRef.value?.resetFields()
 }
 
 // ========== 初始化 ==========
-getList()
+onMounted(() => {
+  // 获得流程表单的下拉框的数据
+  FormApi.getSimpleFormsApi().then((data) => {
+    forms.value = data
+  })
+})
 </script>
-
-<template>
-  <!-- 搜索工作区 -->
-  <ContentWrap>
-    <Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-  <ContentWrap>
-    <!-- 操作工具栏 -->
-    <div class="mb-10px">
-      <el-button type="primary" v-hasPermi="['bpm:model:create']" @click="handleCreate()">
-        <Icon icon="ep:zoom-in" class="mr-5px" /> {{ t('action.add') }}
-      </el-button>
-    </div>
-    <!-- 列表 -->
-    <Table
-      :columns="allSchemas.tableColumns"
-      :selection="false"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
-        total: tableObject.total
-      }"
-      v-model:pageSize="tableObject.pageSize"
-      v-model:currentPage="tableObject.currentPage"
-      @register="register"
-    >
-      <template #category="{ row }">
-        <DictTag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="row.category" />
-      </template>
-      <template #formId="{ row }">
-        <span>{{ row.formName }}</span>
-      </template>
-      <template #processDefinition>
-        <el-table-column label="流程版本" prop="processDefinition.version">
-          <template #default="{ row }">
-            <el-tag v-if="row.processDefinition">
-              {{ 'v' + row.processDefinition.version }}
-            </el-tag>
-            <el-tag type="warning" v-else>未部署</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="激活状态" prop="processDefinition.suspensionState">
-          <template #default="{ row }">
-            <el-switch
-              v-if="row.processDefinition"
-              v-model="row.processDefinition.suspensionState"
-              :active-value="1"
-              :inactive-value="2"
-              @change="handleChangeState(row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="部署时间" prop="processDefinition.deploymentTime">
-          <template #default="{ row }">
-            <span>
-              {{ dayjs(row.processDefinition.deploymentTime).format('YYYY-MM-DD HH:mm:ss') }}
-            </span>
-          </template>
-        </el-table-column>
-      </template>
-      <template #createTime="{ row }">
-        <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
-      </template>
-      <template #action="{ row }">
-        <el-button link type="primary" v-hasPermi="['bpm:model:update']" @click="handleUpdate(row)">
-          <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
-        </el-button>
-        <el-button link type="primary" v-hasPermi="['bpm:model:update']" @click="handleDetail(row)">
-          <Icon icon="ep:view" class="mr-1px" /> {{ t('action.detail') }}
-        </el-button>
-        <el-button
-          link
-          type="primary"
-          v-hasPermi="['bpm:model:delete']"
-          @click="delList(row.id, false)"
-        >
-          <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
-        </el-button>
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <XModal v-model="dialogVisible" :title="dialogTitle">
-    <!-- 对话框(添加 / 修改) -->
-    <Form
-      v-if="['create', 'update'].includes(actionType)"
-      :schema="allSchemas.formSchema"
-      :rules="rules"
-      ref="formRef"
-    />
-    <!-- 对话框(详情) -->
-    <Descriptions
-      v-if="actionType === 'detail'"
-      :schema="allSchemas.detailSchema"
-      :data="detailData"
-    />
-    <!-- 操作按钮 -->
-    <template #footer>
-      <!-- 按钮：保存 -->
-      <XButton
-        v-if="['create', 'update'].includes(actionType)"
-        type="primary"
-        :title="t('action.save')"
-        :loading="actionLoading"
-        @click="submitForm()"
-      />
-      <!-- 按钮：关闭 -->
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
-    </template>
-  </XModal>
-</template>
diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts b/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts
index ac813738d..e3d013380 100644
--- a/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts
+++ b/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts
@@ -1,78 +1,105 @@
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
+import { reactive } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { required } from '@/utils/formRules'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+
+import { DICT_TYPE } from '@/utils/dict'
 const { t } = useI18n() // 国际化
 
 // 表单校验
 export const rules = reactive({
-  name: [required]
+  key: [required],
+  name: [required],
+  category: [required],
+  formType: [required],
+  formId: [required],
+  formCustomCreatePath: [required],
+  formCustomViewPath: [required]
 })
 
 // CrudSchema
-const crudSchemas = reactive<CrudSchema[]>([
-  {
-    label: t('common.index'),
-    field: 'id',
-    type: 'index',
-    form: {
-      show: false
+const crudSchemas = reactive<VxeCrudSchema>({
+  primaryKey: 'key',
+  primaryType: null,
+  action: true,
+  actionWidth: '540px',
+  columns: [
+    {
+      title: '流程标识',
+      field: 'key',
+      isSearch: true,
+      table: {
+        width: 120
+      }
     },
-    detail: {
-      show: false
-    }
-  },
-  {
-    label: '流程标识',
-    field: 'key',
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '流程名称',
-    field: 'name',
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '流程分类',
-    field: 'category',
-    dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
-    dictClass: 'number',
-    search: {
-      show: true
-    }
-  },
-  {
-    label: '表单信息',
-    field: 'formId'
-  },
-  {
-    label: '最新部署的流程定义',
-    field: 'processDefinition',
-    form: {
-      show: false
+    {
+      title: '流程名称',
+      field: 'name',
+      isSearch: true,
+      table: {
+        width: 120,
+        slots: {
+          default: 'name_default'
+        }
+      }
     },
-    detail: {
-      show: false
-    }
-  },
-  {
-    label: t('common.createTime'),
-    field: 'createTime',
-    form: {
-      show: false
-    }
-  },
-  {
-    label: t('table.action'),
-    field: 'action',
-    width: '240px',
-    form: {
-      show: false
+    {
+      title: '流程分类',
+      field: 'category',
+      dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
+      dictClass: 'number',
+      isSearch: true
     },
-    detail: {
-      show: false
+    {
+      title: '表单信息',
+      field: 'formId',
+      table: {
+        width: 120,
+        slots: {
+          default: 'formId_default'
+        }
+      }
+    },
+    {
+      title: '最新部署的流程定义',
+      field: 'processDefinition',
+      isForm: false,
+      table: {
+        children: [
+          {
+            title: '流程版本',
+            field: 'version',
+            slots: {
+              default: 'version_default'
+            },
+            width: 80
+          },
+          {
+            title: '激活状态',
+            field: 'status',
+            slots: {
+              default: 'status_default'
+            },
+            width: 80
+          },
+          {
+            title: '部署时间',
+            field: 'processDefinition.deploymentTime',
+            formatter: 'formatDate',
+            width: 180
+          }
+        ]
+      }
+    },
+    {
+      title: t('common.createTime'),
+      field: 'createTime',
+      isForm: false,
+      formatter: 'formatDate',
+      table: {
+        width: 180
+      }
     }
-  }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)