From 07ca2d96c6f38a2a38f958d1771b6b9848f0ce0d Mon Sep 17 00:00:00 2001 From: zhouwenxuan <1175765986@qq.com> Date: 星期五, 15 十二月 2023 15:43:11 +0800 Subject: [PATCH] bug修改 --- src/layout/components/Register/index.vue | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue index a643b20..c834c95 100644 --- a/src/layout/components/Register/index.vue +++ b/src/layout/components/Register/index.vue @@ -227,6 +227,7 @@ <el-col :span="12"> <el-form-item prop="username" label="登录用户名(字母+数字,长度在5-16之间)"> <el-input + :disabled="state.title == '编辑'" v-model.trim="registerForm.username" size="large" placeholder="请输入登录用户名" @@ -276,6 +277,7 @@ type="primary" style="width:40%;margin: 0 auto" @click.prevent="handleRegister" + v-preReClick > <div v-if="state.title == '新增/注册'"> <span v-if="!loading">注 册</span> @@ -390,7 +392,18 @@ if(!verifyPhone(value)){ callback(new Error('手机号格式有误')) }else{ - checkPhone({phone:value}).then((res)=>{ + let param = {} + if(state.title=='新增/注册') { + param = { + phone:value + } + }else if(state.title=='编辑'){ + param = { + phone:value, + id: state.registerForm.id + } + } + checkPhone(param).then((res)=>{ if(res.data == false){ callback(new Error('该手机号已被绑定用户,请更换其他手机号')) }else{ @@ -410,7 +423,18 @@ if(!verifyUsername(value)){ callback(new Error('用户名须使用字母+数字,长度在5-16之间')) }else{ - checkUserName({username:value}).then((res)=>{ + let param = {} + if(state.title=='新增/注册') { + param = { + username:value + } + }else if(state.title=='编辑'){ + param = { + username:value, + id: state.registerForm.id + } + } + checkUserName(param).then((res)=>{ if(res.data == false){ callback(new Error('用户名已被占用,请更换其他用户名')) }else{ @@ -472,14 +496,16 @@ } getBusiness() - watchEffect(() => { - // 在副作用中调用 getArea() - getArea(); - }); + getArea() + // watchEffect(() => { + // // 在副作用中调用 getArea() + // getArea(); + // }); }) const isAbleEdit = ref(false); const openDialog=(type, value)=>{ state.title = type === 'add' ? '新增/注册' : type ==='edit' ? '编辑' : '查看' ; + getArea() if(type === 'edit' || type == 'view') { state.registerForm.id = value.id state.registerForm.username = value.username @@ -500,6 +526,8 @@ state.registerForm.agency[i] = info[i] } } + getArea() + state.registerForm.agency.business = info.business.split(',').map(Number) if(state.registerForm.agency.attribute === 0){ state.registerForm.agency.area = [info.city,info.district].filter(item => { return item && item.trim() }) @@ -616,10 +644,11 @@ if (valid) { loading.value = true; if(state.title == '新增/注册'){ - const {confirmPassword, ...data} = state.registerForm + const {confirmPassword,id, ...data} = JSON.parse(JSON.stringify(state.registerForm)) data.password = Base64.encode(data.password) data.agency.business = data.agency.business.join(',') delete data.agency.area + delete data.agency.id register(data).then(res => { if(res.code == 200){ const username = state.registerForm.username @@ -628,7 +657,9 @@ type: "success", }).then(() => { emit("getList") + dialogVisible.value = false + state.registerForm.agency.attribute = 0 proxy.$refs.registerRef.resetFields() proxy.$refs.registerRef.clearValidate() state.fileList = [] @@ -645,7 +676,7 @@ loading.value = false }) }else { - const {confirmPassword, ...data} = state.registerForm + const {confirmPassword, ...data} = JSON.parse(JSON.stringify(state.registerForm)) data.password = Base64.encode(data.password) console.log('data',data) data.agency.business = data.agency.business.join(',') @@ -659,6 +690,7 @@ }) emit("getList") dialogVisible.value = false + state.registerForm.agency.attribute = 0 proxy.$refs.registerRef.resetFields() proxy.$refs.registerRef.clearValidate() state.fileList = [] @@ -679,6 +711,7 @@ } const closeDialog = ()=>{ + state.registerForm.agency.attribute = 0 proxy.$refs.registerRef.resetFields() proxy.$refs.registerRef.clearValidate() state.fileList = [] -- Gitblit v1.9.2