Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
front-backend
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
framework
front-backend
Commits
0731e1e9
Commit
0731e1e9
authored
Apr 11, 2019
by
zhengjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7版本发布,详情查看版本说明
parent
59bf825d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
48 additions
and
35 deletions
+48
-35
src/views/system/dept/index.vue
+2
-2
src/views/system/dept/module/edit.vue
+5
-1
src/views/system/dept/module/form.vue
+4
-8
src/views/system/dept/module/header.vue
+5
-1
src/views/system/job/index.vue
+2
-2
src/views/system/job/module/edit.vue
+5
-1
src/views/system/job/module/form.vue
+4
-8
src/views/system/job/module/header.vue
+5
-1
src/views/system/user/index.vue
+2
-3
src/views/system/user/module/edit.vue
+5
-1
src/views/system/user/module/form.vue
+4
-6
src/views/system/user/module/header.vue
+5
-1
No files found.
src/views/system/dept/index.vue
View file @
0731e1e9
<
template
>
<div
class=
"app-container"
>
<eHeader
:query=
"query"
/>
<eHeader
:query=
"query"
:dicts=
"dicts"
/>
<!--表格渲染-->
<tree-table
v-loading=
"loading"
:expand-all=
"true"
:data=
"data"
:columns=
"columns"
size=
"small"
>
<el-table-column
label=
"状态"
align=
"center"
>
...
...
@@ -17,7 +17,7 @@
</el-table-column>
<el-table-column
label=
"操作"
width=
"150px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<edit
v-if=
"checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT'])"
:data=
"scope.row"
:sup_this=
"sup_this"
/>
<edit
v-if=
"checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT'])"
:d
icts=
"dicts"
:d
ata=
"scope.row"
:sup_this=
"sup_this"
/>
<el-popover
v-if=
"checkPermission(['ADMIN','DEPT_ALL','DEPT_DELETE'])"
:ref=
"scope.row.id"
...
...
src/views/system/dept/module/edit.vue
View file @
0731e1e9
<
template
>
<div>
<el-button
size=
"mini"
type=
"success"
@
click=
"to"
>
编辑
</el-button>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
/>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
:dicts=
"dicts"
/>
</div>
</
template
>
<
script
>
...
...
@@ -16,6 +16,10 @@ export default {
sup_this
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
methods
:
{
...
...
src/views/system/dept/module/form.vue
View file @
0731e1e9
...
...
@@ -20,12 +20,10 @@
<
script
>
import
{
add
,
edit
,
getDepts
}
from
'@/api/dept'
import
initDict
from
'@/mixins/initDict'
import
Treeselect
from
'@riophae/vue-treeselect'
import
'@riophae/vue-treeselect/dist/vue-treeselect.css'
export
default
{
components
:
{
Treeselect
},
mixins
:
[
initDict
],
props
:
{
isAdd
:
{
type
:
Boolean
,
...
...
@@ -34,6 +32,10 @@ export default {
sup_this
:
{
type
:
Object
,
default
:
null
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
@@ -52,12 +54,6 @@ export default {
}
}
},
created
()
{
this
.
$nextTick
(()
=>
{
// 加载数据字典
this
.
getDict
(
'dept_status'
)
})
},
methods
:
{
cancel
()
{
this
.
resetForm
()
...
...
src/views/system/dept/module/header.vue
View file @
0731e1e9
...
...
@@ -15,7 +15,7 @@
type=
"primary"
icon=
"el-icon-plus"
@
click=
"add"
>
新增
</el-button>
<eForm
ref=
"form"
:is-add=
"true"
/>
<eForm
ref=
"form"
:is-add=
"true"
:dicts=
"dicts"
/>
</div>
</div>
</
template
>
...
...
@@ -29,6 +29,10 @@ export default {
query
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
src/views/system/job/index.vue
View file @
0731e1e9
<
template
>
<div
class=
"app-container"
>
<eHeader
:query=
"query"
/>
<eHeader
:query=
"query"
:dicts=
"dicts"
/>
<!--表格渲染-->
<el-table
v-loading=
"loading"
:data=
"data"
size=
"small"
style=
"width: 100%;"
>
<el-table-column
prop=
"name"
label=
"名称"
/>
...
...
@@ -28,7 +28,7 @@
</el-table-column>
<el-table-column
label=
"操作"
width=
"150px"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<edit
v-if=
"checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT'])"
:data=
"scope.row"
:sup_this=
"sup_this"
/>
<edit
v-if=
"checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT'])"
:d
icts=
"dicts"
:d
ata=
"scope.row"
:sup_this=
"sup_this"
/>
<el-popover
v-if=
"checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])"
:ref=
"scope.row.id"
...
...
src/views/system/job/module/edit.vue
View file @
0731e1e9
<
template
>
<div>
<el-button
size=
"mini"
type=
"success"
@
click=
"to"
>
编辑
</el-button>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
/>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
:dicts=
"dicts"
/>
</div>
</
template
>
<
script
>
...
...
@@ -16,6 +16,10 @@ export default {
sup_this
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
methods
:
{
...
...
src/views/system/job/module/form.vue
View file @
0731e1e9
...
...
@@ -26,10 +26,8 @@ import { getDepts } from '@/api/dept'
import
{
add
,
edit
}
from
'@/api/job'
import
Treeselect
from
'@riophae/vue-treeselect'
import
'@riophae/vue-treeselect/dist/vue-treeselect.css'
import
initDict
from
'@/mixins/initDict'
export
default
{
components
:
{
Treeselect
},
mixins
:
[
initDict
],
props
:
{
isAdd
:
{
type
:
Boolean
,
...
...
@@ -38,6 +36,10 @@ export default {
sup_this
:
{
type
:
Object
,
default
:
null
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
@@ -61,12 +63,6 @@ export default {
}
}
},
created
()
{
this
.
$nextTick
(()
=>
{
// 加载数据字典
this
.
getDict
(
'job_status'
)
})
},
methods
:
{
cancel
()
{
this
.
resetForm
()
...
...
src/views/system/job/module/header.vue
View file @
0731e1e9
...
...
@@ -15,7 +15,7 @@
type=
"primary"
icon=
"el-icon-plus"
@
click=
"add"
>
新增
</el-button>
<eForm
ref=
"form"
:is-add=
"true"
/>
<eForm
ref=
"form"
:is-add=
"true"
:dicts=
"dicts"
/>
</div>
</div>
</
template
>
...
...
@@ -29,6 +29,10 @@ export default {
query
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
src/views/system/user/index.vue
View file @
0731e1e9
...
...
@@ -8,7 +8,7 @@
<el-tree
:data=
"depts"
:props=
"defaultProps"
:expand-on-click-node=
"false"
default-expand-all
@
node-click=
"handleNodeClick"
/>
</el-col>
<el-col
:xs=
"24"
:sm=
"24"
:md=
"20"
:lg=
"20"
:xl=
"20"
>
<eHeader
:query=
"query"
:sup_this=
"sup_this"
/>
<eHeader
:query=
"query"
:sup_this=
"sup_this"
:dicts=
"dicts"
/>
<!--表格渲染-->
<el-table
v-loading=
"loading"
:data=
"data"
size=
"small"
style=
"width: 100%;"
>
<el-table-column
prop=
"username"
label=
"用户名"
/>
...
...
@@ -33,7 +33,7 @@
</el-table-column>
<el-table-column
label=
"操作"
width=
"140"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<edit
v-if=
"checkPermission(['ADMIN','USER_ALL','USER_EDIT'])"
:data=
"scope.row"
:sup_this=
"sup_this"
/>
<edit
v-if=
"checkPermission(['ADMIN','USER_ALL','USER_EDIT'])"
:d
icts=
"dicts"
:d
ata=
"scope.row"
:sup_this=
"sup_this"
/>
<el-popover
v-if=
"checkPermission(['ADMIN','USER_ALL','USER_DELETE'])"
:ref=
"scope.row.id"
...
...
@@ -85,7 +85,6 @@ export default {
},
created
()
{
this
.
getDeptDatas
()
console
.
log
(
this
.
dicts
)
this
.
$nextTick
(()
=>
{
this
.
init
()
// 加载数据字典
...
...
src/views/system/user/module/edit.vue
View file @
0731e1e9
<
template
>
<div>
<el-button
size=
"mini"
type=
"success"
@
click=
"to"
>
编辑
</el-button>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
/>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"false"
:dicts=
"dicts"
/>
</div>
</
template
>
<
script
>
...
...
@@ -17,6 +17,10 @@ export default {
sup_this
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
methods
:
{
...
...
src/views/system/user/module/form.vue
View file @
0731e1e9
...
...
@@ -48,12 +48,10 @@ import { add, edit } from '@/api/user'
import
{
getDepts
}
from
'@/api/dept'
import
{
getAll
}
from
'@/api/role'
import
{
getAllJob
}
from
'@/api/job'
import
initDict
from
'@/mixins/initDict'
import
Treeselect
from
'@riophae/vue-treeselect'
import
'@riophae/vue-treeselect/dist/vue-treeselect.css'
export
default
{
components
:
{
Treeselect
},
mixins
:
[
initDict
],
props
:
{
isAdd
:
{
type
:
Boolean
,
...
...
@@ -62,6 +60,10 @@ export default {
sup_this
:
{
type
:
Object
,
default
:
null
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
@@ -96,10 +98,6 @@ export default {
}
},
created
()
{
this
.
$nextTick
(()
=>
{
// 加载数据字典
this
.
getDict
(
'user_status'
)
})
const
explorer
=
navigator
.
userAgent
if
(
explorer
.
indexOf
(
'Chrome'
)
>=
0
)
{
this
.
style
=
'width: 184px'
...
...
src/views/system/user/module/header.vue
View file @
0731e1e9
...
...
@@ -18,7 +18,7 @@
type=
"primary"
icon=
"el-icon-plus"
@
click=
"add"
>
新增
</el-button>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"true"
/>
<eForm
ref=
"form"
:sup_this=
"sup_this"
:is-add=
"true"
:dicts=
"dicts"
/>
</div>
<!-- 导出 -->
<el-button
...
...
@@ -47,6 +47,10 @@ export default {
sup_this
:
{
type
:
Object
,
required
:
true
},
dicts
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
...
...
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