Skip to content

F
front-backend
Commit 0731e1e9 by zhengjie
Options

1.7版本发布，详情查看版本说明

parent 59bf825d
Showing with 48 additions and 35 deletions
src/views/system/dept/index.vue
<template> <template>
<div class="app-container"> <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"> <tree-table v-loading="loading" :expand-all="true" :data="data" :columns="columns" size="small">
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <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 <el-popover
v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_DELETE'])" v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_DELETE'])"
:ref="scope.row.id" :ref="scope.row.id"
......
src/views/system/dept/module/edit.vue
<template> <template>
<div> <div>
<el-button size="mini" type="success" @click="to">编辑</el-button> <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> </div>
</template> </template>
<script> <script>
...@@ -16,6 +16,10 @@ export default { ...@@ -16,6 +16,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
methods: { methods: {
......
src/views/system/dept/module/form.vue
...@@ -20,12 +20,10 @@ ...@@ -20,12 +20,10 @@
<script> <script>
import { add, edit, getDepts } from '@/api/dept' import { add, edit, getDepts } from '@/api/dept'
import initDict from '@/mixins/initDict'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
components: { Treeselect }, components: { Treeselect },
mixins: [initDict],
props: { props: {
isAdd: { isAdd: {
type: Boolean, type: Boolean,
...@@ -34,6 +32,10 @@ export default { ...@@ -34,6 +32,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
default: null default: null
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
...@@ -52,12 +54,6 @@ export default { ...@@ -52,12 +54,6 @@ export default {
} }
} }
}, },
created() {
this.$nextTick(() => {
// 加载数据字典
this.getDict('dept_status')
})
},
methods: { methods: {
cancel() { cancel() {
this.resetForm() this.resetForm()
......
src/views/system/dept/module/header.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="add">新增</el-button> @click="add">新增</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true" :dicts="dicts"/>
</div> </div>
</div> </div>
</template> </template>
...@@ -29,6 +29,10 @@ export default { ...@@ -29,6 +29,10 @@ export default {
query: { query: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
......
src/views/system/job/index.vue
<template> <template>
<div class="app-container"> <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 v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="name" label="名称"/> <el-table-column prop="name" label="名称"/>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <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 <el-popover
v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])" v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])"
:ref="scope.row.id" :ref="scope.row.id"
......
src/views/system/job/module/edit.vue
<template> <template>
<div> <div>
<el-button size="mini" type="success" @click="to">编辑</el-button> <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> </div>
</template> </template>
<script> <script>
...@@ -16,6 +16,10 @@ export default { ...@@ -16,6 +16,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
methods: { methods: {
......
src/views/system/job/module/form.vue
...@@ -26,10 +26,8 @@ import { getDepts } from '@/api/dept' ...@@ -26,10 +26,8 @@ import { getDepts } from '@/api/dept'
import { add, edit } from '@/api/job' import { add, edit } from '@/api/job'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import initDict from '@/mixins/initDict'
export default { export default {
components: { Treeselect }, components: { Treeselect },
mixins: [initDict],
props: { props: {
isAdd: { isAdd: {
type: Boolean, type: Boolean,
...@@ -38,6 +36,10 @@ export default { ...@@ -38,6 +36,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
default: null default: null
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
...@@ -61,12 +63,6 @@ export default { ...@@ -61,12 +63,6 @@ export default {
} }
} }
}, },
created() {
this.$nextTick(() => {
// 加载数据字典
this.getDict('job_status')
})
},
methods: { methods: {
cancel() { cancel() {
this.resetForm() this.resetForm()
......
src/views/system/job/module/header.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="add">新增</el-button> @click="add">新增</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true" :dicts="dicts"/>
</div> </div>
</div> </div>
</template> </template>
...@@ -29,6 +29,10 @@ export default { ...@@ -29,6 +29,10 @@ export default {
query: { query: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
......
src/views/system/user/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/> <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/>
</el-col> </el-col>
<el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20"> <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 v-loading="loading" :data="data" size="small" style="width: 100%;">
<el-table-column prop="username" label="用户名"/> <el-table-column prop="username" label="用户名"/>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="140" align="center"> <el-table-column label="操作" width="140" align="center">
<template slot-scope="scope"> <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 <el-popover
v-if="checkPermission(['ADMIN','USER_ALL','USER_DELETE'])" v-if="checkPermission(['ADMIN','USER_ALL','USER_DELETE'])"
:ref="scope.row.id" :ref="scope.row.id"
...@@ -85,7 +85,6 @@ export default { ...@@ -85,7 +85,6 @@ export default {
}, },
created() { created() {
this.getDeptDatas() this.getDeptDatas()
console.log(this.dicts)
this.$nextTick(() => { this.$nextTick(() => {
this.init() this.init()
// 加载数据字典 // 加载数据字典
......
src/views/system/user/module/edit.vue
<template> <template>
<div> <div>
<el-button size="mini" type="success" @click="to">编辑</el-button> <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> </div>
</template> </template>
<script> <script>
...@@ -17,6 +17,10 @@ export default { ...@@ -17,6 +17,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
methods: { methods: {
......
src/views/system/user/module/form.vue
...@@ -48,12 +48,10 @@ import { add, edit } from '@/api/user' ...@@ -48,12 +48,10 @@ import { add, edit } from '@/api/user'
import { getDepts } from '@/api/dept' import { getDepts } from '@/api/dept'
import { getAll } from '@/api/role' import { getAll } from '@/api/role'
import { getAllJob } from '@/api/job' import { getAllJob } from '@/api/job'
import initDict from '@/mixins/initDict'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default { export default {
components: { Treeselect }, components: { Treeselect },
mixins: [initDict],
props: { props: {
isAdd: { isAdd: {
type: Boolean, type: Boolean,
...@@ -62,6 +60,10 @@ export default { ...@@ -62,6 +60,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
default: null default: null
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
...@@ -96,10 +98,6 @@ export default { ...@@ -96,10 +98,6 @@ export default {
} }
}, },
created() { created() {
this.$nextTick(() => {
// 加载数据字典
this.getDict('user_status')
})
const explorer = navigator.userAgent const explorer = navigator.userAgent
if (explorer.indexOf('Chrome') >= 0) { if (explorer.indexOf('Chrome') >= 0) {
this.style = 'width: 184px' this.style = 'width: 184px'
......
src/views/system/user/module/header.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="add">新增</el-button> @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> </div>
<!-- 导出 --> <!-- 导出 -->
<el-button <el-button
...@@ -47,6 +47,10 @@ export default { ...@@ -47,6 +47,10 @@ export default {
sup_this: { sup_this: {
type: Object, type: Object,
required: true required: true
},
dicts: {
type: Array,
required: true
} }
}, },
data() { data() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment