Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
893d5c68
提交
893d5c68
authored
5月 18, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 用户不选组织报错
上级
afc6563a
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
13 行增加
和
13 行删除
+13
-13
index.vue
frontend/src/views/system/menu/index.vue
+3
-3
index.vue
frontend/src/views/system/user/index.vue
+10
-10
没有找到文件。
frontend/src/views/system/menu/index.vue
浏览文件 @
893d5c68
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<svg-icon
:icon-class=
"scope.row.icon ? scope.row.icon : ''"
/>
<svg-icon
:icon-class=
"scope.row.icon ? scope.row.icon : ''"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"createTime"
:label=
"$t('menu.create_time')"
>
<el-table-column
prop=
"createTime"
:label=
"$t('menu.create_time')"
>
<
template
v-slot:default=
"scope"
>
<
template
v-slot:default=
"scope"
>
<span>
{{
scope
.
row
.
createTime
|
timestampFormatDate
}}
</span>
<span>
{{
scope
.
row
.
createTime
|
timestampFormatDate
}}
</span>
</
template
>
</
template
>
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
<el-input
v-model=
"form.title"
:placeholder=
"$t('menu.button_name')"
style=
"width: 179px;"
/>
<el-input
v-model=
"form.title"
:placeholder=
"$t('menu.button_name')"
style=
"width: 179px;"
/>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.type !== 0"
:label=
"$t('menu.authority_identification')"
prop=
"permission"
>
<el-form-item
v-show=
"form.type !== 0"
:label=
"$t('menu.authority_identification')"
prop=
"permission"
>
<el-input
v-model=
"form.permission"
:disabled=
"form.iframe || formType!=='add'"
:placeholder=
"$t('menu.authority_identification')"
style=
"width: 179px;"
/>
<el-input
v-model=
"form.permission"
:disabled=
"form.iframe || formType!=='add'"
:placeholder=
"$t('menu.authority_identification')"
style=
"width: 179px;"
/>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"form.type !== 2"
label=
"$t('menu.route_addr')"
prop=
"path"
>
<el-form-item
v-if=
"form.type !== 2"
label=
"$t('menu.route_addr')"
prop=
"path"
>
<el-input
v-model=
"form.path"
:placeholder=
"$t('menu.route_addr')"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
/>
<el-input
v-model=
"form.path"
:placeholder=
"$t('menu.route_addr')"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
/>
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
<el-input-number
v-model
.
number=
"form.menuSort"
:min=
"0"
:max=
"999"
controls-position=
"right"
style=
"width: 179px;"
/>
<el-input-number
v-model
.
number=
"form.menuSort"
:min=
"0"
:max=
"999"
controls-position=
"right"
style=
"width: 179px;"
/>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"!form.iframe && form.type === 1"
:label=
"$t('menu.module_name')"
prop=
"componentName"
>
<el-form-item
v-show=
"!form.iframe && form.type === 1"
:label=
"$t('menu.module_name')"
prop=
"componentName"
>
<el-input
v-model=
"form.componentName"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
:
placeholder=
"匹配组件内Name字段"
/>
<el-input
v-model=
"form.componentName"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
placeholder=
"匹配组件内Name字段"
/>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"!form.iframe && form.type === 1"
label=
"$t('menu.path')"
prop=
"component"
>
<el-form-item
v-show=
"!form.iframe && form.type === 1"
label=
"$t('menu.path')"
prop=
"component"
>
<el-input
v-model=
"form.component"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
:placeholder=
"$t('menu.path')"
/>
<el-input
v-model=
"form.component"
:disabled=
"formType!=='add'"
style=
"width: 179px;"
:placeholder=
"$t('menu.path')"
/>
...
...
frontend/src/views/system/user/index.vue
浏览文件 @
893d5c68
...
@@ -14,18 +14,18 @@
...
@@ -14,18 +14,18 @@
<!--
<fu-table-button
v-permission=
"['user:add']"
icon=
"el-icon-circle-plus-outline"
:label=
"$t('user.create')"
@
click=
"create"
/>
-->
<!--
<fu-table-button
v-permission=
"['user:add']"
icon=
"el-icon-circle-plus-outline"
:label=
"$t('user.create')"
@
click=
"create"
/>
-->
</
template
>
</
template
>
<el-table-column
prop=
"username"
:label=
"$t('commons.name')"
/>
<el-table-column
prop=
"username"
:label=
"$t('commons.name')"
/>
<el-table-column
prop=
"nickName"
:label=
"$t('commons.nick_name')"
/>
<el-table-column
prop=
"nickName"
:label=
"$t('commons.nick_name')"
/>
<el-table-column
prop=
"gender"
:label=
"$t('commons.gender')"
/>
<el-table-column
prop=
"gender"
:label=
"$t('commons.gender')"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"phone"
:label=
"$t('commons.phone')"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"phone"
:label=
"$t('commons.phone')"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"email"
:label=
"$t('commons.email')"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"email"
:label=
"$t('commons.email')"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"dept"
:label=
"$t('commons.organization')"
>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"dept"
:label=
"$t('commons.organization')"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
dept
.
deptName
}}
</div>
<div>
{{
scope
.
row
.
dept
&&
scope
.
row
.
dept
.
deptName
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"status"
:label=
"$t('commons.status')"
>
<el-table-column
prop=
"status"
:label=
"$t('commons.status')"
>
<
template
v-slot:default=
"scope"
>
<
template
v-slot:default=
"scope"
>
<el-switch
v-model=
"scope.row.enabled"
:active-value=
"1"
:inactive-value=
"0"
inactive-color=
"#DCDFE6"
@
change=
"changeSwitch(scope.row)"
/>
<el-switch
v-model=
"scope.row.enabled"
:active-value=
"1"
:inactive-value=
"0"
inactive-color=
"#DCDFE6"
@
change=
"changeSwitch(scope.row)"
/>
</
template
>
</
template
>
...
@@ -64,11 +64,11 @@
...
@@ -64,11 +64,11 @@
<el-form-item
:label=
"$t('commons.gender')"
>
<el-form-item
:label=
"$t('commons.gender')"
>
<el-radio-group
v-model=
"form.gender"
style=
"width: 178px"
>
<el-radio-group
v-model=
"form.gender"
style=
"width: 178px"
>
<el-radio
:label=
"$t('commons.man')"
>
{{ $t('commons.man') }}
</el-radio>
<el-radio
:label=
"$t('commons.man')"
>
{{ $t('commons.man') }}
</el-radio>
<el-radio
:label=
"$t('commons.woman')"
>
{{ $t('commons.woman') }}
</el-radio>
<el-radio
:label=
"$t('commons.woman')"
>
{{ $t('commons.woman') }}
</el-radio>
</el-radio-group>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('commons.status')"
>
<el-form-item
:label=
"$t('commons.status')"
>
<el-radio-group
v-model=
"form.enabled"
style=
"width: 140px"
>
<el-radio-group
v-model=
"form.enabled"
style=
"width: 140px"
>
<el-radio
:label=
"1"
>
{{ $t('commons.enable') }}
</el-radio>
<el-radio
:label=
"1"
>
{{ $t('commons.enable') }}
</el-radio>
<el-radio
:label=
"0"
>
{{ $t('commons.disable') }}
</el-radio>
<el-radio
:label=
"0"
>
{{ $t('commons.disable') }}
</el-radio>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论