Skip to content

N
NLT-e-cigarette
Commit eabb927d authored by 张伯涛's avatar 张伯涛
Browse files
Options

系统管理弹窗新增表单修改

parent 61a19100
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 218 deletions
src/views/system/dept/index.vue
View file @ eabb927d
...@@ -176,73 +176,73 @@ ...@@ -176,73 +176,73 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col v-if="form.parentId !== 0" :span="24"> <el-col v-if="form.parentId !== 0" :span="24">
<el-form-item label="上级部门" prop="parentId"> <el-form-item class="labelHeight" label="上级部门" prop="parentId">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>上级部门</div> <div class="labelName">上级部门</div>
<div>Superior Dept</div> <div class="labelName">Superior Dept</div>
</div> </div>
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" /> <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="部门名称" prop="deptName"> <el-form-item class="labelHeight" label="部门名称" prop="deptName">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>部门名称</div> <div class="labelName">部门名称</div>
<div>Dept Name</div> <div class="labelName">Dept Name</div>
</div> </div>
<el-input v-model.trim="form.deptName" placeholder="请输入部门名称" /> <el-input v-model.trim="form.deptName" placeholder="请输入部门名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门编码" prop="deptCode"> <el-form-item class="labelHeight" label="部门编码" prop="deptCode">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>部门编码</div> <div class="labelName">部门编码</div>
<div>Dept Number</div> <div class="labelName">Dept Number</div>
</div> </div>
<el-input v-model.trim="form.deptCode" placeholder="请输入部门编码" maxlength="20" /> <el-input v-model.trim="form.deptCode" placeholder="请输入部门编码" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门排序" prop="orderNum"> <el-form-item class="labelHeight" label="部门排序" prop="orderNum">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" style="position: relative;bottom: 17px" class="labelClassRequired">
<div>部门排序</div> <div class="labelName">部门排序</div>
<div>Dept Sort</div> <div class="labelName">Dept Sort</div>
</div> </div>
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" /> <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="负责人" prop="leader"> <el-form-item class="labelHeight" label="负责人" prop="leader">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>负责人</div> <div class="labelName">负责人</div>
<div>Leader</div> <div class="labelName">Leader</div>
</div> </div>
<el-input v-model.trim="form.leader" placeholder="请输入负责人" maxlength="20" /> <el-input v-model.trim="form.leader" placeholder="请输入负责人" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" prop="phone"> <el-form-item class="labelHeight" label="联系电话" prop="phone">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>联系电话</div> <div class="labelName">联系电话</div>
<div>Phone</div> <div class="labelName">Phone</div>
</div> </div>
<el-input v-model.trim="form.phone" placeholder="请输入联系电话" show-word-limit maxlength="11" /> <el-input v-model.trim="form.phone" placeholder="请输入联系电话" show-word-limit maxlength="11" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item class="labelHeight" label="邮箱" prop="email">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>邮箱</div> <div class="labelName">邮箱</div>
<div>Email</div> <div class="labelName">Email</div>
</div> </div>
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="50" /> <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门状态"> <el-form-item class="labelHeight" label="部门状态">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>部门状态</div> <div class="labelName">部门状态</div>
<div>dept Status</div> <div class="labelName">dept Status</div>
</div> </div>
<!-- <el-radio-group v-model="form.flag">--> <!-- <el-radio-group v-model="form.flag">-->
<!-- <el-radio label="0">正常</el-radio>--> <!-- <el-radio label="0">正常</el-radio>-->
...@@ -552,8 +552,20 @@ export default { ...@@ -552,8 +552,20 @@ export default {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
} }
.labelName{
display: flex;
justify-content: end;
}
.labelClass{ .labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center; text-align: center;
position: relative;
bottom: 17px;
right: 13px;
} }
} }
</style> </style>
src/views/system/dict/data.vue
View file @ eabb927d
...@@ -200,21 +200,41 @@ ...@@ -200,21 +200,41 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog class="dataAddDialog" :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型"> <el-form-item class="labelHeight" label="字典类型" prop="dictType">
<div slot="label" class="labelClass">
<div class="labelName">字典类型</div>
<div class="labelName">Dict Type</div>
</div>
<el-input v-model.trim="form.dictType" :disabled="true" show-word-limit maxlength="30" placeholder="请输入字典类型" /> <el-input v-model.trim="form.dictType" :disabled="true" show-word-limit maxlength="30" placeholder="请输入字典类型" />
</el-form-item> </el-form-item>
<el-form-item label="参数标签" prop="dictLabel"> <el-form-item class="labelHeight" label="参数标签" prop="dictLabel">
<div slot="label" class="labelClassRequired">
<div class="labelName">参数标签</div>
<div class="labelName">Dict Label</div>
</div>
<el-input v-model.trim="form.dictLabel" show-word-limit maxlength="30" placeholder="请输入参数标签" /> <el-input v-model.trim="form.dictLabel" show-word-limit maxlength="30" placeholder="请输入参数标签" />
</el-form-item> </el-form-item>
<el-form-item label="参数键值" prop="dictValue"> <el-form-item class="labelHeight" label="参数键值" prop="dictValue">
<div slot="label" class="labelClassRequired">
<div class="labelName">参数键值</div>
<div class="labelName">Dict Value</div>
</div>
<el-input v-model.trim="form.dictValue" show-word-limit maxlength="300" placeholder="请输入参数键值" /> <el-input v-model.trim="form.dictValue" show-word-limit maxlength="300" placeholder="请输入参数键值" />
</el-form-item> </el-form-item>
<el-form-item label="参数排序" prop="dictSort"> <el-form-item class="labelHeight" label="参数排序" prop="dictSort">
<div slot="label" class="labelClassRequired">
<div class="labelName">参数排序</div>
<div class="labelName">Dict Sort</div>
</div>
<el-input-number v-model="form.dictSort" style="width: 100%" controls-position="right" :min="0" /> <el-input-number v-model="form.dictSort" style="width: 100%" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="参数状态" prop="status"> <el-form-item class="labelHeight" label="参数状态" prop="status">
<div slot="label" class="labelClass">
<div class="labelName">参数状态</div>
<div class="labelName">Status</div>
</div>
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions.filter(item => { return item.dictValue })" v-for="dict in statusOptions.filter(item => { return item.dictValue })"
...@@ -223,7 +243,11 @@ ...@@ -223,7 +243,11 @@
>{{ dict.dictLabel }}</el-radio> >{{ dict.dictLabel }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remarks"> <el-form-item class="labelHeight" label="备注" prop="remarks">
<div slot="label" class="labelClass">
<div class="labelName">备注</div>
<div class="labelName">Remarks</div>
</div>
<el-input v-model.trim="form.remarks" type="textarea" show-word-limit maxlength="200" placeholder="请输入内容" /> <el-input v-model.trim="form.remarks" type="textarea" show-word-limit maxlength="200" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -519,4 +543,29 @@ export default { ...@@ -519,4 +543,29 @@ export default {
flex-direction: row; flex-direction: row;
} }
} }
.dataAddDialog{
.labelHeight{
.el-form-item__label{
height: 34px;
}
}
.el-form-item--small .el-form-item__label{
line-height: 17px;
}
.labelName{
display: flex;
justify-content: end;
}
.labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center;
position: relative;
bottom: 17px;
right: 13px;
}
}
</style> </style>
src/views/system/dict/index.vue
View file @ eabb927d
...@@ -102,12 +102,12 @@ ...@@ -102,12 +102,12 @@
@click="handleDelete" @click="handleDelete"
>删除 Delete >删除 Delete
</el-button> </el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- v-hasPermi="['sys:dict:export']"--> <!-- v-hasPermi="['sys:dict:export']"-->
<!-- type="success"--> <!-- type="success"-->
<!-- size="small"--> <!-- size="small"-->
<!-- @click="handleExport"--> <!-- @click="handleExport"-->
<!-- >导出 Export</el-button>--> <!-- >导出 Export</el-button>-->
</div> </div>
<div class="mb12 font-small-bold" style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</div> <div class="mb12 font-small-bold" style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</div>
<el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
...@@ -211,24 +211,24 @@ ...@@ -211,24 +211,24 @@
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog class="dictDialog" title="字典信息" :visible.sync="open" width="60%" append-to-body @close="reset"> <el-dialog class="dictDialog" title="字典信息" :visible.sync="open" width="60%" append-to-body @close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="130px"> <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="字典名称" prop="dictName"> <el-form-item class="labelHeight" label="字典名称" prop="dictName">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>字典名称</div> <div class="labelName">字典名称</div>
<div>Dict Name</div> <div class="labelName">Dict Name</div>
</div> </div>
<el-input v-model.trim="form.dictName" :maxlength="30" placeholder="请输入字典名称" /> <el-input v-model.trim="form.dictName" :maxlength="30" placeholder="请输入字典名称" />
</el-form-item> </el-form-item>
<el-form-item label="字典类型" prop="dictType"> <el-form-item class="labelHeight" label="字典类型" prop="dictType">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>字典类型</div> <div class="labelName">字典类型</div>
<div>Dict Type</div> <div class="labelName">Dict Type</div>
</div> </div>
<el-input v-model.trim="form.dictType" :maxlength="30" placeholder="请输入字典类型" /> <el-input v-model.trim="form.dictType" :maxlength="30" placeholder="请输入字典类型" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="flag"> <el-form-item class="labelHeight" label="状态" prop="flag">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>状态</div> <div class="labelName">状态</div>
<div>Status</div> <div class="labelName">Status</div>
</div> </div>
<el-radio-group v-model="form.flag"> <el-radio-group v-model="form.flag">
<el-radio <el-radio
...@@ -239,10 +239,10 @@ ...@@ -239,10 +239,10 @@
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="父字典名称"> <el-form-item class="labelHeight" label="父字典名称">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>父字典名称</div> <div class="labelName">父字典名称</div>
<div>Parent Dict Name</div> <div class="labelName">Parent Dict Name</div>
</div> </div>
<el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @change="getOptions"> <el-select v-model="form.parentId" style="width: 100%" clearable placeholder="请选择父字典类型" @change="getOptions">
<el-option <el-option
...@@ -268,10 +268,10 @@ ...@@ -268,10 +268,10 @@
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remarks"> <el-form-item class="labelHeight" label="备注" prop="remarks">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>备注</div> <div class="labelName">备注</div>
<div>Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model.trim="form.remarks" maxlength="200" type="textarea" placeholder="请输入内容" /> <el-input v-model.trim="form.remarks" maxlength="200" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
...@@ -661,8 +661,20 @@ export default { ...@@ -661,8 +661,20 @@ export default {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
} }
.labelName{
display: flex;
justify-content: end;
}
.labelClass{ .labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center; text-align: center;
position: relative;
bottom: 17px;
right: 13px;
} }
} }
</style> </style>
src/views/system/menu/index.vue
View file @ eabb927d
...@@ -162,10 +162,10 @@ ...@@ -162,10 +162,10 @@
<el-form ref="form" :model="form" :rules="rules" label-width="130px"> <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="上级菜单" prop="parentId"> <el-form-item class="labelHeight" label="上级菜单" prop="parentId">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>上级菜单</div> <div class="labelName">上级菜单</div>
<div>Superior Menu</div> <div class="labelName">Superior Menu</div>
</div> </div>
<treeselect <treeselect
v-model="form.parentId" v-model="form.parentId"
...@@ -180,10 +180,10 @@ ...@@ -180,10 +180,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="菜单类型" prop="menuType"> <el-form-item class="labelHeight" label="菜单类型" prop="menuType">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>菜单类型</div> <div class="labelName">菜单类型</div>
<div>Menu Type</div> <div class="labelName">Menu Type</div>
</div> </div>
<el-radio-group v-model="form.menuType"> <el-radio-group v-model="form.menuType">
<el-radio label="M">目录</el-radio> <el-radio label="M">目录</el-radio>
...@@ -193,10 +193,10 @@ ...@@ -193,10 +193,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="form.menuType !== 'F'" label="菜单图标"> <el-form-item v-if="form.menuType !== 'F'" class="labelHeight" label="菜单图标">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>菜单图标</div> <div class="labelName">菜单图标</div>
<div>Menu Icon</div> <div class="labelName">Menu Icon</div>
</div> </div>
<el-popover <el-popover
placement="bottom-start" placement="bottom-start"
...@@ -219,37 +219,37 @@ ...@@ -219,37 +219,37 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="菜单名称" prop="menuName"> <el-form-item class="labelHeight" label="菜单名称" prop="menuName">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>菜单名称</div> <div class="labelName">菜单名称</div>
<div>Menu Name</div> <div class="labelName">Menu Name</div>
</div> </div>
<el-input v-model="form.menuName" style="width: 95%" show-word-limit maxlength="60" placeholder="请输入菜单名称" /> <el-input v-model="form.menuName" style="width: 95%" show-word-limit maxlength="60" placeholder="请输入菜单名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="菜单排序" prop="orderNum"> <el-form-item class="labelHeight" label="菜单排序" prop="orderNum">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>菜单排序</div> <div class="labelName">菜单排序</div>
<div>Menu Sort</div> <div class="labelName">Menu Sort</div>
</div> </div>
<el-input-number v-model="form.orderNum" style="width: 88%" controls-position="right" :min="0" /> <el-input-number v-model="form.orderNum" style="width: 88%" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="form.menuType !== 'M'" label="权限标识"> <el-form-item v-if="form.menuType !== 'M'" class="labelHeight" label="权限标识">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>权限标识</div> <div class="labelName">权限标识</div>
<div>Limit</div> <div class="labelName">Limit</div>
</div> </div>
<el-input v-model.trim="form.perms" style="width: 95%" show-word-limit maxlength="50" placeholder="请权限标识" /> <el-input v-model.trim="form.perms" style="width: 95%" show-word-limit maxlength="50" placeholder="请权限标识" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="margin-right: 1px"> <el-col :span="12" style="margin-right: 1px">
<el-form-item v-if="form.menuType !== 'F'" label="是否外链"> <el-form-item v-if="form.menuType !== 'F'" class="labelHeight" label="是否外链">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>是否外链</div> <div class="labelName">是否外链</div>
<div>External Chain</div> <div class="labelName">External Chain</div>
</div> </div>
<el-radio-group v-model="form.isFrame"> <el-radio-group v-model="form.isFrame">
<el-radio label="0">是</el-radio> <el-radio label="0">是</el-radio>
...@@ -257,23 +257,23 @@ ...@@ -257,23 +257,23 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12" style="margin-right: -1px">--> <!-- <el-col :span="12" style="margin-right: -1px">-->
<!-- <el-form-item v-if="form.menuType !== 'F'" label="是工作流">--> <!-- <el-form-item v-if="form.menuType !== 'F'" label="是工作流">-->
<!-- <div slot="label" class="labelClass">--> <!-- <div slot="label" class="labelClass">-->
<!-- <div>是工作流</div>--> <!-- <div>是工作流</div>-->
<!-- <div>Workflow</div>--> <!-- <div>Workflow</div>-->
<!-- </div>--> <!-- </div>-->
<!-- <el-radio-group v-model="form.isProcess">--> <!-- <el-radio-group v-model="form.isProcess">-->
<!-- <el-radio label="0">是</el-radio>--> <!-- <el-radio label="0">是</el-radio>-->
<!-- <el-radio label="1">否</el-radio>--> <!-- <el-radio label="1">否</el-radio>-->
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.menuType !== 'F'" label="显示状态"> <el-form-item v-if="form.menuType !== 'F'" class="labelHeight" label="显示状态">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>显示状态</div> <div class="labelName">显示状态</div>
<div>Display Status</div> <div class="labelName">Display Status</div>
</div> </div>
<el-radio-group v-model="form.visible"> <el-radio-group v-model="form.visible">
<el-radio label="1">显示</el-radio> <el-radio label="1">显示</el-radio>
...@@ -282,10 +282,10 @@ ...@@ -282,10 +282,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.menuType !== 'F'" label="菜单状态"> <el-form-item v-if="form.menuType !== 'F'" class="labelHeight" label="菜单状态">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>菜单状态</div> <div class="labelName">菜单状态</div>
<div>Menu Status</div> <div class="labelName">Menu Status</div>
</div> </div>
<el-radio-group v-model="form.flag"> <el-radio-group v-model="form.flag">
<el-radio label="1">启用</el-radio> <el-radio label="1">启用</el-radio>
...@@ -294,29 +294,29 @@ ...@@ -294,29 +294,29 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="width: 100%;"> <el-col :span="12" style="width: 100%;">
<el-form-item v-if="form.menuType !== 'F'" label="路由地址" prop="path"> <el-form-item v-if="form.menuType !== 'F'" class="labelHeight" label="路由地址" prop="path">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" style="position: relative;bottom: 17px" class="labelClassRequired">
<div>路由地址</div> <div class="labelName">路由地址</div>
<div>Route Address</div> <div class="labelName">Route Address</div>
</div> </div>
<el-input v-model.trim="form.path" style="width: 95%" show-word-limit maxlength="100" placeholder="请输入路由地址" /> <el-input v-model.trim="form.path" style="width: 95%" show-word-limit maxlength="100" placeholder="请输入路由地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item v-if="form.menuType !== 'F' && form.isProcess==='0'" label="工作流">--> <!-- <el-form-item v-if="form.menuType !== 'F' && form.isProcess==='0'" label="工作流">-->
<!-- <div slot="label" class="labelClass">--> <!-- <div slot="label" class="labelClass">-->
<!-- <div>工作流</div>--> <!-- <div>工作流</div>-->
<!-- <div>Workflow</div>--> <!-- <div>Workflow</div>-->
<!-- </div>--> <!-- </div>-->
<!-- <el-select v-model="form.processId" clearable placeholder="请选择工作流">--> <!-- <el-select v-model="form.processId" clearable placeholder="请选择工作流">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in workFlows"--> <!-- v-for="item in workFlows"-->
<!-- :key="item.businessId"--> <!-- :key="item.businessId"-->
<!-- :label="item.processName"--> <!-- :label="item.processName"-->
<!-- :value="item.processKey"--> <!-- :value="item.processKey"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
<el-col v-if="form.menuType === 'C'" :span="12"> <el-col v-if="form.menuType === 'C'" :span="12">
<el-form-item label="组件路径" prop="component"> <el-form-item label="组件路径" prop="component">
...@@ -683,8 +683,20 @@ export default { ...@@ -683,8 +683,20 @@ export default {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
} }
.labelName{
display: flex;
justify-content: end;
}
.labelClass{ .labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center; text-align: center;
position: relative;
bottom: 17px;
right: 13px;
} }
} }
</style> </style>
src/views/system/role/index.vue
View file @ eabb927d
...@@ -176,31 +176,31 @@ ...@@ -176,31 +176,31 @@
<!-- 添加或修改角色配置对话框 --> <!-- 添加或修改角色配置对话框 -->
<el-dialog class="roleAddDialog" title="角色信息" :visible.sync="open" width="60%" append-to-body> <el-dialog class="roleAddDialog" title="角色信息" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="角色名称" prop="roleName"> <el-form-item class="labelHeight" label="角色名称" prop="roleName">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>角色名称</div> <div class="labelName">角色名称</div>
<div>Role Name</div> <div class="labelName">Role Name</div>
</div> </div>
<el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入角色名称" /> <el-input v-model.trim="form.roleName" show-word-limit :maxlength="30" placeholder="请输入角色名称" />
</el-form-item> </el-form-item>
<el-form-item label="权限字符" prop="roleKey"> <el-form-item class="labelHeight" label="权限字符" prop="roleKey">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>权限字符</div> <div class="labelName">权限字符</div>
<div>Limit</div> <div class="labelName">Limit</div>
</div> </div>
<el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" /> <el-input v-model.trim="form.roleKey" show-word-limit :maxlength="30" placeholder="请输入权限字符" />
</el-form-item> </el-form-item>
<el-form-item label="角色排序" prop="roleSort"> <el-form-item class="labelHeight" label="角色排序" prop="roleSort">
<div slot="label" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>角色排序</div> <div class="labelName">角色排序</div>
<div>Role Sort</div> <div class="labelName">Role Sort</div>
</div> </div>
<el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" /> <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="角色状态"> <el-form-item class="labelHeight" label="角色状态" prop="flag">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>角色状态</div> <div class="labelName">角色状态</div>
<div>Role Status</div> <div class="labelName">Role Status</div>
</div> </div>
<el-radio-group v-model="form.flag"> <el-radio-group v-model="form.flag">
<el-radio <el-radio
...@@ -210,10 +210,10 @@ ...@@ -210,10 +210,10 @@
>{{ dict.dictLabel }}</el-radio> >{{ dict.dictLabel }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="菜单权限"> <el-form-item class="labelHeight" label="菜单权限" prop="flag">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>菜单权限</div> <div class="labelName">菜单权限</div>
<div>Menu Limit</div> <div class="labelName">Menu Limit</div>
</div> </div>
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox> <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox> <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
...@@ -229,10 +229,10 @@ ...@@ -229,10 +229,10 @@
:props="defaultProps" :props="defaultProps"
/> />
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item class="labelHeight" label="备注" prop="remark">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>备注</div> <div class="labelName">备注</div>
<div>Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" /> <el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
...@@ -776,8 +776,20 @@ export default { ...@@ -776,8 +776,20 @@ export default {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
} }
.labelName{
display: flex;
justify-content: end;
}
.labelClass{ .labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center; text-align: center;
position: relative;
bottom: 17px;
right: 13px;
} }
} }
.el-divider--vertical{ .el-divider--vertical{
......
src/views/system/user/index.vue
View file @ eabb927d
...@@ -255,19 +255,19 @@ ...@@ -255,19 +255,19 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item class="labelHeight" label="姓名" prop="name">
<div slot="label" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>姓名</div> <div class="labelName">姓名</div>
<div>Name</div> <div class="labelName">Name</div>
</div> </div>
<el-input v-model="form.name" placeholder="请输入用户昵称" /> <el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户性别"> <el-form-item class="labelHeight" label="用户性别" prop="sex">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>用户性别</div> <div class="labelName">用户性别</div>
<div>User Gender</div> <div class="labelName">User Gender</div>
</div> </div>
<el-select v-model="form.sex" style="width: 100%" placeholder="请选择"> <el-select v-model="form.sex" style="width: 100%" placeholder="请选择">
<el-option <el-option
...@@ -282,10 +282,10 @@ ...@@ -282,10 +282,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item class="labelHeight" label="手机号码" prop="phone">
<div slot="label" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>手机号码</div> <div class="labelName">手机号码</div>
<div>Phone Number</div> <div class="labelName">Phone Number</div>
</div> </div>
<el-input <el-input
v-model.trim="form.phone" v-model.trim="form.phone"
...@@ -296,10 +296,10 @@ ...@@ -296,10 +296,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item class="labelHeight" label="邮箱" prop="email">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>邮箱</div> <div class="labelName">邮箱</div>
<div>Mailbox</div> <div class="labelName">Mailbox</div>
</div> </div>
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" /> <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item> </el-form-item>
...@@ -308,18 +308,18 @@ ...@@ -308,18 +308,18 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.businessId == undefined" class="labelHeight" label="工号" prop="username"> <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="工号" prop="username">
<div slot="label" style="position: relative;bottom: 17px" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>工号</div> <div class="labelName">工号</div>
<div>B/N</div> <div class="labelName">B/N</div>
</div> </div>
<el-input v-model="form.username" placeholder="请输入登录名" /> <el-input v-model="form.username" placeholder="请输入登录名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idNumber"> <el-form-item class="labelHeight" label="身份证号" prop="idNumber">
<div slot="label" class="labelClass"> <div slot="label" class="labelClassRequired">
<div>身份证号</div> <div class="labelName">身份证号</div>
<div>ID Number</div> <div class="labelName">ID Number</div>
</div> </div>
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" /> <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item> </el-form-item>
...@@ -329,17 +329,17 @@ ...@@ -329,17 +329,17 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item class="labelHeight" label="班组" prop="nltBz"> <el-form-item class="labelHeight" label="班组" prop="nltBz">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>班组</div> <div class="labelName">班组</div>
<div>Group</div> <div class="labelName">Group</div>
</div> </div>
<el-input v-model="form.nltBz" placeholder="请输入班组" /> <el-input v-model="form.nltBz" placeholder="请输入班组" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="劳务" prop="nltLw"> <el-form-item class="labelHeight" label="劳务" prop="nltLw">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>劳务</div> <div class="labelName">劳务</div>
<div>Labour</div> <div class="labelName">Labour</div>
</div> </div>
<el-input v-model.trim="form.nltLw" placeholder="请输入劳务" maxlength="18" /> <el-input v-model.trim="form.nltLw" placeholder="请输入劳务" maxlength="18" />
</el-form-item> </el-form-item>
...@@ -349,17 +349,17 @@ ...@@ -349,17 +349,17 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item class="labelHeight" label="职位" prop="nltBz"> <el-form-item class="labelHeight" label="职位" prop="nltBz">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>职位</div> <div class="labelName">职位</div>
<div>Position</div> <div class="labelName">Position</div>
</div> </div>
<el-input v-model="form.nltPosition" placeholder="请输入职位" /> <el-input v-model="form.nltPosition" placeholder="请输入职位" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="入职日期" prop="nltStartDate"> <el-form-item class="labelHeight" label="入职日期" prop="nltStartDate">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>入职日期</div> <div class="labelName">入职日期</div>
<div>Start Date</div> <div class="labelName">Start Date</div>
</div> </div>
<el-date-picker <el-date-picker
v-model.trim="form.nltStartDate" v-model.trim="form.nltStartDate"
...@@ -373,10 +373,10 @@ ...@@ -373,10 +373,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.businessId == undefined" label="状态"> <el-form-item class="labelHeight" v-if="form.businessId == undefined" label="状态" prop="flag">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>状态</div> <div class="labelName">状态</div>
<div>Status</div> <div class="labelName">Status</div>
</div> </div>
<el-radio-group v-model="form.flag"> <el-radio-group v-model="form.flag">
<el-radio <el-radio
...@@ -387,47 +387,55 @@ ...@@ -387,47 +387,55 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="部门" prop="postId">--> <!-- <el-form-item label="部门" prop="postId">-->
<!-- <div slot="label" class="labelClass">--> <!-- <div slot="label" class="labelClass">-->
<!-- <div>部门</div>--> <!-- <div>部门</div>-->
<!-- <div>Dept</div>--> <!-- <div>Dept</div>-->
<!-- </div>--> <!-- </div>-->
<!-- <el-cascader--> <!-- <el-cascader-->
<!-- v-model="form.deptId"--> <!-- v-model="form.deptId"-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
<!-- clearable--> <!-- clearable-->
<!-- :show-all-levels="false"--> <!-- :show-all-levels="false"-->
<!-- :options="deptTreeData"--> <!-- :options="deptTreeData"-->
<!-- placeholder="请选择部门"--> <!-- placeholder="请选择部门"-->
<!-- :props="{--> <!-- :props="{-->
<!-- multiple: true,--> <!-- multiple: true,-->
<!-- checkStrictly: true,--> <!-- checkStrictly: true,-->
<!-- expandTrigger: 'hover',--> <!-- expandTrigger: 'hover',-->
<!-- value: 'id',--> <!-- value: 'id',-->
<!-- label: 'label',--> <!-- label: 'label',-->
<!-- children: 'children' }"--> <!-- children: 'children' }"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="部门：" prop="parentId"> <el-form-item class="labelHeight" label="部门：" prop="parentId">
<treeSelect <div slot="label" class="labelClass">
v-model="form.deptId" <div class="labelName">部门</div>
:disable-branch-nodes="false" <div class="labelName">Dept</div>
:options="deptOptions" </div>
:show-count="true" <treeSelect
placeholder="请选择归属部门" v-model="form.deptId"
@input="changeValue" :disable-branch-nodes="false"
/> :options="deptOptions"
</el-form-item> :show-count="true"
</el-col> placeholder="请选择归属部门"
@input="changeValue"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="角色：" prop="roleList"> <el-form-item class="labelHeight" label="角色：" prop="roleList">
<div slot="label" class="labelClass">
<div class="labelName">角色</div>
<div class="labelName">Role</div>
</div>
<el-select v-model="form.roleList" multiple placeholder="请选择角色"> <el-select v-model="form.roleList" multiple placeholder="请选择角色">
<el-option <el-option
v-for="(item,index) in roleOptions" v-for="(item,index) in roleOptions"
...@@ -441,10 +449,10 @@ ...@@ -441,10 +449,10 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item class="labelHeight" label="备注">
<div slot="label" class="labelClass"> <div slot="label" class="labelClass">
<div>备注</div> <div class="labelName">备注</div>
<div>Remarks</div> <div class="labelName">Remarks</div>
</div> </div>
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
...@@ -579,7 +587,7 @@ export default { ...@@ -579,7 +587,7 @@ export default {
} }
var name = (rule, value, callback) => { var name = (rule, value, callback) => {
if (!value) { if (!value) {
return callback(new Error('请输入用户类型')) return callback(new Error('请输入姓名'))
} else { } else {
callback() callback()
} }
...@@ -700,14 +708,14 @@ export default { ...@@ -700,14 +708,14 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
username: [ username: [
{ required: true, message: '请输入登录名', trigger: 'blur' } { required: true, message: '请输入工号', trigger: 'blur' }
], ],
// nickName: [ // nickName: [
// { required: false, message: '请输入用户昵称', trigger: 'blur' }, // { required: false, message: '请输入用户昵称', trigger: 'blur' },
// { validator: trueGroupName, message: '请输入正确的用户昵称' } // { validator: trueGroupName, message: '请输入正确的用户昵称' }
// ], // ],
deptId: [ deptId: [
{ required: false, message: '请输入归属部门', trigger: 'blur' } { required: true, message: '请输入归属部门', trigger: 'blur' }
], ],
password: [ password: [
{ required: true, message: '请输入用户密码', trigger: 'blur' }, { required: true, message: '请输入用户密码', trigger: 'blur' },
...@@ -718,7 +726,7 @@ export default { ...@@ -718,7 +726,7 @@ export default {
} }
], ],
name: [ name: [
{ require: true, message: '用户姓名不能为空', trigger: 'blur' }, { required: true, message: '用户姓名不能为空', trigger: 'blur' },
{ validator: name, trigger: 'blur' } { validator: name, trigger: 'blur' }
], ],
email: [ email: [
...@@ -735,7 +743,7 @@ export default { ...@@ -735,7 +743,7 @@ export default {
{ validator: passwordCheck, trigger: 'blur' } { validator: passwordCheck, trigger: 'blur' }
], ],
phone: [ phone: [
{ required: false, message: '请输入手机号码', trigger: 'blur' }, { required: true, message: '请输入手机号码', trigger: 'blur' },
{ {
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码', message: '请输入正确的手机号码',
...@@ -744,7 +752,7 @@ export default { ...@@ -744,7 +752,7 @@ export default {
{ validator: phone, trigger: 'blur' } { validator: phone, trigger: 'blur' }
], ],
idNumber: [ idNumber: [
{ require: true, message: '请输入身份证号', trigger: 'blur' }, { required: true, message: '请输入身份证号', trigger: 'blur' },
{ min: 18, max: 18, message: '长度18字符', trigger: 'blur' }, { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
{ validator: idNumber, trigger: 'blur' } { validator: idNumber, trigger: 'blur' }
] ]
...@@ -1212,8 +1220,20 @@ export default { ...@@ -1212,8 +1220,20 @@ export default {
.el-form-item--small .el-form-item__label{ .el-form-item--small .el-form-item__label{
line-height: 17px; line-height: 17px;
} }
.labelName{
display: flex;
justify-content: end;
}
.labelClass{ .labelClass{
position: relative;
right: 13px;
text-align: center;
}
.labelClassRequired{
text-align: center; text-align: center;
position: relative;
bottom: 17px;
right: 13px;
} }
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment