Skip to content

Commit

Permalink
1.7版本发布,详情查看版本说明
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengjie committed Apr 11, 2019
1 parent 59bf825 commit 0731e1e
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 35 deletions.
4 changes: 2 additions & 2 deletions src/views/system/dept/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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">
Expand All @@ -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'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_DELETE'])"
:ref="scope.row.id"
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/dept/module/edit.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>
Expand All @@ -16,6 +16,10 @@ export default {
sup_this: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
methods: {
Expand Down
12 changes: 4 additions & 8 deletions src/views/system/dept/module/form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -34,6 +32,10 @@ export default {
sup_this: {
type: Object,
default: null
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand All @@ -52,12 +54,6 @@ export default {
}
}
},
created() {
this.$nextTick(() => {
// 加载数据字典
this.getDict('dept_status')
})
},
methods: {
cancel() {
this.resetForm()
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/dept/module/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,6 +29,10 @@ export default {
query: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand Down
4 changes: 2 additions & 2 deletions src/views/system/job/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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="名称"/>
Expand Down Expand Up @@ -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'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])"
:ref="scope.row.id"
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/job/module/edit.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>
Expand All @@ -16,6 +16,10 @@ export default {
sup_this: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
methods: {
Expand Down
12 changes: 4 additions & 8 deletions src/views/system/job/module/form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -38,6 +36,10 @@ export default {
sup_this: {
type: Object,
default: null
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand All @@ -61,12 +63,6 @@ export default {
}
}
},
created() {
this.$nextTick(() => {
// 加载数据字典
this.getDict('job_status')
})
},
methods: {
cancel() {
this.resetForm()
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/job/module/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,6 +29,10 @@ export default {
query: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand Down
5 changes: 2 additions & 3 deletions src/views/system/user/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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="用户名"/>
Expand All @@ -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'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','USER_ALL','USER_DELETE'])"
:ref="scope.row.id"
Expand Down Expand Up @@ -85,7 +85,6 @@ export default {
},
created() {
this.getDeptDatas()
console.log(this.dicts)
this.$nextTick(() => {
this.init()
// 加载数据字典
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/user/module/edit.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>
Expand All @@ -17,6 +17,10 @@ export default {
sup_this: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
methods: {
Expand Down
10 changes: 4 additions & 6 deletions src/views/system/user/module/form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -62,6 +60,10 @@ export default {
sup_this: {
type: Object,
default: null
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 5 additions & 1 deletion src/views/system/user/module/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -47,6 +47,10 @@ export default {
sup_this: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
data() {
Expand Down

0 comments on commit 0731e1e

Please sign in to comment.