From c49e8bd3f9466c4001118684eed05f7d3bdd8f57 Mon Sep 17 00:00:00 2001 From: GoldenZqqq <1361001127@qq.com> Date: Wed, 9 Oct 2024 10:03:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8UI=E9=87=8D=E6=9E=84=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=95=B0=E7=BB=84=E5=88=86=E7=B1=BB=E5=88=86=E7=BB=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/model/index.vue | 403 ++++++++++++++-------------- src/views/bpm/model/index_new.vue | 432 ++++++++++++++++++++++++++++++ src/views/bpm/model/index_old.vue | 404 ---------------------------- src/views/bpm/model/mock.js | 202 -------------- 4 files changed, 638 insertions(+), 803 deletions(-) create mode 100644 src/views/bpm/model/index_new.vue delete mode 100644 src/views/bpm/model/index_old.vue delete mode 100644 src/views/bpm/model/mock.js diff --git a/src/views/bpm/model/index.vue b/src/views/bpm/model/index.vue index 1b0677ac..4534ec61 100644 --- a/src/views/bpm/model/index.vue +++ b/src/views/bpm/model/index.vue @@ -1,192 +1,211 @@ + + + + + - - 表单管理 - - - - + + + + + + + + + + + + + + 搜索 + 重置 + + 新建 + + + + + + + + + + + + + + + + + + 全部可见 + + + {{ scope.row.startUsers[0].nickname }} + + + + {{ scope.row.startUsers[0].nickname }}等 {{ scope.row.startUsers.length }} 人可见 + + + + + + + + - - - - - - - - 新建流程 + {{ scope.row.formName }} - - - - - + + {{ scope.row.formCustomCreatePath }} - - - - - - - - - - - {{ title }} - ({{ list?.length || 0 }}) - - - - - - - {{ scope.row.name }} - - - - - - - 全部可见 - - - {{ scope.row.startUsers[0].nickname }} - - - 暂无表单 + + + + + + {{ formatDate(scope.row.processDefinition.deploymentTime) }} + + + v{{ scope.row.processDefinition.version }} + + 未部署 + + 已停用 + + + + + + + 修改 + + + 设计 + + + 发布 + + handleCommand(command, scope.row)" + v-hasPermi="['bpm:process-definition:query', 'bpm:model:update', 'bpm:model:delete']" + > + 更多 + + + - {{ scope.row.startUsers[0].nickname }}等 {{ scope.row.startUsers.length }} 人可见 - - + 历史 + + + {{ scope.row.processDefinition.suspensionState === 1 ? '停用' : '启用' }} + + + 删除 + + - - - - - - {{ scope.row.formName }} - - - {{ scope.row.formCustomCreatePath }} - - 暂无表单 - - - - - - {{ formatDate(scope.row.processDefinition.deploymentTime) }} - - - v{{ scope.row.processDefinition.version }} - - 未部署 - - 已停用 - - - - - - - 修改 - - - 设计 - - - 发布 - - handleCommand(command, scope.row)" - v-hasPermi="[ - 'bpm:process-definition:query', - 'bpm:model:update', - 'bpm:model:delete' - ]" - > - 更多 - - - - 历史 - - - {{ scope.row.processDefinition.suspensionState === 1 ? '停用' : '启用' }} - - - 删除 - - - - - - - - - + + + + + + @@ -208,8 +227,6 @@ import { CategoryApi } from '@/api/bpm/category' import { BpmModelType } from '@/utils/constants' import { checkPermi } from '@/utils/permission' import { useUserStoreWithOut } from '@/store/modules/user' -import { groupBy } from 'lodash-es' -import { mockData } from './mock' defineOptions({ name: 'BpmModel' }) @@ -217,7 +234,10 @@ const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const { push } = useRouter() // 路由 const userStore = useUserStoreWithOut() // 用户信息缓存 + const loading = ref(true) // 列表的加载中 +const total = ref(0) // 列表的总页数 +const list = ref([]) // 列表的数据 const queryParams = reactive({ pageNo: 1, pageSize: 10, @@ -227,16 +247,14 @@ const queryParams = reactive({ }) const queryFormRef = ref() // 搜索的表单 const categoryList = ref([]) // 流程分类列表 -const categoryGroup = ref({}) // 按照category分组的数据 /** 查询列表 */ const getList = async () => { loading.value = true try { - // TODO 芋艿:这里需要一个不分页查全部的流程模型接口 const data = await ModelApi.getModelPage(queryParams) - data.list = mockData - categoryGroup.value = groupBy(data.list, 'categoryName') + list.value = data.list + total.value = data.total } finally { loading.value = false } @@ -384,12 +402,3 @@ onMounted(async () => { categoryList.value = await CategoryApi.getCategorySimpleList() }) - - diff --git a/src/views/bpm/model/index_new.vue b/src/views/bpm/model/index_new.vue new file mode 100644 index 00000000..91e30dce --- /dev/null +++ b/src/views/bpm/model/index_new.vue @@ -0,0 +1,432 @@ + + + + 表单管理 + + + + + + + + + + + + 新建流程 + + + + + + + + + + + + + 新建分组 + + + + 分组排序 + + + + + + + + + + + + + + + + + + + + + + + + {{ title }} + + ({{ list?.length || 0 }}) + + + + + + + + + + {{ scope.row.name }} + + + + + + + 全部可见 + + + {{ scope.row.startUsers[0].nickname }} + + + + {{ scope.row.startUsers[0].nickname }}等 + {{ scope.row.startUsers.length }} 人可见 + + + + + + + + {{ scope.row.formName }} + + + {{ scope.row.formCustomCreatePath }} + + 暂无表单 + + + + + + {{ formatDate(scope.row.processDefinition.deploymentTime) }} + + + v{{ scope.row.processDefinition.version }} + + 未部署 + + 已停用 + + + + + + + 修改 + + + 设计 + + + 发布 + + handleCommand(command, scope.row)" + v-hasPermi="[ + 'bpm:process-definition:query', + 'bpm:model:update', + 'bpm:model:delete' + ]" + > + 更多 + + + + 历史 + + + {{ scope.row.processDefinition.suspensionState === 1 ? '停用' : '启用' }} + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/bpm/model/index_old.vue b/src/views/bpm/model/index_old.vue deleted file mode 100644 index 4534ec61..00000000 --- a/src/views/bpm/model/index_old.vue +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - 新建 - - - - - - - - - - - - - - - - - - 全部可见 - - - {{ scope.row.startUsers[0].nickname }} - - - - {{ scope.row.startUsers[0].nickname }}等 {{ scope.row.startUsers.length }} 人可见 - - - - - - - - - {{ scope.row.formName }} - - - {{ scope.row.formCustomCreatePath }} - - 暂无表单 - - - - - - {{ formatDate(scope.row.processDefinition.deploymentTime) }} - - - v{{ scope.row.processDefinition.version }} - - 未部署 - - 已停用 - - - - - - - 修改 - - - 设计 - - - 发布 - - handleCommand(command, scope.row)" - v-hasPermi="['bpm:process-definition:query', 'bpm:model:update', 'bpm:model:delete']" - > - 更多 - - - - 历史 - - - {{ scope.row.processDefinition.suspensionState === 1 ? '停用' : '启用' }} - - - 删除 - - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/bpm/model/mock.js b/src/views/bpm/model/mock.js deleted file mode 100644 index 93c4b60b..00000000 --- a/src/views/bpm/model/mock.js +++ /dev/null @@ -1,202 +0,0 @@ -export const mockData = [ - { - key: 'out_apply', - name: '外出申请', - description: null, - category: '1', - categoryName: '测试1', - formType: 20, - formId: null, - formCustomCreatePath: '/OA/goingOut/create', - formCustomViewPath: '/OA/goingOut/detail', - id: 'ff8f8bab-4d4e-11ef-8201-0242ac130002', - formName: null, - createTime: 1722218716216, - processDefinition: { - id: 'out_apply:4:7f56d464-4eec-11ef-8c3a-0242ac130002', - version: 4, - deploymentTime: 1722396312641, - suspensionState: 1 - } - }, - { - key: 'contract_change_history', - name: '合同变更申请', - description: null, - category: '2', - categoryName: '测试2', - formType: 20, - formId: null, - formCustomCreatePath: '/project/changeRecord/detail', - formCustomViewPath: '/project/changeRecord/detail', - id: '0c689067-3a92-11ef-b7f0-0242ac130002', - formName: null, - createTime: 1720158441959, - processDefinition: { - id: 'contract_change_history:1:f69fff4f-3a9a-11ef-b7f0-0242ac130002', - version: 1, - deploymentTime: 1720162270788, - suspensionState: 1 - } - }, - { - key: 'expenses_claim', - name: '费用报销申请', - description: null, - category: '1', - categoryName: '测试1', - formType: 20, - formId: null, - formCustomCreatePath: '/finance/reimbursement/detail', - formCustomViewPath: '/finance/reimbursement/detail', - id: '0310ad0c-351e-11ef-a653-0242ac130002', - formName: null, - createTime: 1719558848849, - processDefinition: { - id: 'expenses_claim:5:a043a1d8-4eec-11ef-8c3a-0242ac130002', - version: 5, - deploymentTime: 1722396367911, - suspensionState: 1 - } - }, - { - key: 'out_business_apply', - name: '申请单', - description: null, - category: '2', - categoryName: '测试2', - formType: 20, - formId: null, - formCustomCreatePath: '/finance/businessTripApply/detail', - formCustomViewPath: '/finance/businessTripApply/detail', - id: '279e27a4-3393-11ef-8401-0242ac130002', - formName: null, - createTime: 1719389258966, - processDefinition: { - id: 'out_business_apply:9:a7b2d4e2-430f-11ef-876f-0242ac130002', - version: 9, - deploymentTime: 1721091998780, - suspensionState: 1 - } - }, - { - key: 'pms_project_delay_application', - name: '项目延时申请', - description: null, - category: '2', - categoryName: '测试2', - formType: 20, - formId: null, - formCustomCreatePath: '/project/workHourDelay/create', - formCustomViewPath: '/project/workHourDelay/detail', - id: '46d87275-27c7-11ef-b258-0242ac130002', - formName: null, - createTime: 1718092231234, - processDefinition: { - id: 'b7ed308a-430f-11ef-876f-0242ac130002', - version: 5, - deploymentTime: 1721092026059, - suspensionState: 1 - } - }, - { - key: 'pms_project_result_approval', - name: '项目成果审核', - description: null, - category: '2', - categoryName: '测试2', - formType: 20, - formId: null, - formCustomCreatePath: '/project/projectTaskResult/detail', - formCustomViewPath: '/project/projectTaskResult/detail', - id: '4a15d4f8-23cc-11ef-8dd0-0242ac130002', - formName: null, - createTime: 1717654579502, - processDefinition: { - id: 'dd3cc360-4eec-11ef-8c3a-0242ac130002', - version: 6, - deploymentTime: 1722396470232, - suspensionState: 1 - } - }, - { - key: 'pms_contract', - name: '合同管理', - description: null, - category: '2', - categoryName: '测试2', - formType: 20, - formId: null, - formCustomCreatePath: '/sales/contract/create', - formCustomViewPath: '/sales/contract/detail', - id: '8317cb71-0d1a-11ef-8445-70b5e844a623', - formName: null, - createTime: 1715159299146, - processDefinition: { - id: 'pms_contract:5:c7d6012a-29f2-11ef-a08d-0242ac130002', - version: 5, - deploymentTime: 1718330818270, - suspensionState: 1 - } - }, - { - key: 'pms_consult_task_act', - name: '咨询任务书', - description: null, - category: '1', - categoryName: '测试1', - formType: 20, - formId: null, - formCustomCreatePath: '/consultTask/create', - formCustomViewPath: '/consultTask/detail', - id: '47fad8e4-0b91-11ef-b841-70b5e844a623', - formName: null, - createTime: 1714990407756, - processDefinition: { - id: 'pms_consult_task_act:1:67c2ae59-0b91-11ef-b841-70b5e844a623', - version: 1, - deploymentTime: 1714990460960, - suspensionState: 1 - } - }, - { - key: 'pms_project', - name: '立项管理', - description: null, - category: '1', - categoryName: '测试1', - formType: 20, - formId: null, - formCustomCreatePath: '/project/applyProject/create', - formCustomViewPath: '/project/applyProject/detail', - id: 'f0ba6bde-0b90-11ef-b841-70b5e844a623', - formName: null, - createTime: 1714990261372, - processDefinition: { - id: 'pms_project:6:b9e4e33b-2c6c-11ef-8386-0242ac130002', - version: 6, - deploymentTime: 1718603095738, - suspensionState: 1 - } - }, - { - key: 'invoice_apply_manage', - name: '开票申请', - description: 'asdas', - category: '1', - categoryName: '测试1', - formType: 20, - formId: null, - formCustomCreatePath: '/sales/invoice/create', - formCustomViewPath: '/sales/invoice/detail', - id: '7ec07575-0605-11ef-ab76-cc96e508c010', - formName: null, - createTime: 1714380614292, - processDefinition: { - id: 'invoice_apply_manage:8:665a8c40-44c9-11ef-9813-0242ac130002', - version: 8, - deploymentTime: 1721281726671, - suspensionState: 1 - } - } -]