From e9de4a0bdf5043ba5069e67307a049b96191f68f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Jul 2021 20:48:28 +0800
Subject: [PATCH] 问题修复
---
src/views/examination/examination.vue | 114 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/src/views/examination/examination.vue b/src/views/examination/examination.vue
index 88d2eb7..a7d9a4b 100644
--- a/src/views/examination/examination.vue
+++ b/src/views/examination/examination.vue
@@ -25,7 +25,7 @@
size="small"
plain
icon="el-icon-delete"
- v-if="permission.user_delete"
+ v-if="permission.examination_delete"
@click="handleDelete">删 除
</el-button>
</template>
@@ -45,6 +45,13 @@
slot="userTypeName">
<el-tag>{{row.userTypeName}}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="examination_type">
+ <el-tag
+ >{{
+ row.examination_type == "0" ? "正常" : row.examination_type == "1" ? "异常" : "异常"
+ }}
+ </el-tag>
+ </template>
<template slot-scope="{ row }" slot="online_status">
<el-tag
>{{
@@ -52,6 +59,8 @@
}}
</el-tag>
</template>
+
+
</avue-crud>
<el-dialog title="用户角色配置"
append-to-body
@@ -130,7 +139,7 @@
add,
grant,
resetPassword
- } from "@/api/system/user";
+ } from "@/api/system/examination";
import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
@@ -208,25 +217,28 @@
search: true,
display: false
},
+ // {
+ // label: "所属客户",
+ // prop: "tenantName",
+ // slot: true,
+ // display: false,
+ // width:200
+ // },
{
- label: "所属客户",
- prop: "tenantName",
- slot: true,
- display: false,
- width:200
- },
- {
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
search: true,
display: false
},
{
- label: "用户照片",
- prop: "avatar",
- display: false,
- type: 'upload',
- listType: 'picture-img',
+ label: "性别",
+ prop: "sexName",
+ display: false
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ display: false
},
{
label: "所属角色",
@@ -235,7 +247,7 @@
display: false
},
{
- label: "所属部门",
+ label: "工作单位",
prop: "deptName",
slot: true,
display: false,
@@ -244,13 +256,23 @@
{
label: "审查状态",
- prop: "userTypeNames",
+ prop: "examination_type",
slot: true,
- display: false
+ search: true,
+ display: false,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ }]
}, {
- label: "审查描述",
- prop: "online_statusss",
- slot: true,
+ label: "审查明细",
+ prop: "examination_mx",
display: false
},
{
@@ -267,26 +289,26 @@
prop: 'baseInfo',
icon: 'el-icon-user-solid',
column: [
- {
- label: "所属客户",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属租户",
- trigger: "click"
- }],
- span: 24,
- },
+ // {
+ // label: "所属客户",
+ // prop: "tenantId",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/tenant/select",
+ // props: {
+ // label: "tenantName",
+ // value: "tenantId"
+ // },
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入所属租户",
+ // trigger: "click"
+ // }],
+ // span: 24,
+ // },
{
label: "登录账号",
prop: "account",
@@ -608,10 +630,10 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(this.permission.user_view, false),
- delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false)
+ addBtn: this.vaildData(this.permission.examination_add, true),
+ viewBtn: this.vaildData(this.permission.examination_view, false),
+ delBtn: this.vaildData(this.permission.examination_delete, true),
+ editBtn: this.vaildData(this.permission.examination_edit, true)
};
},
platformPermissionList() {
@@ -619,7 +641,7 @@
addBtn: false,
viewBtn: false,
delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false)
+ editBtn: this.vaildData(this.permission.examination_edit, false)
};
},
ids() {
--
Gitblit v1.9.3