From 1390c056dfd1fd534084010fc6906ad15483cd0c Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Wed, 11 Oct 2023 11:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflowapi/index.ts | 8 + .../workflow/dialog/employeesDialog.vue | 55 ++++ .../workflow/dialog/errorDialog.vue | 72 +++++ .../workflow/drwer/approverDrawer.vue | 226 +++++++++++++ .../workflow/drwer/conditionDrawer.vue | 304 ++++++++++++++++++ .../workflow/drwer/copyerDrawer.vue | 88 +++++ .../workflow/drwer/promoterDrawer.vue | 87 +++++ src/components/workflow/nodeWrap.vue | 34 +- src/views/sysworkflow/flow/index.vue | 15 +- 9 files changed, 868 insertions(+), 21 deletions(-) create mode 100644 src/components/workflow/dialog/employeesDialog.vue create mode 100644 src/components/workflow/dialog/errorDialog.vue create mode 100644 src/components/workflow/drwer/approverDrawer.vue create mode 100644 src/components/workflow/drwer/conditionDrawer.vue create mode 100644 src/components/workflow/drwer/copyerDrawer.vue create mode 100644 src/components/workflow/drwer/promoterDrawer.vue diff --git a/src/api/workflowapi/index.ts b/src/api/workflowapi/index.ts index e3c5fe91e..ec48204b3 100644 --- a/src/api/workflowapi/index.ts +++ b/src/api/workflowapi/index.ts @@ -21,3 +21,11 @@ export function setWorkFlowData(data: any):any { data: data }); } +//保存工作流 +export function getConditions(data: any):any { + return request({ + url: '/systemapi/task_flow/init_workflow', + method: 'post', + data: data + }); +} diff --git a/src/components/workflow/dialog/employeesDialog.vue b/src/components/workflow/dialog/employeesDialog.vue new file mode 100644 index 000000000..1e647fbca --- /dev/null +++ b/src/components/workflow/dialog/employeesDialog.vue @@ -0,0 +1,55 @@ + + + + diff --git a/src/components/workflow/dialog/errorDialog.vue b/src/components/workflow/dialog/errorDialog.vue new file mode 100644 index 000000000..b72f4df99 --- /dev/null +++ b/src/components/workflow/dialog/errorDialog.vue @@ -0,0 +1,72 @@ + + + + diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue new file mode 100644 index 000000000..185aae962 --- /dev/null +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -0,0 +1,226 @@ + + + + diff --git a/src/components/workflow/drwer/conditionDrawer.vue b/src/components/workflow/drwer/conditionDrawer.vue new file mode 100644 index 000000000..0f85e2274 --- /dev/null +++ b/src/components/workflow/drwer/conditionDrawer.vue @@ -0,0 +1,304 @@ + + + + diff --git a/src/components/workflow/drwer/copyerDrawer.vue b/src/components/workflow/drwer/copyerDrawer.vue new file mode 100644 index 000000000..7f8629100 --- /dev/null +++ b/src/components/workflow/drwer/copyerDrawer.vue @@ -0,0 +1,88 @@ + + + + diff --git a/src/components/workflow/drwer/promoterDrawer.vue b/src/components/workflow/drwer/promoterDrawer.vue new file mode 100644 index 000000000..5306acd28 --- /dev/null +++ b/src/components/workflow/drwer/promoterDrawer.vue @@ -0,0 +1,87 @@ + + + + diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue index e63c915b8..a4f160529 100644 --- a/src/components/workflow/nodeWrap.vue +++ b/src/components/workflow/nodeWrap.vue @@ -130,7 +130,7 @@ const setPerson = (priorityLevel) => { flag: false, id: _uid, }); - } else if (type == 1) { + } else if (type == 1 || type == 3) { setApprover(true); setApproverConfig({ value: { @@ -215,16 +215,8 @@ onMounted(() => { {{ nodeConfig.nodeName }} @@ -232,16 +224,17 @@ onMounted(() => {
- 请选择{{defaultText}} + 请选择{{defaultText}} {{showText}}
-
+
+ @@ -249,28 +242,29 @@ onMounted(() => {
-
+
-
<
+
<
{{ item.nodeName }} 优先级{{ item.priorityLevel }}
-
>
+
>
{{ $func.conditionStr(nodeConfig, index) }}
-
+
@@ -288,10 +282,12 @@ onMounted(() => {
+
+