From f3c1fee462027744014ae697d7b71dbe8d07add9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 11:49:50 +0800
Subject: [PATCH] 圈地打开页面移除表单验证；用户管理取消角色配置，平台配置，导入导出；修复删除用户后再添加新用户报错的问题
---
src/views/system/user.vue | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index a14cc6a..0e9f7a2 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -52,13 +52,13 @@
v-if="permission.user_delete"
@click="handleDelete">删 除
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="permission.user_role"
- icon="el-icon-user"
- @click="handleGrant">角色配置
- </el-button>
+<!-- <el-button type="info"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="permission.user_role"-->
+<!-- icon="el-icon-user"-->
+<!-- @click="handleGrant">角色配置-->
+<!-- </el-button>-->
<el-button type="info"
size="small"
plain
@@ -66,13 +66,13 @@
icon="el-icon-refresh"
@click="handleReset">密码重置
</el-button>
- <el-button type="info"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-setting"
- @click="handlePlatform">平台配置
- </el-button>
+<!-- <el-button type="info"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-setting"-->
+<!-- @click="handlePlatform">平台配置-->
+<!-- </el-button>-->
<el-button type="info"
size="small"
plain
@@ -80,20 +80,20 @@
icon="el-icon-coordinate"
@click="handleLock">账号解封
</el-button>
- <el-button type="success"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2"
- @click="handleImport">导入
- </el-button>
- <el-button type="warning"
- size="small"
- plain
- v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download"
- @click="handleExport">导出
- </el-button>
+<!-- <el-button type="success"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-upload2"-->
+<!-- @click="handleImport">导入-->
+<!-- </el-button>-->
+<!-- <el-button type="warning"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- v-if="userInfo.role_name.includes('admin')"-->
+<!-- icon="el-icon-download"-->
+<!-- @click="handleExport">导出-->
+<!-- </el-button>-->
</template>
<template slot-scope="{row}"
slot="tenantName">
@@ -243,7 +243,6 @@
callback();
}
};
-
const validatePhone = (rule, value, callback) => {
if (value){
if (!/^[1]([3-9])[0-9]{9}$/.test(value)) {
@@ -255,7 +254,6 @@
callback();
}
};
-
const validateEmail = (rule, value, callback) => {
const mal = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/
if (value){
@@ -268,7 +266,6 @@
callback()
}
};
-
return {
form: {},
search:{},
@@ -922,6 +919,9 @@
this.form['deptId'] = this.userInfo.dept_id;
this.form.roleId = this.form.roleId.join(",")
this.form.farmId = this.form.farmId.join(",")
+ if (!row.sex){
+ row.sex = 3
+ }
update(this.form).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -1087,7 +1087,9 @@
passwordColumn.display = true;
password2Column.display = true;
if(type == "add"&& column.dicData == ""){
- this.form = {}
+ this.form = {
+ id:null
+ }
this.initData(website.tenantId)
}
if (["edit", "view"].includes(type)) {
@@ -1108,6 +1110,10 @@
// this.form.postId = this.form.postId.split(",");
// }
});
+ }else {
+ this.form = {
+ id:null
+ }
}
this.initFlag = true;
done();
--
Gitblit v1.9.3