diff --git a/src/api/modules/dictionary.js b/src/api/modules/dictionary.js index 1a818b8..e1e94a6 100644 --- a/src/api/modules/dictionary.js +++ b/src/api/modules/dictionary.js @@ -24,8 +24,9 @@ export default { }, delDic (data) { return request({ - url: '/api/sys/dict/'+data, - method: 'get', + url: '/api/sys/dict/delete', + method: 'delete', + params:data }) }, } diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue index 79902a1..8e4875f 100644 --- a/src/views/System/dataDictionary.vue +++ b/src/views/System/dataDictionary.vue @@ -174,7 +174,7 @@ export default { // }, // 删除 deleteRow (row) { - this.deleteUser(row.id) + this.deleteUser([row.id]) }, // 新增用户 sysUserAddUser () { @@ -224,7 +224,7 @@ export default { if (!users.length) { return this.$message.warning('请选择数据后在进行操作') } - const ids = users.map(item => item.id).join(',') + const ids = users.map(item => item.id) this.deleteUser(ids) }, // 删除用户 @@ -234,7 +234,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$api.dictionary.delDic(ids ).then(_ => { + this.$api.dictionary.delDic({ids:ids} ).then(_ => { this.$message.success('操作成功') this.sysUserList() }) diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 9f178f2..9a2a3c2 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -265,18 +265,19 @@ export default { if (this.$route.query.isBegin || this.$route.query.isDraft) { let list1 = this.listOne.map(item => { let obj = { - userId: item.id, + userId: item, power: 1 } return obj }) let list2 = this.listTwo.map(item => { let obj = { - userId: item.id, + userId: item, power: 2 } return obj }) + this.form.powerList=[...list1,...list2] this.dialogUser = false } else { //如果是发起人编辑节点 @@ -305,8 +306,8 @@ export default { let newlist = data.records.map(item => { let obj = { key: item.USID, - value: item.USNAME, - label: item.USNAME + value: item.USID, + label: item.USID } return obj })