yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gva-vue3-fedev' into last

Browse Source
This commit is contained in:
奇淼（piexlmax
2021-09-21 16:34:53 +08:00
committed by GitHub
parent d69243d720 c3480b3c49
commit cd576a1e02
42 changed files with 700 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/view/superAdmin/dictionary/sysDictionary.vue
+14 -10
View File
@@ -33,21 +33,21 @@
tooltip-effect="dark"
>
<el-table-column type="selection" width="55" />
<el-table-column label="日期" width="180">
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="字典名（中）" prop="name" width="240" />
<el-table-column align="center" label="字典名（中）" prop="name" width="160" />
<el-table-column label="字典名（英）" prop="type" width="180" />
<el-table-column align="center" label="字典名（英）" prop="type" width="120" />
<el-table-column label="状态" prop="status" width="120">
<el-table-column align="center" label="状态" prop="status" width="120">
<template #default="scope">{{ formatBoolean(scope.row.status) }}</template>
</el-table-column>
<el-table-column label="描述" prop="desc" width="280" />
<el-table-column align="center" label="描述" prop="desc" width="280" />
<el-table-column label="按钮组">
<el-table-column align="center" label="按钮组">
<template #default="scope">
<el-button size="mini" icon="el-icon-document" type="text" @click="toDetile(scope.row)">详情</el-button>
<el-button size="mini" icon="el-icon-edit" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
@@ -64,7 +64,10 @@
</template>
</el-table-column>
</el-table>
<warning-bar
title="获取字典且缓存方法已在前端utils/dictionary 已经封装完成 不必自己书写 使用方法查看文件内注释"
style="margin-top:12px"
/>
<div class="gva-pagination">
<el-pagination
:current-page="page"
@@ -108,10 +111,7 @@
<el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
</div>
</template>
</el-dialog>
<div style="margin-top:40px;color:red">获取字典且缓存方法已在前端utils/dictionary 已经封装完成 不必自己书写 使用方法查看文件内注释</div>
</div>
</template>
@@ -124,8 +124,12 @@ import {
getSysDictionaryList
} from '@/api/sysDictionary' // 此处请自行替换地址
import infoList from '@/mixins/infoList'
import warningBar from '@/components/warningBar/warningBar.vue'
export default {
name: 'SysDictionary',
components: {
warningBar
},
mixins: [infoList],
data() {
return {
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+6 -6
View File
@@ -31,21 +31,21 @@
tooltip-effect="dark"
>
<el-table-column type="selection" width="55" />
<el-table-column label="日期" width="180">
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="展示值" prop="label" width="120" />
<el-table-column align="center" label="展示值" prop="label" width="120" />
<el-table-column label="字典值" prop="value" width="120" />
<el-table-column align="center" label="字典值" prop="value" width="120" />
<el-table-column label="启用状态" prop="status" width="120">
<el-table-column align="center" label="启用状态" prop="status" width="120">
<template #default="scope">{{ formatBoolean(scope.row.status) }}</template>
</el-table-column>
<el-table-column label="排序标记" prop="sort" width="120" />
<el-table-column align="center" label="排序标记" prop="sort" width="120" />
<el-table-column label="按钮组">
<el-table-column align="center" label="按钮组">
<template #default="scope">
<el-button size="small" type="text" icon="el-icon-edit" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">