diff --git a/src/api/system/customer.js b/src/api/system/customer.js new file mode 100644 index 0000000..9a545c3 --- /dev/null +++ b/src/api/system/customer.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/customer', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/customer', + method: 'delete', + data: ids + }) +} + +export function enable(data) { + return request({ + url: 'api/customer', + method: 'put', + data + }) +} + +export default { add, enable, del } diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 45bf5f8..1bde4b1 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -1,88 +1,76 @@ \ No newline at end of file diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 239a7de..caac882 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -145,7 +145,7 @@ export default { data() { return { defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' }, - dateScopes: ['全部', '本级', '自定义'], level: 3, + dateScopes: ['全部', '本级'], level: 3, currentId: 0, menuLoading: false, showButton: false, menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用 permission: { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index ec784f7..67ec329 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -83,11 +83,12 @@ v-model="form.role" placeholder="请选择角色" @remove-tag="deleteTag" - @change="changeJob" + @change="changeRole" > @@ -201,7 +202,7 @@ - + @@ -247,7 +248,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' let userRoles = [] let userJobs = [] -const defaultForm = { id: null, username: null, nickName: null, enabled: 'false', password: null, phone: null, area: null, spot: null, role: null, intelligence: null, intelligenceFile: null } +const defaultForm = { id: null, username: null, nickName: null, enabled: 'false', password: null, phone: null, area: null, spot: null, role: null, intelligence: null, intelligenceFile: null, roles: [] } export default { name: 'User', components: { Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, @@ -305,18 +306,18 @@ export default { { required: true, message: '飞行资质不能为空', trigger: 'blur' } ], role: [ - { - validator: (rule, value, callback) => { - value = this.jobDatas - if (!value || value.length === 0) { - callback(new Error('请选择至少一个角色')) - } else { - callback() - } - }, - trigger: 'change' - }, - { required: true, message: '请选择至少一个角色', trigger: 'blur' } + // { + // validator: (rule, value, callback) => { + // value = this.jobDatas + // if (!value || value.length === 0) { + // callback(new Error('请选择至少一个角色')) + // } else { + // callback() + // } + // }, + // trigger: 'change' + // }, + { required: true, message: '角色不能为空', trigger: 'blur' } ] } } @@ -327,7 +328,7 @@ export default { ]) }, created() { - this.crud.msg.add = '新增成功,默认密码:123456' + this.crud.msg.add = '新增成功' }, mounted: function() { const that = this @@ -386,11 +387,14 @@ export default { } }, changeRole(value) { - userRoles = [] - value.forEach(function(data, index) { - const role = { id: data } - userRoles.push(role) - }) + // userRoles = [] + // value.forEach(function(data, index) { + // const role = { id: data } + // userRoles.push(role) + // }) + console.log(value); + userRoles = [{ id: value }]; + this.form.role = value; }, changeJob(value) { userJobs = [] @@ -436,6 +440,7 @@ export default { const rol = { id: role.id } userRoles.push(rol) }) + form.role = form.roles[0].id; form.jobs.forEach(function(job, index) { _this.jobDatas.push(job.id) const data = { id: job.id } @@ -444,7 +449,7 @@ export default { }, // 提交前做的操作 [CRUD.HOOK.afterValidateCU](crud) { - crud.form.roles = userRoles + crud.form.roles = [userRoles[0]] crud.form.jobs = userJobs console.log(this.jobDatas) return true