diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js index e1e94a6..dca2c9d 100644 --- a/src/api/modules/dictionary.js +++ b/src/api/modules/dictionary.js @@ -1,6 +1,7 @@ import { instance as request } from '@/utils/request' export default { + //外层 addDic (data) { return request({ url: '/api/sys/dict/add', @@ -29,4 +30,33 @@ export default { params:data }) }, + //内层 + addItemDic (data) { + return request({ + url: '/api/sys/dictItem/add', + method: 'post', + data + }) + }, + editItemDic (data) { + return request({ + url: '/api/sys/dictItem/edit', + method: 'put', + data + }) + }, + getItemDic (data) { + return request({ + url: '/api/sys/dictItem/page', + method: 'get', + params:data + }) + }, + delItemDic (data) { + return request({ + url: '/api/sys/dictItem/delete', + method: 'delete', + params:data + }) + }, } diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 8e4875f..b1d41cc 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -60,8 +60,8 @@
- - + + @@ -70,12 +70,12 @@ - - + + - - + +
@@ -107,6 +107,23 @@ export default { dicName:'', description:'' }, + formRule:{ + dicCode:[ + { + required:true, + message:'数据字典编码不能为空', + trigger:'change' + } + ], + dicName:[ + { + required:true, + message:'数据字典名称不能为空', + trigger:'change' + } + ], + + }, repassword: '', roleList: [] } @@ -148,6 +165,7 @@ export default { }, // 新增 add () { + this.mode = 'add' this.form = { dicCode:'', @@ -156,6 +174,10 @@ export default { } this.repassword = '' this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.dicRef.clearValidate() + + }) }, // // 启用/禁用 // sysUserIsUse (val, row) { @@ -174,23 +196,30 @@ export default { // }, // 删除 deleteRow (row) { - this.deleteUser([row.id]) + this.deleteUser(row.id) }, // 新增用户 sysUserAddUser () { - if(this.mode=='add'){ - this.$api.dictionary.addDic(this.form).then((res)=>{ - this.$message.success("新增成功") - this.sysUserList() - }) - }else{ - this.$api.dictionary.editDic(this.form).then((res)=>{ - this.$message.success("编辑成功") - this.sysUserList() - }) - } + this.$refs.dicRef.validate(v=>{ + if(v){ + if(this.mode=='add'){ + this.$api.dictionary.addDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.sysUserList() + }) + }else{ + this.$api.dictionary.editDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.sysUserList() + }) + } + + this.dialogUser = false + }else{ + this.$message.warning("请检查表单") + } + }) - this.dialogUser = false }, // 编辑查看用户 openRowData (mode, row) { @@ -200,7 +229,8 @@ export default { path:'/system/dicdeatil', query:{ id:this.$route.query.id, - pId:row.id + pId:row.id, + pName: row.dicName } }) }else if(mode=='add'){ @@ -224,7 +254,7 @@ export default { if (!users.length) { return this.$message.warning('请选择数据后在进行操作') } - const ids = users.map(item => item.id) + const ids = users.map(item => item.id).join(',') this.deleteUser(ids) }, // 删除用户 @@ -347,7 +377,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px; diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue index 1072adf..1c9b4b3 100644 --- a/src/views/System/dictionaryDetail.vue +++ b/src/views/System/dictionaryDetail.vue @@ -5,15 +5,15 @@
- {{dictionaryName}} - ddfdddd
+ {{dicName}} +
- +
@@ -39,9 +39,11 @@ {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }} - - - + + + + + @@ -69,21 +71,22 @@
- - - + + + + + + - - - - - + + - - + +
@@ -99,55 +102,105 @@ export default { name: 'standLawsAttrDetails', data(){ + const validateData= (rule, value, callback) =>{ + let test=/^[0-9]*$/ + if (!test.test(value)) { + callback(new Error('请输入数字值')); + }else{ + callback() + } + } return{ form:{ - + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'' }, total:0, q:{ pageNo:1, pageSize:10, - account:'' + itemName:'' }, tableData:[{inde:1}], mode:'', - dialogUser:false + dialogUser:false, + dicId:'', + dicName:'', + formRule:{ + itemName:[{ + required:true, + message:'选项不能为空', + trigger:'change' + }], + itemValue:[{ + required:true, + message:'选项值不能为空', + trigger:'change' + }], + itemOrder:[{ + required:true, + message:'排序不能为空', + trigger:'change' + },{ + validator:validateData, trigger:'change' + }], + } } }, + mounted() { + this.dicName=this.$route.query.pName + this.dicId=this.$route.query.pId + this.loadData() + }, methods:{ // 编辑查看用户 openRowData (mode, row) { this.mode = mode - this.form = { - account: row.ACCOUNT, // 用户名 - cellPhoneNumber: row.CELLPHONE_NUMBER, // 手机号 - department: row.DEPARTMENT, // 部门 - email: row.EMAIL, // 邮箱 - password: '', // 密码 - usid: row.USID, // 用户ID - usname: row.USNAME, // 姓名 - roleIdList: [row.ROLEID] // 角色 - } + this.form=JSON.parse(JSON.stringify(row)) this.dialogUser = true }, sysUserAddUser(){ + this.$refs.addForm.validate(v=>{ + if(v){ + if(this.mode=='add'){ + this.$api.dictionary.addItemDic(this.form).then((res)=>{ + this.$message.success("新增成功") + this.loadData() + }) + }else{ + this.$api.dictionary.editItemDic(this.form).then((res)=>{ + this.$message.success("编辑成功") + this.loadData() + }) + } + + this.dialogUser = false + }else{ + this.$message.warning("请检查表单") + } + }) + + }, // 新增 add () { this.mode = 'add' this.form = { - account: '', // 用户名 - cellPhoneNumber: '', // 手机号 - department: '', // 部门 - email: '', // 邮箱 - password: '', // 密码 - usid: '', - usname: '', // 姓名 - roleIdList: [''] // 角色 + itemName:'', + itemValue:'', + itemDescription:'', + itemOrder:'', + dicId:this.dicId } this.dialogUser = true + this.$nextTick(()=>{ + this.$refs.addForm.clearValidate() + + }) }, // 批量删除 getSelectUser () { @@ -169,9 +222,9 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.user.sysUserDelete({ ids }).then(_ => { + this.$api.dictionary.delItemDic({ ids }).then(_ => { this.$message.success('操作成功') - this.sysUserList() + this.loadData() }) }) }, @@ -184,7 +237,10 @@ export default { this.loadData() }, loadData(){ - + this.$api.dictionary.getItemDic({...this.q,dicId:this.dicId}).then((res)=>{ + this.tableData = res.data.records + this.total=res.data.total + }) }, search() { this.q.pageNo = 1 @@ -194,7 +250,8 @@ export default { this.q = { pageNo:1, pageSize:10, - account:'' + itemName:'', + dicId: this.dicId } this.loadData() }, @@ -312,7 +369,7 @@ export default { padding-right: 79px; .el-form-item { - margin-bottom: 10px; + //margin-bottom: 10px; .el-form-item__label { height: 36px;