Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
b1413f02
Commit
b1413f02
authored
Jun 22, 2021
by
Ricky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加字典标签样式回显
parent
60c22b6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
117 additions
and
11 deletions
+117
-11
ruoyi-ui/src/components/DictTag/index.vue
ruoyi-ui/src/components/DictTag/index.vue
+51
-0
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/data.vue
+56
-6
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/dict/index.vue
+10
-5
No files found.
ruoyi-ui/src/components/DictTag/index.vue
0 → 100644
View file @
b1413f02
<
template
>
<div>
<template
v-for=
"(item, index) in options"
>
<template
v-if=
"values.includes(item.dictValue)"
>
<span
v-if=
"item.listClass == 'default' || item.listClass == ''"
:key=
"item.dictValue"
:index=
"index"
:class=
"item.cssClass"
>
{{
item
.
dictLabel
}}
</span
>
<el-tag
v-else
:key=
"item.dictValue"
:index=
"index"
:type=
"item.listClass == 'primary' ? '' : item.listClass"
:class=
"item.cssClass"
>
{{
item
.
dictLabel
}}
</el-tag>
</
template
>
</template>
</div>
</template>
<
script
>
export
default
{
name
:
"
DictTag
"
,
props
:
{
options
:
{
type
:
Array
,
default
:
null
,
},
value
:
[
String
,
Array
],
},
computed
:
{
values
()
{
if
(
this
.
value
)
{
return
Array
.
isArray
(
this
.
value
)
?
this
.
value
:
[
this
.
value
];
}
else
{
return
[];
}
},
},
};
</
script
>
<
style
scoped
>
.el-tag
+
.el-tag
{
margin-left
:
10px
;
}
</
style
>
\ No newline at end of file
ruoyi-ui/src/views/system/dict/data.vue
View file @
b1413f02
...
@@ -86,10 +86,19 @@
...
@@ -86,10 +86,19 @@
<el-table
v-loading=
"loading"
:data=
"dataList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
:data=
"dataList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
type=
"selection"
width=
"55"
align=
"center"
/>
<el-table-column
label=
"字典编码"
align=
"center"
prop=
"dictCode"
/>
<el-table-column
label=
"字典编码"
align=
"center"
prop=
"dictCode"
/>
<el-table-column
label=
"字典标签"
align=
"center"
prop=
"dictLabel"
/>
<el-table-column
label=
"字典标签"
align=
"center"
prop=
"dictLabel"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.listClass == '' || scope.row.listClass == 'default'"
>
{{
scope
.
row
.
dictLabel
}}
</span>
<el-tag
v-else
:type=
"scope.row.listClass == 'primary' ? '' : scope.row.listClass"
>
{{
scope
.
row
.
dictLabel
}}
</el-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"字典键值"
align=
"center"
prop=
"dictValue"
/>
<el-table-column
label=
"字典键值"
align=
"center"
prop=
"dictValue"
/>
<el-table-column
label=
"字典排序"
align=
"center"
prop=
"dictSort"
/>
<el-table-column
label=
"字典排序"
align=
"center"
prop=
"dictSort"
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
:formatter=
"statusFormat"
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"statusOptions"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -136,9 +145,22 @@
...
@@ -136,9 +145,22 @@
<el-form-item
label=
"数据键值"
prop=
"dictValue"
>
<el-form-item
label=
"数据键值"
prop=
"dictValue"
>
<el-input
v-model=
"form.dictValue"
placeholder=
"请输入数据键值"
/>
<el-input
v-model=
"form.dictValue"
placeholder=
"请输入数据键值"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"样式属性"
prop=
"cssClass"
>
<el-input
v-model=
"form.cssClass"
placeholder=
"请输入样式属性"
/>
</el-form-item>
<el-form-item
label=
"显示排序"
prop=
"dictSort"
>
<el-form-item
label=
"显示排序"
prop=
"dictSort"
>
<el-input-number
v-model=
"form.dictSort"
controls-position=
"right"
:min=
"0"
/>
<el-input-number
v-model=
"form.dictSort"
controls-position=
"right"
:min=
"0"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"回显样式"
prop=
"listClass"
>
<el-select
v-model=
"form.listClass"
>
<el-option
v-for=
"item in listClassOptions"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-form-item
label=
"状态"
prop=
"status"
>
<el-radio-group
v-model=
"form.status"
>
<el-radio-group
v-model=
"form.status"
>
<el-radio
<el-radio
...
@@ -163,9 +185,14 @@
...
@@ -163,9 +185,14 @@
<
script
>
<
script
>
import
{
listData
,
getData
,
delData
,
addData
,
updateData
,
exportData
}
from
"
@/api/system/dict/data
"
;
import
{
listData
,
getData
,
delData
,
addData
,
updateData
,
exportData
}
from
"
@/api/system/dict/data
"
;
import
{
listType
,
getType
}
from
"
@/api/system/dict/type
"
;
import
{
listType
,
getType
}
from
"
@/api/system/dict/type
"
;
// 字典标签组件(使用频繁可在全局挂载)
import
DictTag
from
'
@/components/DictTag
'
export
default
{
export
default
{
name
:
"
Data
"
,
name
:
"
Data
"
,
components
:
{
DictTag
},
data
()
{
data
()
{
return
{
return
{
// 遮罩层
// 遮罩层
...
@@ -190,6 +217,33 @@ export default {
...
@@ -190,6 +217,33 @@ export default {
title
:
""
,
title
:
""
,
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
// 数据标签回显样式
listClassOptions
:
[
{
value
:
"
default
"
,
label
:
"
默认
"
},
{
value
:
"
primary
"
,
label
:
"
主要
"
},
{
value
:
"
success
"
,
label
:
"
成功
"
},
{
value
:
"
info
"
,
label
:
"
信息
"
},
{
value
:
"
warning
"
,
label
:
"
警告
"
},
{
value
:
"
danger
"
,
label
:
"
危险
"
}
],
// 状态数据字典
// 状态数据字典
statusOptions
:
[],
statusOptions
:
[],
// 类型数据字典
// 类型数据字典
...
@@ -250,10 +304,6 @@ export default {
...
@@ -250,10 +304,6 @@ export default {
this
.
loading
=
false
;
this
.
loading
=
false
;
});
});
},
},
// 数据状态字典翻译
statusFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
statusOptions
,
row
.
status
);
},
// 取消按钮
// 取消按钮
cancel
()
{
cancel
()
{
this
.
open
=
false
;
this
.
open
=
false
;
...
...
ruoyi-ui/src/views/system/dict/index.vue
View file @
b1413f02
...
@@ -123,7 +123,11 @@
...
@@ -123,7 +123,11 @@
</router-link>
</router-link>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
:formatter=
"statusFormat"
/>
<el-table-column
label=
"状态"
align=
"center"
prop=
"status"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:options=
"statusOptions"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"备注"
align=
"center"
prop=
"remark"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -190,9 +194,14 @@
...
@@ -190,9 +194,14 @@
<
script
>
<
script
>
import
{
listType
,
getType
,
delType
,
addType
,
updateType
,
exportType
,
refreshCache
}
from
"
@/api/system/dict/type
"
;
import
{
listType
,
getType
,
delType
,
addType
,
updateType
,
exportType
,
refreshCache
}
from
"
@/api/system/dict/type
"
;
// 字典标签组件(使用频繁可在全局挂载)
import
DictTag
from
'
@/components/DictTag
'
export
default
{
export
default
{
name
:
"
Dict
"
,
name
:
"
Dict
"
,
components
:
{
DictTag
},
data
()
{
data
()
{
return
{
return
{
// 遮罩层
// 遮罩层
...
@@ -257,10 +266,6 @@ export default {
...
@@ -257,10 +266,6 @@ export default {
}
}
);
);
},
},
// 字典状态字典翻译
statusFormat
(
row
,
column
)
{
return
this
.
selectDictLabel
(
this
.
statusOptions
,
row
.
status
);
},
// 取消按钮
// 取消按钮
cancel
()
{
cancel
()
{
this
.
open
=
false
;
this
.
open
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment