Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
ferry_web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jianan
ferry_web
Commits
2b80405d
Commit
2b80405d
authored
Jun 05, 2021
by
lanyulei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 添加流程节点邮件抄送功能。
parent
5a394dba
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
59 additions
and
1 deletions
+59
-1
src/components/wfd/components/DetailPanel/DefaultDetail.vue
+4
-0
src/components/wfd/components/DetailPanel/EndEventDetail.vue
+2
-0
src/components/wfd/components/DetailPanel/HandleNodeDetail.vue
+10
-0
src/components/wfd/components/DetailPanel/NodeDetail.vue
+25
-0
src/components/wfd/components/DetailPanel/StartEventDetail.vue
+6
-0
src/components/wfd/components/DetailPanel/UserTaskDetail.vue
+10
-0
src/components/wfd/components/DetailPanel/index.vue
+2
-1
No files found.
src/components/wfd/components/DetailPanel/DefaultDetail.vue
View file @
2b80405d
...
...
@@ -6,12 +6,14 @@
style=
"width:90%; font-size:12px"
:disabled=
"readOnly"
:value=
"model.label"
size=
"small"
@
input=
"(value) =>
{onChange('label', value)}"
/>
</div>
<div
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
顺序:
</div>
<el-input
size=
"small"
style=
"width:90%; font-size:12px"
:disabled=
"readOnly"
:value=
"model.sort"
...
...
@@ -20,11 +22,13 @@
</div>
<div
class=
"panelRow"
>
<el-checkbox
size=
"small"
:disabled=
"readOnly"
:value=
"!!model.isHideNode"
@
change=
"(value) => onChange('isHideNode', value)"
>
隐藏节点
</el-checkbox>
<el-checkbox
size=
"small"
:disabled=
"readOnly"
:value=
"!!model.hideIcon"
@
change=
"(value) => onChange('hideIcon', value)"
...
...
src/components/wfd/components/DetailPanel/EndEventDetail.vue
View file @
2b80405d
...
...
@@ -6,6 +6,7 @@
<div
class=
"panelRow"
>
<div>
之后任务:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
placeholder=
"选择任务"
:disabled=
"readOnly"
...
...
@@ -25,6 +26,7 @@
:templates-base=
"templatesBase"
:write-preview=
"false"
:readonly-preview=
"false"
:cc-preview=
"false"
/>
</div>
</div>
...
...
src/components/wfd/components/DetailPanel/HandleNodeDetail.vue
View file @
2b80405d
...
...
@@ -6,6 +6,7 @@
<div
class=
"panelRow"
>
<div>
之后任务:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
placeholder=
"选择任务"
:disabled=
"readOnly"
...
...
@@ -20,6 +21,7 @@
<div
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'handleNode.assignType'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size: 12px"
:placeholder=
"i18n['handleNode.assignType.placeholder']"
:value=
"model.assignType"
...
...
@@ -36,6 +38,7 @@
<div
v-if=
"model.assignType === 'person'"
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'handleNode.assignType.person.title'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['handleNode.assignType.person.placeholder']"
:disabled=
"readOnly"
...
...
@@ -51,6 +54,7 @@
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.role.title'
]
}}
:
</div>
<el-select
v-model
.
number=
"model.assignValue"
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.role.placeholder']"
:disabled=
"readOnly"
...
...
@@ -77,6 +81,7 @@
<div
v-else-if=
"model.assignType === 'department'"
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.department.title'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.department.placeholder']"
:value=
"model.assignValue"
...
...
@@ -92,6 +97,7 @@
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'handleNode.assignType.variable.title'
]
}}
:
</div>
<el-select
v-model
.
number=
"model.assignValue"
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['handleNode.assignType.variable.placeholder']"
:disabled=
"readOnly"
...
...
@@ -104,6 +110,7 @@
</div>
<div
class=
"panelRow"
>
<el-checkbox
size=
"small"
:disabled=
"model.assignType !== 'role' && model.assignType !== 'department' && (
model.assignValue===undefined ||
model.assignValue===null ||
...
...
@@ -114,6 +121,7 @@
@
change=
"(e) =>
{ onChange('isCounterSign', e); initCounterSign(e) }"
>
{{
i18n
[
'handleNode.counterSign'
]
}}
</el-checkbox>
<el-checkbox
size=
"small"
:disabled=
"
model.assignValue===undefined||
model.assignValue===null||
...
...
@@ -129,6 +137,7 @@
model.assignValue!==null &&
model.assignValue.length >= 1 &&
model.isCounterSign"
size=
"small"
:value=
"model.fullHandle"
@
change=
"(value) => onChange('fullHandle', value)"
>
{{
i18n
[
'userTask.fullHandle'
]
}}
</el-checkbox>
...
...
@@ -140,6 +149,7 @@
:templates=
"templates"
:templates-base=
"templatesBase"
:readonly-preview=
"false"
:users=
"users"
/>
</div>
</div>
...
...
src/components/wfd/components/DetailPanel/NodeDetail.vue
View file @
2b80405d
...
...
@@ -9,6 +9,7 @@
:value=
"model.writeTpls"
:multiple=
"true"
:filterable=
"true"
size=
"small"
@
change=
"(e) => onChange('writeTpls', e)"
>
<template
v-for=
"(templateValue, templateIndex) in templatesBase"
>
...
...
@@ -25,6 +26,7 @@
:value=
"model.readonlyTpls"
:multiple=
"true"
:filterable=
"true"
size=
"small"
@
change=
"(e) => onChange('readonlyTpls', e)"
>
<
template
v-for=
"(templateValue, templateIndex) in templatesBase"
>
...
...
@@ -41,6 +43,7 @@
:value=
"model.hideTpls"
:multiple=
"true"
:filterable=
"true"
size=
"small"
@
change=
"(e) => onChange('hideTpls', e)"
>
<
template
v-for=
"(templateValue, templateIndex) in templatesBase"
>
...
...
@@ -48,6 +51,20 @@
</
template
>
</el-select>
</div>
<div
v-if=
"ccPreview"
class=
"panelRow"
>
<div>
抄送邮件:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
placeholder=
"请选择抄送人"
:value=
"model.cc"
:multiple=
"true"
:filterable=
"true"
@
change=
"(e) => { onChange('cc', e); getPersons(e) }"
>
<el-option
v-for=
"user in users"
:key=
"user.userId"
:label=
"user.nickName===''?user.username:user.nickName"
:value=
"user.userId"
/>
</el-select>
</div>
</div>
</template>
<
script
>
...
...
@@ -81,6 +98,14 @@ export default {
readonlyPreview
:
{
type
:
Boolean
,
default
:
true
},
ccPreview
:
{
type
:
Boolean
,
default
:
true
},
users
:
{
type
:
Array
,
default
:
()
=>
([])
}
}
}
...
...
src/components/wfd/components/DetailPanel/StartEventDetail.vue
View file @
2b80405d
...
...
@@ -12,6 +12,7 @@
:value=
"model.task"
:multiple=
"true"
:filterable=
"true"
size=
"small"
@
change=
"(e) => onChange('task', e)"
>
<el-option
v-for=
"(taskValue, taskIndex) in tasks"
:key=
"taskIndex"
:label=
"taskValue.name"
:value=
"taskValue.full_name"
/>
...
...
@@ -24,6 +25,7 @@
:templates=
"templates"
:templates-base=
"templatesBase"
:write-preview=
"false"
:users=
"users"
/>
</div>
</div>
...
...
@@ -61,6 +63,10 @@ export default {
templatesBase
:
{
type
:
Array
,
default
:
()
=>
([])
},
users
:
{
type
:
Array
,
default
:
()
=>
([])
}
}
}
...
...
src/components/wfd/components/DetailPanel/UserTaskDetail.vue
View file @
2b80405d
...
...
@@ -6,6 +6,7 @@
<div
class=
"panelRow"
>
<div>
之后任务:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
placeholder=
"选择任务"
:disabled=
"readOnly"
...
...
@@ -20,6 +21,7 @@
<div
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size: 12px"
:placeholder=
"i18n['userTask.assignType.placeholder']"
:value=
"model.assignType"
...
...
@@ -36,6 +38,7 @@
<div
v-if=
"model.assignType === 'person'"
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.person.title'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.person.placeholder']"
:disabled=
"readOnly"
...
...
@@ -51,6 +54,7 @@
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.role.title'
]
}}
:
</div>
<el-select
v-model
.
number=
"model.assignValue"
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.role.placeholder']"
:disabled=
"readOnly"
...
...
@@ -77,6 +81,7 @@
<div
v-else-if=
"model.assignType === 'department'"
class=
"panelRow"
>
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.department.title'
]
}}
:
</div>
<el-select
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.department.placeholder']"
:value=
"model.assignValue"
...
...
@@ -92,6 +97,7 @@
<div><span
style=
"color: red"
>
*
</span>
{{
i18n
[
'userTask.assignType.variable.title'
]
}}
:
</div>
<el-select
v-model
.
number=
"model.assignValue"
size=
"small"
style=
"width:90%; font-size:12px"
:placeholder=
"i18n['userTask.assignType.variable.placeholder']"
:disabled=
"readOnly"
...
...
@@ -104,6 +110,7 @@
</div>
<div
class=
"panelRow"
>
<el-checkbox
size=
"small"
:disabled=
"model.assignType !== 'role' && model.assignType !== 'department' && (
model.assignValue===undefined ||
model.assignValue===null ||
...
...
@@ -114,6 +121,7 @@
@
change=
"(e) =>
{ onChange('isCounterSign', e); initCounterSign(e) }"
>
{{
i18n
[
'userTask.counterSign'
]
}}
</el-checkbox>
<el-checkbox
size=
"small"
:disabled=
"
model.assignValue===undefined||
model.assignValue===null||
...
...
@@ -129,6 +137,7 @@
model.assignValue!==null &&
model.assignValue.length >= 1 &&
model.isCounterSign"
size=
"small"
:value=
"model.fullHandle"
@
change=
"(value) => onChange('fullHandle', value)"
>
{{
i18n
[
'userTask.fullHandle'
]
}}
</el-checkbox>
...
...
@@ -140,6 +149,7 @@
:templates=
"templates"
:templates-base=
"templatesBase"
:readonly-preview=
"false"
:users=
"users"
/>
</div>
</div>
...
...
src/components/wfd/components/DetailPanel/index.vue
View file @
2b80405d
<
template
>
<div
class=
"detailPanel"
:style=
"
{'height':height+'px'}">
<div
class=
"detailPanel"
:style=
"
{'height':height+'px'}"
style="overflow-y: scroll; padding-bottom: 10px;"
>
<UserTaskDetail
v-if=
"model.clazz === 'userTask'"
:model=
"model"
...
...
@@ -45,6 +45,7 @@
<StartEventDetail
v-else-if=
"model.clazz === 'start'"
:model=
"model"
:users=
"users"
:on-change=
"onChange"
:read-only=
"readOnly"
:tasks=
"tasks"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment