1.7 优化

This commit is contained in:
zhengjie
2019-04-17 17:28:26 +08:00
parent 707f15d84b
commit ea183f380a
6 changed files with 69 additions and 53 deletions

View File

@@ -127,10 +127,10 @@ a:hover {
.logo-con{ .logo-con{
height: 60px; height: 60px;
padding: 12px 0px 0px; padding: 13px 0px 0px;
img{ img{
height: 35px; height: 32px;
width: 138px; width: 135px;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }

View File

@@ -61,10 +61,17 @@ export default {
doSubmit() { doSubmit() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.pid) {
this.loading = true this.loading = true
if (this.isAdd) { if (this.isAdd) {
this.doAdd() this.doAdd()
} else this.doEdit() } else this.doEdit()
} else {
this.$message({
message: '上级部门不能为空',
type: 'warning'
})
}
} }
}) })
}, },

View File

@@ -7,8 +7,8 @@
<el-form-item label="字典值"> <el-form-item label="字典值">
<el-input v-model="form.value" style="width: 370px;"/> <el-input v-model="form.value" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="排序"> <el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" style="width: 370px;"/> <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -42,11 +42,14 @@ export default {
id: '', id: '',
label: '', label: '',
value: '', value: '',
sort: '999' sort: 999
}, },
rules: { rules: {
label: [ label: [
{ required: true, message: '请输入字典标签', trigger: 'blur' } { required: true, message: '请输入字典标签', trigger: 'blur' }
],
sort: [
{ required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
] ]
} }
} }
@@ -110,6 +113,8 @@ export default {
} }
</script> </script>
<style scoped> <style rel="stylesheet/scss" lang="scss" scoped>
/deep/ .el-input-number .el-input__inner {
text-align: left;
}
</style> </style>

View File

@@ -5,7 +5,7 @@
<el-input v-model="form.name" style="width: 370px;"/> <el-input v-model="form.name" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model.number="form.sort" placeholder="序号越小越靠前" style="width: 370px;"/> <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item v-if="form.pid !== 0" label="状态" prop="enabled"> <el-form-item v-if="form.pid !== 0" label="状态" prop="enabled">
<el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in dicts" :key="item.id" v-model="form.enabled" :label="item.value">{{ item.label }}</el-radio>
@@ -68,22 +68,22 @@ export default {
this.resetForm() this.resetForm()
}, },
doSubmit() { doSubmit() {
this.form.dept.id = this.deptId
this.$refs['form'].validate((valid) => {
if (valid) {
if (this.deptId === null || this.deptId === undefined) { if (this.deptId === null || this.deptId === undefined) {
this.$message({ this.$message({
message: '所属部门不能为空', message: '所属部门不能为空',
type: 'warning' type: 'warning'
}) })
} else { } else {
this.form.dept.id = this.deptId
this.$refs['form'].validate((valid) => {
if (valid) {
this.loading = true this.loading = true
if (this.isAdd) { if (this.isAdd) {
this.doAdd() this.doAdd()
} else this.doEdit() } else this.doEdit()
} }
})
} }
})
}, },
doAdd() { doAdd() {
add(this.form).then(res => { add(this.form).then(res => {
@@ -137,6 +137,8 @@ export default {
} }
</script> </script>
<style scoped> <style rel="stylesheet/scss" lang="scss" scoped>
/deep/ .el-input-number .el-input__inner {
text-align: left;
}
</style> </style>

View File

@@ -18,7 +18,7 @@
<el-input v-model="form.name" placeholder="名称" style="width: 460px;"/> <el-input v-model="form.name" placeholder="名称" style="width: 460px;"/>
</el-form-item> </el-form-item>
<el-form-item label="菜单排序" prop="sort"> <el-form-item label="菜单排序" prop="sort">
<el-input v-model.number="form.sort" placeholder="序号越小越靠前" style="width: 460px;"/> <el-input-number v-model.number="form.sort" :min="0" :max="999" controls-position="right" style="width: 460px;"/>
</el-form-item> </el-form-item>
<el-form-item label="内部菜单" prop="iframe"> <el-form-item label="内部菜单" prop="iframe">
<el-radio v-model="form.iframe" label="false"></el-radio> <el-radio v-model="form.iframe" label="false"></el-radio>
@@ -141,6 +141,8 @@ export default {
} }
</script> </script>
<style scoped> <style rel="stylesheet/scss" lang="scss" scoped>
/deep/ .el-input-number .el-input__inner {
text-align: left;
}
</style> </style>

View File

@@ -110,6 +110,10 @@ export default {
this.resetForm() this.resetForm()
}, },
doSubmit() { doSubmit() {
this.form.dept.id = this.deptId
this.form.job.id = this.jobId
this.$refs['form'].validate((valid) => {
if (valid) {
if (this.deptId === null || this.deptId === undefined) { if (this.deptId === null || this.deptId === undefined) {
this.$message({ this.$message({
message: '部门不能为空', message: '部门不能为空',
@@ -126,10 +130,6 @@ export default {
type: 'warning' type: 'warning'
}) })
} else { } else {
this.form.dept.id = this.deptId
this.form.job.id = this.jobId
this.$refs['form'].validate((valid) => {
if (valid) {
this.loading = true this.loading = true
this.form.roles = [] this.form.roles = []
const _this = this const _this = this
@@ -140,11 +140,11 @@ export default {
if (this.isAdd) { if (this.isAdd) {
this.doAdd() this.doAdd()
} else this.doEdit() } else this.doEdit()
}
} else { } else {
return false return false
} }
}) })
}
}, },
doAdd() { doAdd() {
add(this.form).then(res => { add(this.form).then(res => {