From 137910cf4fc73a3a2787a3a02718f1e1f637c368 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 14 六月 2024 16:01:17 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
index ad401b3..e3a0696 100644
--- a/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
+++ b/src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue
@@ -3,15 +3,15 @@
<el-dialog
v-model="dialogVisible"
:title="state.title"
- width="500px"
+ width="550px"
:before-close="handleClose"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="110px" >
- <el-form-item label="姓名:" prop="name" v-if="state.title !== '修改密码'">
- <el-input v-model.trim="state.form.name" ></el-input>
+ <el-form-item label="姓名:" prop="name" v-if="state.title !== '修改密码'" >
+ <el-input v-model.trim="state.form.name" :disabled="disabled" ></el-input>
</el-form-item>
<el-form-item label="用户名:" prop="username" v-if="state.title !== '修改密码'">
- <el-input v-model.trim="state.form.username" ></el-input>
+ <el-input v-model.trim="state.form.username" :disabled="state.title =='编辑' || state.title =='查看'" ></el-input>
</el-form-item>
<el-form-item label="密码:" prop="password" v-if="state.title == '新增' || state.title == '修改密码'">
<el-input v-model.trim="state.form.password" type="password" show-password placeholder="请输入密码"></el-input>
@@ -19,17 +19,17 @@
<el-form-item label="重复密码:" prop="confirmPassword" v-if="state.title == '新增' || state.title == '修改密码'">
<el-input v-model.trim="state.form.confirmPassword" type="password" show-password placeholder="请输入确认密码"></el-input>
</el-form-item>
- <el-form-item label="手机号:" prop="phone" v-if="state.title !== '修改密码'">
- <el-input v-model.trim="state.form.phone" :maxlength="11" ></el-input>
+ <el-form-item label="手机号:" prop="phone" v-if="state.title !== '修改密码'" >
+ <el-input v-model.trim="state.form.phone" :maxlength="11" :disabled="disabled"></el-input>
</el-form-item>
<el-form-item label="账号类型:" v-if="state.title !== '修改密码'">
- <el-radio-group v-model="state.form.userType" >
+ <el-radio-group v-model="state.form.userType" :disabled="disabled">
<el-radio :label="0">工作人员</el-radio>
<el-radio :label="1">领导</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="管辖地区:" prop="manageRegion" v-if="state.title !== '修改密码'">
- <el-select v-model="state.form.manageRegion" class="m-2" placeholder="请选择" style="width:100%">
+ <el-select v-model="state.form.manageRegion" class="m-2" placeholder="请选择" style="width:100%" :disabled="disabled">
<el-option
v-for="item in state.areaList"
:key="item.id"
@@ -39,25 +39,26 @@
</el-select>
</el-form-item>
</el-form>
- <template #footer >
+ <template #footer v-if="state.title !='查看'">
<span class="dialog-footer">
<el-button @click="handleClose" size="default">取 消</el-button>
- <el-button type="primary" @click="onSubmit" size="default">确认</el-button>
+ <el-button type="primary" @click="onSubmit" size="default" v-preReClick>确认</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script setup>
-import {reactive, ref, toRefs, defineEmits} from 'vue'
+import {reactive, ref, toRefs, defineEmits, nextTick} from 'vue'
import { View } from "@element-plus/icons-vue";
import {ElMessage} from "element-plus";
import {verifyPhone, verifyPwd, verifyUsername} from "../../../../../utils/validate";
import { checkUserName, checkPhone } from "@/api/login"
import { getRegionTree } from "@/api/area"
-import { addMonitor, editMonitor } from "@/api/sysUsers"
+import {addMonitor, editMonitor, getUserById} from "@/api/sysUsers"
import {Base64} from "js-base64"
import {resetUserPwd} from "../../../../../api/sysUsers";
+import {getInstitutionDetail} from "@/api/backManage/insitution";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -78,7 +79,20 @@
if(!verifyPhone(value)){
callback(new Error('手机号格式有误'))
}else{
- checkPhone({phone:value,id: state.form.id}).then((res)=>{
+ let param = {}
+ if(state.title=='新增') {
+ param = {
+ phone:value,
+ identity: 0
+ }
+ }else if(state.title=='编辑'){
+ param = {
+ phone:value,
+ id: state.form.id,
+ identity: 0
+ }
+ }
+ checkPhone(param).then((res)=>{
if(res.data == false){
callback(new Error('该手机号已被绑定用户，请更换其他手机号'))
}else{
@@ -94,9 +108,20 @@
callback(new Error('请输入登录时用户名'))
}else{
if(!verifyUsername(value)){
- callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
+ callback(new Error('用户名须使用字母或数字，长度在5-16之间'))
}else{
- checkUserName({username:value,id: state.form.id}).then((res)=>{
+ let param = {}
+ if(state.title=='新增') {
+ param = {
+ username:value
+ }
+ }else if(state.title=='编辑'){
+ param = {
+ username:value,
+ id: state.form.id
+ }
+ }
+ checkUserName(param).then((res)=>{
if(res.data == false){
callback(new Error('用户名已被占用，请更换其他用户名'))
}else{
@@ -112,7 +137,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
@@ -143,15 +168,28 @@
})
-const openDialog = (type, value) => {
+const disabled = ref(false);
+const openDialog = async (type, value) => {
getArea()
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ;
- if(type === 'edit') {
- for(let i in state.form){
- if(validKey(i,value)){
- state.form[i] = value[i]
- }
- }
+ if(type === 'edit' || type === 'view') {
+ if( type === 'view'){
+ disabled.value = true;
+ }
+ const param = {
+ userId: value.id
+ }
+ const res = await getUserById(param);
+ if(res.code === 200){
+ state.form = res.data
+ }
+ // nextTick(() => {
+ // for(let i in state.form){
+ // if(validKey(i,value)){
+ // state.form[i] = value[i]
+ // }
+ // }
+ // })
}
if(type == 'pwd'){
state.form.id = value.id
@@ -186,6 +224,7 @@
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
+ state.form.userType = 0
superRef.value.clearValidate();
superRef.value.resetFields();
dialogVisible.value = false;
@@ -199,6 +238,7 @@
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
+ state.form.userType = 0
superRef.value.clearValidate();
superRef.value.resetFields();
dialogVisible.value = false;
@@ -224,6 +264,7 @@
}
const handleClose = () => {
+ state.form.userType = 0
superRef.value.clearValidate();
superRef.value.resetFields()
dialogVisible.value = false;
--
Gitblit v1.9.2