From a8ef7c1a4b2ab6acd91a0520e6258bd753d17f20 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 16 八月 2023 15:58:20 +0800
Subject: [PATCH] 人员证书类型

---
 src/views/system/user/index.vue |   75 ++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f60a998..9f0672f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -31,22 +31,22 @@
                 <el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="realName" label="真实姓名" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="gender" label="性别" show-overflow-tooltip>
-                  <template #default="scope">
-                    <el-tag type="success" v-if="scope.row.gender == 1">男</el-tag>
-                    <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
-                  </template>
-                </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="type" label="职务" show-overflow-tooltip>
                     <template #default="scope">
-                        {{ `${userTypeList.find(item => item.id === scope.row.type)?.name}` }}
+                        <el-tag type="success" v-if="scope.row.gender == 1">男</el-tag>
+                        <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
                     </template>
                 </el-table-column>
-                <el-table-column prop="department.depName" label="部门" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="positionId" label="职务" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.positions?.map(i=>i.positionName).join('、') }}
+                    </template>
+                </el-table-column>
+<!--                <el-table-column prop="type" label="职务" show-overflow-tooltip>-->
+<!--                    <template #default="scope">-->
+<!--                        {{ `${userTypeList.find(item => item.id === scope.row.type)?.name}` }}-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column prop="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>
                 <el-table-column prop="status" label="用户状态" show-overflow-tooltip>
@@ -56,9 +56,11 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
-                <el-table-column label="操作" width="100">
+                <el-table-column label="操作" width="200">
                     <template #default="scope">
+                        <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('查看', scope.row)">查看</el-button>
                         <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button>
+                        <el-button size="small" text type="primary" @click="onCertificate(scope.row)">证书管理</el-button>
                         <el-button style="color: red" :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
@@ -69,6 +71,7 @@
             <br />
         </el-card>
         <userDialog ref="userRef" @getUserList="initUserTableData" />
+        <dialog-certificate ref="ctfRef" @getUserList="initUserTableData"></dialog-certificate>
     </div>
 </template>
 
@@ -76,6 +79,7 @@
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import userDialog from '/@/views/system/user/component/userDialog.vue';
+import dialogCertificate from "/@/views/system/user/component/dialogCertificate.vue";
 import { userApi } from '/@/api/systemManage/user';
 import { dutyApi } from '/@/api/systemManage/duty';
 import { departmentApi } from '/@/api/systemManage/department';
@@ -121,9 +125,10 @@
 
 export default defineComponent({
     name: 'systemUser',
-    components: { userDialog },
+    components: { userDialog,dialogCertificate },
     setup() {
         const userRef = ref();
+        const ctfRef = ref()
         const state = reactive<TableDataState>({
             userTableData: {
                 data: [],
@@ -143,10 +148,10 @@
             roleList: [],
             dutyList: [],
             props: {
-              label: 'depName',
-              value: 'depId',
-              checkStrictly: true,
-              emitPath: false
+                label: 'depName',
+                value: 'depId',
+                checkStrictly: true,
+                emitPath: false
             },
             userTypeList: [
                 { id: 1, name: '超级管理员' },
@@ -196,22 +201,26 @@
             }
         };
 
-      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 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, state.dutyList);
         };
+
+        const onCertificate = (value: any)=>{
+          ctfRef.value.openDialog(value);
+        }
 
         // 删除用户
         const onRowDel = (row: TableDataRow) => {
@@ -250,10 +259,6 @@
         };
         // 页面加载时
         onMounted(() => {
-            let a = { name: 1, c: { name: 1 } };
-            let b = Object.assign({}, a);
-            b.c.name = 2;
-            console.log(a.c.name);
             initUserTableData();
             getDepartmentData();
             getRoleData();
@@ -261,7 +266,9 @@
         });
         return {
             userRef,
+            ctfRef,
             onOpenUserDialog,
+            onCertificate,
             onRowDel,
             parseNumber,
             onHandleSizeChange,

--
Gitblit v1.9.2