v1.9 发布,详情查看发行版说明

This commit is contained in:
zhengjie
2019-05-18 12:22:50 +08:00
parent f0255b5e33
commit 98fa128eda
56 changed files with 454 additions and 258 deletions

View File

@@ -26,11 +26,11 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150px" align="center">
<el-table-column v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT','USERJOB_DELETE'])" label="操作" width="130px" align="center">
<template slot-scope="scope">
<edit v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
<edit v-permission="['ADMIN','USERJOB_ALL','USERJOB_EDIT']" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
<el-popover
v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])"
v-permission="['ADMIN','USERJOB_ALL','USERJOB_DELETE']"
:ref="scope.row.id"
placement="top"
width="180">
@@ -39,7 +39,7 @@
<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
</div>
<el-button slot="reference" type="danger" size="mini">删除</el-button>
<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
</el-popover>
</template>
</el-table-column>

View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-button size="mini" type="success" @click="to">编辑</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
<eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
</div>
</template>

View File

@@ -5,11 +5,11 @@
<el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
<el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
</el-select>
<el-button class="filter-item" size="mini" type="primary" icon="el-icon-search" @click="toQuery">搜索</el-button>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;">
<el-button
v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_CREATE'])"
v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']"
class="filter-item"
size="mini"
type="primary"
@@ -21,7 +21,6 @@
</template>
<script>
import checkPermission from '@/utils/permission' // 权限判断函数
import eForm from './form'
export default {
components: { eForm },
@@ -44,7 +43,6 @@ export default {
}
},
methods: {
checkPermission,
add() {
this.$refs.form.getDepts()
this.$refs.form.dialog = true