From 181a775aa573dff717437cc8a06aae297c774cea Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Sat, 6 May 2023 14:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/org.js   |  2 +-
 src/views/System/Org.vue | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/api/modules/org.js b/src/api/modules/org.js
index 0029fb7..ece13e3 100644
--- a/src/api/modules/org.js
+++ b/src/api/modules/org.js
@@ -19,7 +19,7 @@ export default {
   // 获取所有部门
   sysOrgList (data) {
     return request({
-      url: '/api/sys/org',
+      url: '/api/sys/org/page',
       method: 'GET',
       params: data
     })
diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue
index 79490b5..abee3ad 100644
--- a/src/views/System/Org.vue
+++ b/src/views/System/Org.vue
@@ -176,9 +176,18 @@ export default {
       this.q.pageNo = 1
       this.sysOrgList()
     },
+    // 多选用户
+    getSelectUser () {
+      const users = this.$refs.userTable.getCheckboxRecords()
+      if (!users.length) {
+        return this.$message.warning('请选择数据后在进行操作')
+      }
+      const ids = users.map(item => item.id).join(',')
+      this.deleteOrg(ids)
+    },
     // 获取所有用户
     sysOrgList () {
-      this.$api.user.sysOrgList(this.q).then(({ data }) => {
+      this.$api.org.sysOrgList(this.q).then(({ data }) => {
         this.tableData = data.records
         this.total = data.total
         this.q.pageNo = data.current
@@ -245,7 +254,7 @@ export default {
     // },
     // 删除
     deleteRow (row) {
-      this.deleteOrg(row.USID)
+      this.deleteOrg(row.id)
     },
     // 验证
     checkUserForm () {
@@ -288,12 +297,10 @@ export default {
     },
     // 新增用户
     sysOrgAddOrg () {
-      if (!this.checkUserForm()) return
+      // if (!this.checkUserForm()) return
       const data = JSON.parse(JSON.stringify(this.form))
-      data.orgName = this.$JSEncrypt(data.orgName)
-      // data.password = this.$JSEncrypt(data.password)
-      const jsonData = JSON.stringify(data)
-      this.$api.user.sysUserAddUser(Base64.encodeURI(jsonData)).then(_ => {
+
+      this.$api.org.sysOrgAddUser(data).then(_ => {
         this.$message.success('操作成功')
         this.dialogUser = false
         this.reset()
@@ -305,6 +312,7 @@ export default {
       this.form = {
         orgName: row.orgName, // 部门名称
         orgLevel: row.orgLevel, // 部门级别
+        orgCode: row.orgCode, // 部门级别
         supOrgCode: row.supOrgCode, // 父部门编码
         orgShortName: row.orgShortName, // 部门简称
         id: row.id, // ID
@@ -334,7 +342,7 @@ export default {
       if (!users.length) {
         return this.$message.warning('请选择数据后在进行操作')
       }
-      const ids = users.map(item => item.USID).join(',')
+      const ids = users.map(item => item.id).join(',')
       this.deleteUser(ids)
     },
     // 删除用户