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
854f92c4
Commit
854f92c4
authored
Jul 20, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加变量"创建者负责人"
parent
d42392a2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
3 deletions
+34
-3
src/components/wfd/components/DetailPanel/HandleNodeDetail.vue
+4
-1
src/components/wfd/components/DetailPanel/UserTaskDetail.vue
+4
-1
src/views/system/dept/index.vue
+26
-1
No files found.
src/components/wfd/components/DetailPanel/HandleNodeDetail.vue
View file @
854f92c4
...
...
@@ -155,7 +155,10 @@ export default {
return
{
variableOptions
:
[{
value
:
1
,
label
:
'创建人'
label
:
'创建者'
},
{
value
:
1
,
label
:
'创建者负责人'
}]
}
}
...
...
src/components/wfd/components/DetailPanel/UserTaskDetail.vue
View file @
854f92c4
...
...
@@ -147,7 +147,10 @@ export default {
return
{
variableOptions
:
[{
value
:
1
,
label
:
'创建人'
label
:
'创建者'
},
{
value
:
2
,
label
:
'创建者负责人'
}]
}
}
...
...
src/views/system/dept/index.vue
View file @
854f92c4
...
...
@@ -109,7 +109,14 @@
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"负责人"
prop=
"leader"
>
<el-input
v-model=
"form.leader"
placeholder=
"请输入负责人"
maxlength=
"20"
/>
<el-select
v-model=
"form.leader"
clearable
filterable
placeholder=
"请选择负责人"
>
<el-option
v-for=
"item in users"
:key=
"item.userId"
:label=
"item.nickName"
:value=
"item.userId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
...
...
@@ -133,6 +140,7 @@
</template>
<
script
>
import
{
listUser
}
from
'@/api/system/sysuser'
import
{
getDeptList
,
getDept
,
delDept
,
addDept
,
updateDept
}
from
'@/api/system/dept'
import
Treeselect
from
'@riophae/vue-treeselect'
import
'@riophae/vue-treeselect/dist/vue-treeselect.css'
...
...
@@ -158,6 +166,7 @@ export default {
deptName
:
undefined
,
status
:
undefined
},
users
:
[],
// 表单参数
form
:
{},
// 表单校验
...
...
@@ -168,6 +177,9 @@ export default {
deptName
:
[
{
required
:
true
,
message
:
'部门名称不能为空'
,
trigger
:
'blur'
}
],
leader
:
[
{
required
:
true
,
message
:
'部门负责人不能为空'
,
trigger
:
'blur'
}
],
sort
:
[
{
required
:
true
,
message
:
'菜单顺序不能为空'
,
trigger
:
'blur'
}
],
...
...
@@ -200,6 +212,14 @@ export default {
this
.
loading
=
false
})
},
// 查询用户
getUsers
()
{
listUser
({
pageSize
:
999999
}).
then
(
response
=>
{
this
.
users
=
response
.
data
.
list
})
},
/** 转换部门数据结构 */
normalizer
(
node
)
{
if
(
node
.
children
&&
!
node
.
children
.
length
)
{
...
...
@@ -251,6 +271,7 @@ export default {
},
/** 新增按钮操作 */
handleAdd
(
row
)
{
this
.
getUsers
()
this
.
reset
()
this
.
getTreeselect
(
'add'
)
if
(
row
!==
undefined
)
{
...
...
@@ -262,11 +283,15 @@ export default {
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
getUsers
()
this
.
reset
()
this
.
getTreeselect
(
'update'
)
getDept
(
row
.
deptId
).
then
(
response
=>
{
this
.
form
=
response
.
data
if
(
this
.
form
.
leader
===
0
)
{
this
.
form
.
leader
=
''
}
this
.
open
=
true
this
.
title
=
'修改部门'
this
.
isEdit
=
true
...
...
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