From 39f97341210dabcffbd50f1cea5bd697a602bb7b Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 05 三月 2025 15:34:30 +0800
Subject: [PATCH] bug修改
---
src/layout/components/Register/index.vue | 248 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 198 insertions(+), 50 deletions(-)
diff --git a/src/layout/components/Register/index.vue b/src/layout/components/Register/index.vue
index 210e786..e3fb799 100644
--- a/src/layout/components/Register/index.vue
+++ b/src/layout/components/Register/index.vue
@@ -8,32 +8,41 @@
</template>
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form" label-position="top">
<el-row :gutter="30">
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item prop="agency.name" label="机构名称">
<el-input
- v-model="registerForm.agency.name"
+ :disabled="isAbleEdit"
+ v-model.trim="registerForm.agency.name"
size="large"
placeholder="请输入机构名称"
>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item prop="agency.creditCode" label="社会信用代码">
<el-input
- v-model="registerForm.agency.creditCode"
+ :disabled="isAbleEdit"
+ v-model.trim="registerForm.agency.creditCode"
size="large"
placeholder="请输入社会信用代码"
>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item prop="agency.attribute" label="机构属性">
<el-radio-group v-model="registerForm.agency.attribute" style="width: 50%" @change="changeAttr()">
<el-radio :label="0" size="large" border>疆内</el-radio>
<el-radio :label="1" size="large" border>疆外</el-radio>
</el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item prop="agency.businessType" label="业务类别">
+ <el-checkbox-group v-model="registerForm.agency.businessType">
+ <el-checkbox v-for="item in state.businessTypeList" :label="item.value" :key="item.value">{{ item.label }}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
@@ -53,7 +62,7 @@
<el-col :span="12">
<el-form-item prop="agency.address" label="实际经营地址">
<el-input
- v-model="registerForm.agency.address"
+ v-model.trim="registerForm.agency.address"
size="large"
placeholder="请输入实际经营地址"
/>
@@ -64,7 +73,7 @@
<el-col :span="12">
<el-form-item prop="agency.legalPerson" label="法定代表人">
<el-input
- v-model="registerForm.agency.legalPerson"
+ v-model.trim="registerForm.agency.legalPerson"
size="large"
placeholder="请输入法定代表人"
/>
@@ -73,7 +82,7 @@
<el-col :span="12">
<el-form-item prop="agency.legalPhone" label="法人电话">
<el-input
- v-model="registerForm.agency.legalPhone"
+ v-model.trim="registerForm.agency.legalPhone"
size="large"
placeholder="请输入法人电话"
/>
@@ -84,7 +93,7 @@
<el-col :span="12">
<el-form-item prop="agency.manager" label="机构负责人">
<el-input
- v-model="registerForm.agency.manager"
+ v-model.trim="registerForm.agency.manager"
size="large"
placeholder="请输入机构负责人"
/>
@@ -93,7 +102,7 @@
<el-col :span="12">
<el-form-item prop="agency.managerPhone" label="负责人电话">
<el-input
- v-model="registerForm.agency.managerPhone"
+ v-model.trim="registerForm.agency.managerPhone"
size="large"
placeholder="请输入负责人电话"
/>
@@ -104,16 +113,16 @@
<el-col :span="8">
<el-form-item prop="agency.certNumber" label="资质证书编号">
<el-input
- v-model="registerForm.agency.certNumber"
+ v-model.trim="registerForm.agency.certNumber"
size="large"
- placeholder="请输入机构负责人"
+ placeholder="请输入资质证书编号"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="agency.issueDate" label="发证日期">
<el-date-picker
- v-model="registerForm.agency.issueDate"
+ v-model.trim="registerForm.agency.issueDate"
type="date"
placeholder="请选择发证日期"
value-format="YYYY-MM-DD 00:00:00"
@@ -125,7 +134,7 @@
<el-col :span="8">
<el-form-item prop="agency.validDate" label="有效日期">
<el-date-picker
- v-model="registerForm.agency.validDate"
+ v-model.trim="registerForm.agency.validDate"
type="date"
placeholder="请选择有效日期"
value-format="YYYY-MM-DD 00:00:00"
@@ -136,10 +145,22 @@
</el-col>
</el-row>
<el-row :gutter="30">
+ <el-col :span="12">
+ <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,最多可上传5张</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"
+ v-model.trim="registerForm.agency.assetValue"
type="number"
size="large"
placeholder="请输入固定资产总值"
@@ -150,7 +171,7 @@
<el-form-item prop="agency.workArea" label="工作场所建筑面积">
<el-input
type="number"
- v-model="registerForm.agency.workArea"
+ v-model.trim="registerForm.agency.workArea"
size="large"
placeholder="请输入工作场所建筑面积"
><template #append>㎡</template></el-input>
@@ -160,7 +181,7 @@
<el-form-item prop="agency.archiveArea" label="档案室面积">
<el-input
type="number"
- v-model="registerForm.agency.archiveArea"
+ v-model.trim="registerForm.agency.archiveArea"
size="large"
placeholder="请输入档案室面积"
><template #append>㎡</template></el-input>
@@ -171,7 +192,7 @@
<el-col :span="8">
<el-form-item prop="agency.regAddress" label="注册地址">
<el-input
- v-model="registerForm.agency.regAddress"
+ v-model.trim="registerForm.agency.regAddress"
size="large"
placeholder="请输入注册地址"
/>
@@ -179,7 +200,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="agency.business" label="申请的法定安全评价业务范围">
- <el-select v-model="registerForm.agency.business" placeholder="请选择业务范围" multiple size="large" style="width: 100%">
+ <el-select :disabled="isAbleEdit" v-model="registerForm.agency.business" placeholder="请选择业务范围" multiple size="large" style="width: 100%">
<el-option
v-for="item in state.busList"
:key="item.id"
@@ -191,8 +212,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"-->
@@ -211,7 +232,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>
@@ -225,6 +246,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="请输入登录用户名"
@@ -243,7 +265,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"
@@ -274,6 +296,7 @@
type="primary"
style="width:40%;margin: 0 auto"
@click.prevent="handleRegister"
+ v-preReClick
>
<div v-if="state.title == '新增/注册'">
<span v-if="!loading">注 册</span>
@@ -302,6 +325,8 @@
let { proxy } = getCurrentInstance()
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 = {
@@ -315,7 +340,8 @@
areaList: [],
busList: [],
fileList: [],
- imgLimit: 1,
+ certList: [],
+ imgLimit: 5,
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/system/common/uploadFile',
header: {
Authorization: 'Bearer ' + getToken()
@@ -346,13 +372,27 @@
regAddress: '',
business: '',
reportPath: '',
+ certPath: '',
+ businessType: [],
},
username: '',
phone: '',
password: '',
confirmPassword: ''
- }
+ },
+ businessTypeList: [
+ {
+ value: 1,
+ label: '安全评价'
+ },
+ {
+ value: 2,
+ label: '检验检测'
+ },
+ ]
})
+const isSuper = ref(false);
+
const {registerForm} = toRefs(state);
const startUsername = ref('');
const startPhone = ref('');
@@ -385,7 +425,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{
@@ -403,9 +456,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{
@@ -421,7 +485,7 @@
callback(new Error('请输入密码'))
}else{
if(!verifyPwd(value)){
- callback(new Error('密码须包含字母、数字、特殊字符(不包括下划线)，长度在6-16之间'))
+ callback(new Error('密码须包含字母、数字、特殊字符，长度在6-16之间'))
}else{
callback()
}
@@ -432,6 +496,7 @@
"agency.name": [{required: true, trigger: "blur", message: "请输入机构名称"}],
"agency.creditCode": [{required: true, trigger: "blur", message: "请输入社会信用代码"}],
"agency.attribute": [{required: true, trigger: "blur", message: "请选择机构属性"}],
+ "agency.businessType": [{required: true, trigger: "blur", message: "请选择业务类别"}],
"agency.area": [{required: true, trigger: "blur", message: "请选择实际经营地址所属区域"}],
"agency.address": [{required: true, trigger: "blur", message: "请输入实际经营地址"}],
"agency.legalPerson": [{required: true, trigger: "blur", message: "请输入法定代表人"}],
@@ -447,6 +512,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 }],
@@ -455,28 +521,42 @@
{ required: true, validator: equalToPassword, trigger: "blur" }
]
};
+const cert = ref([])
const loading = ref(false)
const dialogVisible = ref(false)
const registerRef = ref(null)
onMounted(()=>{
- getBusiness()
- watchEffect(() => {
- // 在副作用中调用 getArea()
- getArea();
- });
-})
+ if(getToken()){
+ const userInfo = JSON.parse(Cookies.get('userInfo'))
+ if(userInfo.identity == 0){isSuper.value = true}
+ }
+ getBusiness()
+ 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
- startUsername.value = value.username
- startPhone.value = value.phone
- state.registerForm.agency.id = value.agencyId
+ startUsername.value = value.username
+ startPhone.value = value.phone
+ state.registerForm.agency.id = value.agencyId
+ if( isSuper.value){
+ isAbleEdit.value = false
+ }else{
+ isAbleEdit.value = true
+ }
getAgencyById({agencyId: value.agencyId}).then((res)=>{
if(res.code == 200){
const info = JSON.parse(JSON.stringify(res.data))
@@ -485,7 +565,11 @@
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)
+ state.registerForm.agency.businessType = info.businessType ? info.businessType.split(',').map(Number) : []
if(state.registerForm.agency.attribute === 0){
state.registerForm.agency.area = [info.city,info.district].filter(item => { return item && item.trim() })
}else {
@@ -495,6 +579,22 @@
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) {
+ // cert.value.push(res.data.certPath)
+ const imgList = res.data.certPath.split(',')
+ cert.value = imgList
+ imgList.forEach((item,index) => {
+ if(item.includes(import.meta.env.VITE_APP_BASE_API)){
+
+ }else{
+ imgList[index] = import.meta.env.VITE_APP_BASE_API + "/" + item
+ }
+
+ })
+ const imgUrl = imgList.join(',')
+ state.certList = imgUrl ? imgUrl.split(',').map(url => {return {url} }) : []
+ }
+
}else{
ElMessage.warning(res.message)
@@ -503,8 +603,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)=>{
@@ -543,6 +647,10 @@
}
const changeAttr=()=>{
+ state.registerForm.agency.area = []
+ state.registerForm.agency.province = ''
+ state.registerForm.agency.city = ''
+ state.registerForm.agency.district = ''
getArea()
}
@@ -570,9 +678,17 @@
};
-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 {
+ cert.value.push(res.data.path)
+ state.registerForm.agency.certPath = cert.value.join(',')
+ console.log('cert',cert.value)
+ }
+
}else{
ElMessage({
type: 'warning',
@@ -581,18 +697,31 @@
}
}
-const handleRemove = async (file, uploadFiles) => {
- const res = await delPic({path: state.registerForm.agency.reportPath})
+const handleRemove = async (file, uploadFiles,type) => {
+ if(file && file.status == 'success'){
+ let path = '';
+ if(type === '上报表'){
+ path = state.registerForm.agency.reportPath;
+ }else {
+ path = file.url.substring(file.url.indexOf('upload'))
+ console.log('cert',cert.value)
+ cert.value = cert.value.filter(url => !file.url.includes(url))
+ state.registerForm.agency.certPath = cert.value.join(',')
+
+ }
+ const res = await delPic({path: path})
if(res.code == 200){
ElMessage({
type: 'success',
message: '文件已删除'
})
}else{
+
ElMessage({
type: 'warning',
message: res.message
})
+ }
}
}
@@ -601,10 +730,14 @@
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(',')
+ data.agency.businessType = data.agency.businessType.join(',')
+ const cert = state.certList.map(item => item.response ?item.response.data.path:item.url)
+ data.agency.certPath = cert.join(',')
delete data.agency.area
+ delete data.agency.id
register(data).then(res => {
if(res.code == 200){
const username = state.registerForm.username
@@ -613,10 +746,14 @@
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(() => {})
}else{
@@ -629,25 +766,33 @@
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(',')
+ data.agency.businessType = data.agency.businessType.join(',')
+ console.log('rea',state.certList)
+ const cert = state.certList.map(item => item.response ?item.response.data.path:item.url)
+ data.agency.certPath = cert.join(',')
+ if(isReject.value) {
+ data.state = 1;
+ }
// delete data.agency.area
- console.log('data',data)
+ // console.log('data',data)
editAgency(data).then(res => {
if(res.code == 200){
ElMessage({
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',
@@ -663,9 +808,12 @@
}
const closeDialog = ()=>{
+ state.registerForm.agency.attribute = 0
proxy.$refs.registerRef.resetFields()
proxy.$refs.registerRef.clearValidate()
state.fileList = []
+ state.certList = []
+ cert.value = []
}
defineExpose({
--
Gitblit v1.9.2