From 0fbd98291e293421a3a6e17f195492eb2767a2e1 Mon Sep 17 00:00:00 2001 From: GoldenZqqq <1361001127@qq.com> Date: Wed, 6 Nov 2024 15:55:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BA=BF=E7=BB=84=E4=BB=B6=E4=B8=AD=E5=AD=98=E5=9C=A8=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81=E6=97=B6=EF=BC=8C=E5=80=99=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=A7=B0=E5=A4=B4=E5=83=8F=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/processInstance/create/index.vue | 94 ------------------- .../detail/ProcessInstanceTimeline.vue | 84 ++++++++--------- 2 files changed, 42 insertions(+), 136 deletions(-) diff --git a/src/views/bpm/processInstance/create/index.vue b/src/views/bpm/processInstance/create/index.vue index 4909f3f7..5daa22d8 100644 --- a/src/views/bpm/processInstance/create/index.vue +++ b/src/views/bpm/processInstance/create/index.vue @@ -146,100 +146,6 @@ const getDefinitionList = async () => { processDefinitionList.value = await DefinitionApi.getProcessDefinitionList({ suspensionState: 1 }) - /* 测试数据 */ - // processDefinitionList.value = [ - // { - // id: 'business:3:fab1dceb-95be-11ef-8c7d-00a6181404fd', - // version: 3, - // name: '商务管理', - // key: 'business', - // icon: 'https://picsum.photos/200?r=2', - // description: '商务管理', - // category: 'test0', - // categoryName: '分类0', - // formType: 10, - // formId: 27, - // formName: null, - // formConf: - // '{"form":{"inline":false,"hideRequiredAsterisk":false,"labelPosition":"right","size":"default","labelWidth":"100px"},"resetBtn":{"show":false,"innerText":"重置"},"submitBtn":{"show":false,"innerText":"提交"}}', - // formFields: [ - // '{"type":"input","field":"F1yrm2sosxgeabc","title":"请假原因","info":"","$required":false,"props":{"type":"text","placeholder":"请输入123"},"_fc_id":"id_Fhrbm2sosxgeacc","name":"ref_Festm2sosxgeadc","display":true,"hidden":false,"_fc_drag_tag":"input"}', - // '{"type":"radio","field":"F9r3m2sp1b34aec","title":"请假类型","info":"","$required":false,"props":{"_optionType":2},"_fc_id":"id_F4nwm2sp1b34afc","name":"ref_Fkodm2sp1b34agc","display":true,"hidden":false,"_fc_drag_tag":"radio","options":[{"label":"事假","value":"1"},{"label":"婚假","value":"2"},{"label":"丧假","value":"3"}]}', - // '{"type":"datePicker","field":"Finom2tsbwbpadc","title":"请假时间段","info":"","$required":false,"props":{"type":"datetimerange"},"_fc_id":"id_F028m2tsbwbpaec","name":"ref_F0okm2tsbwbpafc","display":true,"hidden":false,"_fc_drag_tag":"dateRange"}' - // ], - // formCustomCreatePath: '', - // formCustomViewPath: '', - // suspensionState: 1, - // deploymentTime: null, - // bpmnXml: null, - // startUserSelectTasks: null - // }, - // { - // id: 'oa_leave:1:6e5ac269-5f87-11ef-bdb6-00a6181404fd', - // version: 1, - // name: 'oa_leave', - // key: 'oa_leave', - // icon: null, - // description: 'oa_leave', - // category: 'etst', - // categoryName: '分类1', - // formType: 20, - // formId: null, - // formName: null, - // formConf: null, - // formFields: null, - // formCustomCreatePath: '/bpm/oa/leave/create', - // formCustomViewPath: '/bpm/oa/leave/detail', - // suspensionState: 1, - // deploymentTime: null, - // bpmnXml: null, - // startUserSelectTasks: null - // }, - // { - // id: 'oa_leave:3:c9d06889-94fd-11ef-bf08-00a6181404fd', - // version: 3, - // name: '请假流程', - // key: 'oa_leave', - // icon: 'https://picsum.photos/200?r=1', - // description: '请假流程', - // category: 'test3', - // categoryName: '分类3', - // formType: 10, - // formId: 27, - // formName: null, - // formConf: - // '{"form":{"inline":false,"hideRequiredAsterisk":false,"labelPosition":"right","size":"default","labelWidth":"100px"},"resetBtn":{"show":false,"innerText":"重置"},"submitBtn":{"show":true,"innerText":"提交"}}', - // formFields: [ - // '{"type":"input","field":"F1yrm2sosxgeabc","title":"请假原因","info":"","$required":false,"props":{"type":"text","placeholder":"请输入123"},"_fc_id":"id_Fhrbm2sosxgeacc","name":"ref_Festm2sosxgeadc","display":true,"hidden":false,"_fc_drag_tag":"input"}', - // '{"type":"radio","field":"F9r3m2sp1b34aec","title":"请假类型","info":"","$required":false,"props":{"_optionType":2},"_fc_id":"id_F4nwm2sp1b34afc","name":"ref_Fkodm2sp1b34agc","display":true,"hidden":false,"_fc_drag_tag":"radio","options":[{"label":"事假","value":"1"},{"label":"婚假","value":"2"},{"label":"丧假","value":"3"}]}' - // ], - // formCustomCreatePath: 'bpm/oa/leave/create', - // formCustomViewPath: 'bpm/oa/leave/create', - // suspensionState: 1, - // deploymentTime: null, - // bpmnXml: null, - // startUserSelectTasks: null - // } - // ] - /* 测试数据 */ - // processDefinitionList.value = [ - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value, - // ...processDefinitionList.value - // ] // 初始化过滤列表为全部流程定义 filteredProcessDefinitionList.value = processDefinitionList.value } finally { diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue index 8415a2b1..3eb071ed 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue @@ -24,7 +24,7 @@ -
+
{{ activity.name }}
@@ -36,53 +36,53 @@ {{ getApprovalNodeTime(activity) }}
-
+
-
-
+
+
+
- + + +
- - - -
- -
+
+
+