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 @@
+
+
+
+
+
+
+
当前无法发布
+
+
+
以下内容不完善,需进行修改
+
+
+
流程设计
+
{{item.name}} 未选择{{item.type}}
+
+
+
+
+
+
+ 前往修改
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+ {{label}}
+
+
添加/修改成员
+
+ {{item.name}}
+
+
+ 清除
+
+
+
+
+ 发起人的:
+
+
+
找不到主管时,由上级主管代审批
+
+
+
该审批节点设置“发起人自己”后,审批人默认为发起人
+
+
+
+ {{label}}
+
+
选择范围
+
+ {{label}}
+
+
+ 添加/修改成员
+ 添加/修改角色
+
+ {{item.name}}
+
+
+ 清除
+
+
+
+
+
+
审批终点
+
+ 发起人的:
+
+
+
+
+
多人审批时采用的审批方式
+
+ 依次审批
+
+ 会签(须所有审批人同意)
+
+
+
+
审批人为空时
+
+ 自动审批通过/不允许发起
+
+ 转交给审核管理员
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
添加成员
+
+ {{item.name}}
+
+
+ 清除
+
+
+ 允许发起人自选抄送人
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
{{ $func.arrToStr(flowPermission) || '所有人' }}
+
添加/修改发起人
+
+
+
+
+
+
+
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 }}
{{nodeConfig.type == 1?'':''}}
-
+
+
{{ 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(() => {
+
+