From 2da2f29c11dd54ad2829f0df291753a69e4e941c Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Fri, 5 May 2023 18:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E5=85=B8=E6=8E=A5=E5=8F=A3=20=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/dictionary.js                     | 5 +++--
 src/views/System/dataDictionary.vue               | 6 +++---
 src/views/reportProcess/components/reportForm.vue | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

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
         })