-
+
- 新建流程
+ 新建模型
@@ -38,11 +38,11 @@
- 新建分组
+ 新建分类
- 分组排序
+ 分类排序
From 57820cb3e18de92358c3ea4b335c1a64dac9993e Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Tue, 15 Oct 2024 15:17:40 +0800
Subject: [PATCH 4/8] =?UTF-8?q?faet:=20=E5=88=86=E7=B1=BB=E4=B8=8B?=
=?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E6=8B=96=E6=8B=BD=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=EF=BC=9B=E9=87=8D?=
=?UTF-8?q?=E5=91=BD=E5=90=8D=E5=88=86=E7=B1=BB=E5=BC=B9=E7=AA=97=E7=BB=98?=
=?UTF-8?q?=E5=88=B6=EF=BC=9B=E5=88=A0=E9=99=A4=E5=88=86=E7=B1=BB=E9=80=BB?=
=?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD=E4=B8=8E=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bpm/model/CategoryDraggableModel.vue | 118 +++++++++++++++---
src/views/bpm/model/index_new.vue | 17 ++-
2 files changed, 114 insertions(+), 21 deletions(-)
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index f118f9f7..2a5c5e14 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -9,16 +9,24 @@
>
-
+
-
+
排序
-
-
- 分组
-
+
+
+
+ 分类
+
+
+
+ 重命名
+ 删除该类
+
+
+
取 消
@@ -32,13 +40,13 @@
({{ dataList?.length || 0 }})
-
@@ -183,10 +191,25 @@
+
+
+
+
From 2db1f726c3b9e38711ea48aa734b0e0fad2b62c0 Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Tue, 15 Oct 2024 16:29:45 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E6=A8=A1?=
=?UTF-8?q?=E5=9E=8B=E5=88=86=E7=B1=BB=E6=8E=92=E5=BA=8F=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bpm/model/CategoryDraggableModel.vue | 10 ++++-
src/views/bpm/model/index_new.vue | 42 +++++++++++++++++--
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index 2a5c5e14..51a53a07 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -36,6 +36,13 @@
+
+
+
{{ title }}
({{ dataList?.length || 0 }})
-
-
-
-
-
-
- 排序
-
-
-
-
- 分类
+
+
+
+
+
+
+
+
+ 排序
-
-
- 重命名
- 删除该类
-
-
-
-
-
- 取 消
- 保存排序
-
+
+
+
+ 分类
+
+
+
+ 重命名
+ 删除该类
+
+
+
+
+
+ 取 消
+ 保存排序
+
+
+
@@ -43,12 +56,12 @@
class="ml-10px category-drag-icon cursor-move text-#8a909c"
/>
-
{{ title }}
-
({{ dataList?.length || 0 }})
+
{{ categoryInfo.name }}
+
({{ categoryInfo.modelList?.length || 0 }})
-
+
appStore.getIsDark)
const { t } = useI18n() // 国际化
const { push } = useRouter() // 路由
const userStore = useUserStoreWithOut() // 用户信息缓存
-const isSorting = ref(false) // 是否正处于排序状态
+const isModelSorting = ref(false) // 是否正处于排序状态
const tableData: any = ref([])
const originalData: any = ref([]) // 原始数据
@@ -270,7 +283,7 @@ const handleCommand = (command: string, row: any) => {
const handleCategoryCommand = (command: string) => {
switch (command) {
case 'handleRename':
- renameVal.value = props.title
+ renameVal.value = props.categoryInfo.name
renameVisible.value = true
break
case 'handleDeleteGroup':
@@ -390,8 +403,8 @@ const isManagerUser = (row: any) => {
/* 排序 */
const handleSort = () => {
// 保存初始数据
- originalData.value = cloneDeep(props.dataList)
- isSorting.value = true
+ originalData.value = cloneDeep(props.categoryInfo.modelList)
+ isModelSorting.value = true
initSort()
}
@@ -400,13 +413,13 @@ const saveSort = () => {
console.log(tableData.value)
// 刷新列表
emit('success')
- isSorting.value = false
+ isModelSorting.value = false
}
const cancelSort = () => {
// 恢复初始数据
tableData.value = cloneDeep(originalData.value)
- isSorting.value = false
+ isModelSorting.value = false
}
/* 分类 */
@@ -416,7 +429,7 @@ const handleGroup = () => {
const tableRef = ref()
// 创建拖拽实例
const initSort = () => {
- const table = document.querySelector(`.${props.title} .el-table__body-wrapper tbody`)
+ const table = document.querySelector(`.${props.categoryInfo.name} .el-table__body-wrapper tbody`)
Sortable.create(table, {
group: 'shared',
animation: 150,
@@ -437,7 +450,7 @@ const initSort = () => {
// 更新表格数据
const updateTableData = () => {
- tableData.value = cloneDeep(props.dataList)
+ tableData.value = cloneDeep(props.categoryInfo.modelList)
}
const renameVal = ref('')
@@ -450,17 +463,18 @@ const handleRenameConfirm = () => {
// 删除分类
const handleDeleteGroup = async () => {
- if (props.dataList.length > 0) {
+ if (props.categoryInfo.modelList.length > 0) {
return message.warning('该分类下仍有流程定义,不允许删除')
}
await message.confirm('确认删除分类吗?')
// 实际调用接口删除
}
-onMounted(() => {
- updateTableData()
-})
-defineExpose({ updateTableData })
+watch(() => props.categoryInfo.modelList, updateTableData, { immediate: true })
+
+defineExpose({
+ activeCollapse
+})
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
- }
- }
-]
From 708e12b6cee20fa747446d06c014d2000fb8830f Mon Sep 17 00:00:00 2001
From: GoldenZqqq <1361001127@qq.com>
Date: Wed, 16 Oct 2024 16:23:41 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BA=A4?=
=?UTF-8?q?=E4=BA=92=E7=BB=86=E8=8A=82=E3=80=81=E5=88=A0=E9=99=A4=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bpm/model/CategoryDraggableModel.vue | 34 ++++++++++++++-----
src/views/bpm/model/index_new.vue | 13 ++++---
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/views/bpm/model/CategoryDraggableModel.vue b/src/views/bpm/model/CategoryDraggableModel.vue
index d322cf06..6269e72b 100644
--- a/src/views/bpm/model/CategoryDraggableModel.vue
+++ b/src/views/bpm/model/CategoryDraggableModel.vue
@@ -1,10 +1,11 @@
-
+