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/layout/components/Register/index.vue | 129 +++++++++++++++++++++++++++++++++++-------
1 files changed, 106 insertions(+), 23 deletions(-)
diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue
index a643b20..e419bde 100644
--- a/src/layout/components/Register/index.vue
+++ b/src/layout/components/Register/index.vue
@@ -139,6 +139,18 @@
</el-row>
<el-row :gutter="30">
<el-col :span="8">
+ <el-form-item prop="agency.certPath" label="资质证书">
+ <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'证书')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='state.imgLimit' v-model:file-list="state.certList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'证书')" >
+ <el-icon><Plus /></el-icon>
+ <template #tip>
+ <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="8">
<el-form-item prop="agency.assetValue" label="固定资产总值">
<el-input
v-model="registerForm.agency.assetValue"
@@ -193,8 +205,8 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="8">
- <el-form-item prop="agency.reportPath" label="加盖公章的《机构信息上报表》">
+ <el-col :span="24">
+ <el-form-item prop="agency.reportPath" label="加盖公章的《机构信息上报表》(请上传加盖公章的营业执照)">
<!-- <el-upload-->
<!-- v-model:file-list="state.fileList"-->
<!-- class="upload-demo"-->
@@ -213,7 +225,7 @@
<!-- </div>-->
<!-- </template>-->
<!-- </el-upload>-->
- <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='state.imgLimit' v-model:file-list="state.fileList" list-type="picture-card" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
+ <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,'上报表')" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='state.imgLimit' v-model:file-list="state.fileList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,'上报表')" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>
@@ -227,6 +239,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="请输入登录用户名"
@@ -245,7 +258,7 @@
</el-row>
<el-row :gutter="30" v-if="state.title == '新增/注册'">
<el-col :span="12">
- <el-form-item prop="password" label="密码">
+ <el-form-item prop="password" label="密码(字母+数字+特殊字符，长度在6-16之间)">
<el-input
v-model.trim="registerForm.password"
type="password"
@@ -276,6 +289,7 @@
type="primary"
style="width:40%;margin: 0 auto"
@click.prevent="handleRegister"
+ v-preReClick
>
<div v-if="state.title == '新增/注册'">
<span v-if="!loading">注 册</span>
@@ -305,6 +319,7 @@
import { Base64 } from 'js-base64'
import {getAgencyById} from "../../../api/sysUsers";
import Cookies from "js-cookie";
+import {getInstitutionDetail} from "@/api/backManage/insitution";
const emit = defineEmits(["getList"]);
const props = {
@@ -318,6 +333,7 @@
areaList: [],
busList: [],
fileList: [],
+ certList: [],
imgLimit: 1,
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
@@ -349,6 +365,7 @@
regAddress: '',
business: '',
reportPath: '',
+ certPath: ''
},
username: '',
phone: '',
@@ -390,7 +407,20 @@
if(!verifyPhone(value)){
callback(new Error('手机号格式有误'))
}else{
- checkPhone({phone:value}).then((res)=>{
+ let param = {}
+ if(state.title=='新增/注册') {
+ param = {
+ phone:value,
+ identity: 1
+ }
+ }else if(state.title=='编辑'){
+ param = {
+ phone:value,
+ identity: 1,
+ id: state.registerForm.id
+ }
+ }
+ checkPhone(param).then((res)=>{
if(res.data == false){
callback(new Error('该手机号已被绑定用户，请更换其他手机号'))
}else{
@@ -408,9 +438,20 @@
callback()
}else{
if(!verifyUsername(value)){
- callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
+ 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{
@@ -426,7 +467,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
@@ -452,6 +493,7 @@
"agency.regAddress": [{required: true, trigger: "blur", message: "请输入注册地址"}],
"agency.business": [{required: true, trigger: "blur", message: "请选择申请的法定安全评价业务范围"}],
"agency.reportPath": [{required: true, trigger: "blur", message: "请上传加盖公章的《机构信息上报表》"}],
+ "agency.certPath": [{required: true, trigger: "blur", message: "请上传资质证书"}],
username: [{ required: true, trigger: "blur", validator: validateUsername }],
phone: [{ required: true, trigger: "blur", validator: validateUserPhone }],
password: [{ required: true, trigger: "blur", validator: validatePwd }],
@@ -472,15 +514,18 @@
}
getBusiness()
- watchEffect(() => {
- // 在副作用中调用 getArea()
- getArea();
- });
+ getArea()
+ // watchEffect(() => {
+ // // 在副作用中调用 getArea()
+ // getArea();
+ // });
})
const isAbleEdit = ref(false);
+const isReject = ref(false);
const openDialog=(type, value)=>{
- state.title = type === 'add' ? '新增/注册' : type ==='edit' ? '编辑' : '查看' ;
- if(type === 'edit' || type == 'view') {
+ state.title = type === 'add' ? '新增/注册' : (type ==='edit' || type ==='reject') ? '编辑' : '查看' ;
+ getArea()
+ if(type === 'edit' || type == 'view' || type ==='reject') {
state.registerForm.id = value.id
state.registerForm.username = value.username
state.registerForm.phone = value.phone
@@ -500,6 +545,9 @@
state.registerForm.agency[i] = info[i]
}
}
+ getArea()
+ state.registerForm.phone = info.user.phone
+ startPhone.value = info.user.phone
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() })
@@ -510,6 +558,11 @@
const imgUrl = import.meta.env.VITE_APP_BASE_API + "/" + res.data.reportPath
state.fileList = imgUrl ? imgUrl.split(',').map(url => {return {url} }) : []
}
+ if(res.data.certPath) {
+ const imgUrl = import.meta.env.VITE_APP_BASE_API + "/" + res.data.certPath
+ state.certList = imgUrl ? imgUrl.split(',').map(url => {return {url} }) : []
+ }
+
}else{
ElMessage.warning(res.message)
@@ -518,8 +571,12 @@
if(type == 'view'){
state.isView = true
}
+ if(type === 'reject'){
+ isReject.value = true;
+ }
}
dialogVisible.value = true
+ console.log('state.registerForm',state.registerForm)
}
const validKey=(key,obj)=>{
@@ -558,6 +615,10 @@
}
const changeAttr=()=>{
+ state.registerForm.agency.area = []
+ state.registerForm.agency.province = ''
+ state.registerForm.agency.city = ''
+ state.registerForm.agency.district = ''
getArea()
}
@@ -585,9 +646,15 @@
};
-const handleAvatarSuccess = (res, uploadFile) => {
+const handleAvatarSuccess = (res, uploadFile,type) => {
if(res.code == 200){
- state.registerForm.agency.reportPath = res.data.path
+ console.log("type",type)
+ if(type === '上报表'){
+ state.registerForm.agency.reportPath = res.data.path
+ }else {
+ state.registerForm.agency.certPath = res.data.path
+ }
+
}else{
ElMessage({
type: 'warning',
@@ -596,8 +663,14 @@
}
}
-const handleRemove = async (file, uploadFiles) => {
- const res = await delPic({path: state.registerForm.agency.reportPath})
+const handleRemove = async (file, uploadFiles,type) => {
+ let path = '';
+ if(type === '上报表'){
+ path = state.registerForm.agency.reportPath;
+ }else {
+ path = state.registerForm.agency.certPath;
+ }
+ const res = await delPic({path: path})
if(res.code == 200){
ElMessage({
type: 'success',
@@ -616,10 +689,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,10 +702,13 @@
type: "success",
}).then(() => {
emit("getList")
+
dialogVisible.value = false
+ state.registerForm.agency.attribute = 0
proxy.$refs.registerRef.resetFields()
proxy.$refs.registerRef.clearValidate()
state.fileList = []
+ state.certList = []
loading.value = false
// router.push("/homePage")
}).catch(() => {})
@@ -645,10 +722,12 @@
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(',')
+ if(isReject.value) {
+ data.state = 1;
+ }
// delete data.agency.area
console.log('data',data)
editAgency(data).then(res => {
@@ -657,13 +736,15 @@
type: 'success',
message: '编辑成功'
})
- emit("getList")
+
dialogVisible.value = false
+ state.registerForm.agency.attribute = 0
proxy.$refs.registerRef.resetFields()
proxy.$refs.registerRef.clearValidate()
state.fileList = []
+ state.certList = []
loading.value = false
-
+ emit("getList")
}else{
ElMessage({
type: 'warning',
@@ -679,9 +760,11 @@
}
const closeDialog = ()=>{
+ state.registerForm.agency.attribute = 0
proxy.$refs.registerRef.resetFields()
proxy.$refs.registerRef.clearValidate()
state.fileList = []
+ state.certList = []
}
defineExpose({
--
Gitblit v1.9.2