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

This commit is contained in:
zhengjie
2019-04-11 16:16:52 +08:00
parent 59bf825d88
commit 0731e1e9ca
12 changed files with 48 additions and 35 deletions

View File

@@ -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">
@@ -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"

View File

@@ -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>
@@ -16,6 +16,10 @@ export default {
sup_this: {
type: Object,
required: true
},
dicts: {
type: Array,
required: true
}
},
methods: {

View File

@@ -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()

View File

@@ -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() {