From 8f1ef4dc7ee7fb957683a00cfbb1d6132a9c44c9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 8 Apr 2022 18:30:35 +0800
Subject: [PATCH] BUG 28975

---
 .../AppAccountXiushan/AppAccountXiushan.vue   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
index fb9d8c91..4ca28eb3 100644
--- a/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
+++ b/project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue
@@ -27,9 +27,9 @@
           </el-table-column>
           <el-table-column slot="options" align="center" label="操作" fixed="right" width="160px">
             <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
-              <el-button v-if="$permissions('admin_sysuser_distribute')"
-                         type="text" @click="appAllot(row)">功能分配
+              <el-button v-if="permissions('admin_sysuser_distribute')" type="text" @click="appAllot(row)">功能分配
               </el-button>
+              <el-button v-if="permissions('admin_sysuser_del')" type="text" @click="handleDelete(row.id)">删除</el-button>
             </el-row>
           </el-table-column>
         </ai-table>
@@ -55,22 +55,20 @@
     <ai-dialog title="功能分配" :visible.sync="dialog" width="800px" @open="initDialogData" @onConfirm="updateAccount">
       <el-form ref="updateAccountForm" :model="dialogForm" :rules="rules" size="small"
                label-width="120px">
+        <el-form-item label="姓名" prop="name">
+          <el-input placeholder="请输入姓名" v-model="dialogForm.name" clearable/>
+        </el-form-item>
         <el-form-item required label="角色" prop="roleId">
-          <el-select size="small" placeholder="请选择角色" :value="dialogForm.roleId" filterable
-                     v-model="dialogForm.roleId" clearable>
-            <el-option v-for="(op,i) in accountRoles" :key="i" :label="op.name" :value="op.id"/>
-          </el-select>
+          <ai-select placeholder="请选择角色" action="/admin/role-acc/list-all" :instance="instance"
+                     v-model="dialogForm.roleId" :prop="{label:'name'}"/>
         </el-form-item>
         <el-form-item label="行政地区" prop="areaId">
           <ai-area-get v-model="dialogForm.areaId" :instance="instance" :name.sync="dialogForm.areaName"
                        root="500241000000" showAll/>
         </el-form-item>
-        <el-form-item label="党组织" prop="organizationId" v-if="user.info.organizationId">
-          <el-cascader :options="partyOrgOps" v-model="dialogForm.organizationId"
-                       :props="cascaderProps" :show-all-levels="false" clearable/>
-        </el-form-item>
-        <!--        <el-form-item label="职务" prop="position">-->
-        <!--          <el-input placeholder="请输入职务" v-model="dialogForm.position" clearable/>-->
+        <!--        <el-form-item label="党组织" prop="organizationId" v-if="user.info.organizationId">-->
+        <!--          <el-cascader :options="partyOrgOps" v-model="dialogForm.organizationId"-->
+        <!--                       :props="cascaderProps" :show-all-levels="false" clearable/>-->
         <!--        </el-form-item>-->
       </el-form>
     </ai-dialog>
@@ -130,7 +128,6 @@ export default {
   data() {
     return {
       condition: "",
-      accountRoles: [],
       page: {current: 1, size: 10, total: 0},
       dialog: false,
       dialogForm: {},
@@ -171,15 +168,7 @@ export default {
     },
     initDialogData() {
       //用于优化初始化数据
-      this.getAccountRoles()
-      this.searchSysAll()
-    },
-    getAccountRoles() {
-      this.accountRoles.length == 0 && this.instance.post("/admin/role-acc/list-all").then(res => {
-        if (res?.data) {
-          this.accountRoles = res.data
-        }
-      })
+      // this.searchSysAll()
     },
     batchAllot() {
       this.dialog = true
@@ -243,6 +232,18 @@ export default {
           })
         }
       })
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该账号?").then(() => {
+        this.instance.post("/user/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
     }
   },
   created() {