邓洁 : 修改页面细节

src/views/system/user/index.vue

@@ -91,8 +91,8 @@
               <el-button type="text" size="mini"
                          @click="handleEdit(scope.row.userId)" >编辑
               </el-button>
-              <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除
-              </el-button>
+              <popover-delete :name="scope.row.userName" :type="'用户'"
+                              @delete="handleDelete(scope.row.userId)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -182,9 +182,9 @@
                   <div v-if="title=='新增用户'">
                     <el-option
                         v-for="item in postList"
-                        :key="item.postId"
-                        :label="item.postName"
-                        :value="item.postId"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
                     />
                   </div>
                   <div v-else>
@@ -207,9 +207,9 @@
                   <div v-if="title=='新增用户'">
                     <el-option
                         v-for="item in roleList"
-                        :key="item.roleId"
-                        :label="item.roleName"
-                        :value="item.roleId"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
                     />
                   </div>
                   <div v-else>
@@ -252,10 +252,10 @@
 <script setup>
 import {Search, Refresh, Plus, Edit, Delete} from "@element-plus/icons-vue";
 import {defineProps} from "vue";
-import {getRoleList} from "@/api/role/role";
+import {getRoleOption} from "@/api/role/role";
 import {getUserList, getUserDetail, addUser, editUser,deleteUser} from "@/api/user/user";
 import {getDeptList} from "@/api/dept/dept";
-import {getPostList} from "@/api/post/post";
+import {getSelectOption} from "@/api/post/post";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {useCacheStore} from "@/stores/cache.js";
 import Tag from '@/components/Tag.vue'
@@ -387,16 +387,16 @@ const getList = async () => {
   });
 };
 const getRole = () => {
-  getRoleList().then(res => {
+  getRoleOption().then(res => {
     if (res.code === 1000) {
-      roleList.value = res.data.rows;
+      roleList.value = res.data;
     }
   });
 };
 const getPost= async () => {
-  getPostList().then(res => {
+  getSelectOption().then(res => {
     if (res.code === 1000) {
-      postList.value = res.data.rows;
+      postList.value = res.data;
     }
   })
 }
@@ -471,13 +471,13 @@ const handleEdit = (userId) => {
   });
 };
 //删除功能
-const handleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning"
-  }).then(() => {
-    deleteUser(row.userId).then(res => {
+const handleDelete = (userId) => {
+  // ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
+  //   confirmButtonText: "确定",
+  //   cancelButtonText: "取消",
+  //   type: "warning"
+  // }).then(() => {
+    deleteUser(userId).then(res => {
       if (res.code === 1000) {
         ElMessage.success(res.msg);
         getList();
@@ -485,7 +485,7 @@ const handleDelete = (row) => {
         ElMessage.error(res.msg);
       }
     });
-  });
+  // });
 };
 
 //取消