Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
fanlin
2021-07-24 16:30:35 +08:00
11 changed files with 184 additions and 101 deletions
@@ -30,11 +30,11 @@
</div>
</el-card>
<div class="action-bar">
<el-button plain class="common-button-primary" v-btn-permission="'2c4366e07a5b707bf3d3f4985fb82662'" size="mini" @click="addList">调取</el-button>
<el-button plain class="common-button-primary" v-btn-permission="'63d9a5a8f7b6a4095511394a60013eac'" size="mini" @click="deleteList">批量删除</el-button>
<el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="addList">调取</el-button>
<el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除</el-button>
<el-button class="common-button-default export-button"
size="mini" @click="exportStandard"
v-btn-permission="'ec6b73db0edd6a379d3ea90af3849861'"
v-btn-permission="''"
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
icon="export"
>导出</el-button>