From 0dfb988295a64f92ac8f66d4917d3894daba0814 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 24 二月 2023 08:41:57 +0800
Subject: [PATCH] 修改外包代码

---
 src/views/system/user/index.vue |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 06e520f..713c50e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -36,7 +36,11 @@
                     <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column prop="role.roleName" label="关联角色" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="positionId" label="职务" show-overflow-tooltip>
+                  <template #default="scope">
+                    {{ parseNumber(scope.row.positionId) }}
+                  </template>
+                </el-table-column>
                 <el-table-column prop="department.depName" label="部门" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
@@ -68,6 +72,7 @@
 import { ElMessageBox, ElMessage } from 'element-plus';
 import userDialog from '/@/views/system/user/component/userDialog.vue';
 import { userApi } from '/@/api/systemManage/user';
+import { dutyApi } from '/@/api/systemManage/duty';
 import { departmentApi } from '/@/api/systemManage/department';
 import { useRoleApi } from '/@/api/systemManage/role';
 
@@ -104,6 +109,7 @@
     };
     departmentList: [];
     roleList: [];
+    dutyList: [];
     props:{}
 }
 
@@ -129,6 +135,7 @@
             },
             departmentList: [],
             roleList: [],
+            dutyList: [],
             props: {
               label: 'depName',
               value: 'depId',
@@ -150,6 +157,10 @@
             }
         };
 
+        // 回显职务信息
+        const parseNumber = (value: number) => {
+            return state.dutyList.find((i) => i.positionId === value)?.positionName;
+        };
         const getDepartmentData = async () => {
             let res = await departmentApi().getDepartmentList();
             if (res.data.code === '200') {
@@ -174,9 +185,21 @@
             }
         };
 
+      const getDutyData = async () => {
+        let res = await dutyApi().getAllList({positionName: '',positionCode: ''});
+        if (res.data.code === '200') {
+          state.dutyList = res.data.data;
+        } else {
+          ElMessage({
+            type: 'warning',
+            message: res.data.msg
+          });
+        }
+      };
+
         // 打开新增修改用户弹窗
         const onOpenUserDialog = (type: string, value: any) => {
-            userRef.value.openDialog(type, value, state.departmentList, state.roleList);
+            userRef.value.openDialog(type, value, state.departmentList, state.roleList, state.dutyList);
         };
 
         // 删除用户
@@ -223,11 +246,13 @@
             initUserTableData();
             getDepartmentData();
             getRoleData();
+            getDutyData()
         });
         return {
             userRef,
             onOpenUserDialog,
             onRowDel,
+            parseNumber,
             onHandleSizeChange,
             initUserTableData,
             onHandleCurrentChange,

--
Gitblit v1.9.2