From 003d931e17089fe493ff75e290b3d20ad21f46e3 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 06 Jun 2024 13:51:25 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue | 155 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 109 insertions(+), 46 deletions(-)
diff --git a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
index 06ab7a9..ca97e72 100644
--- a/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
+++ b/src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue
@@ -6,7 +6,7 @@
width="900px"
:before-close="handleClose"
>
- <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
+ <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRulesOut" label-width="150px" >
<el-row :gutter="22">
<el-col :span="11">
<el-form-item label="姓名:" prop="name" v-if="state.title !== '修改密码'">
@@ -122,8 +122,9 @@
</el-form-item>
</el-col>
</el-row>
-
-
+ <el-form-item>
+ <div style="margin-left: -50px"><span style="font-size: 16px;color: #ed5565;">提示：疆外企业无需上传社保、医保、工资清单，疆内企业需每季度进行更新。</span></div>
+ </el-form-item>
<el-form-item prop="socialAttach" label="社保:" v-if="state.title !== '修改密码'">
<el-upload
accept="image/*"
@@ -254,12 +255,14 @@
let param = {}
if(state.title=='新增') {
param = {
- phone:value
+ phone:value,
+ identity: 2
}
}else if(state.title=='编辑'){
param = {
phone:value,
- id: state.form.id
+ id: state.form.id,
+ identity: 2
}
}
checkPhone(param).then((res)=>{
@@ -341,7 +344,7 @@
medicalList: [],
salaryList: [],
photoList: [],
- formRules:{
+ formRulesIn:{
name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
username: [{ required: true, validator: validateUsername, trigger: 'blur' }],
password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
@@ -357,6 +360,22 @@
salaryAttach: [{required: true, trigger: "blur", message: "请上传工资清单"}],
idPhoto: [{required: true, trigger: "blur", message: "请上传近期证件照"}],
},
+ formRulesOut:{
+ name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+ username: [{ required: true, validator: validateUsername, trigger: 'blur' }],
+ password: [{ required: true, validator: validatePwd, trigger: 'blur' }],
+ confirmPassword: [{ required: true, validator: equalToPassword, trigger: 'blur' }],
+ phone: [{ required: true, validator: validateUserPhone, trigger: 'blur' }],
+ post: [{ required: true, message: '请选择职务', trigger: 'change' }],
+ jobTitle:[{ required: true, message: '请输入职称', trigger: 'blur' }],
+ level: [{ required: true, message: '请选择评价师等级', trigger: 'change' }],
+ majorShow:[{ required: true, message: '请选择专业方向', trigger: 'change' }],
+ agencyId: [{ required: true, message: '请选择所属机构', trigger: 'change' }],
+ // socialAttach: [{required: true, trigger: "blur", message: "请上传社保图片"}],
+ // medicalAttach: [{required: true, trigger: "blur", message: "请上传医保图片"}],
+ // salaryAttach: [{required: true, trigger: "blur", message: "请上传工资清单"}],
+ idPhoto: [{required: true, trigger: "blur", message: "请上传近期证件照"}],
+ },
areaList: [],
agencyList: [],
header: {
@@ -372,20 +391,28 @@
const isAgency = ref(false);
onMounted(()=>{
- const userInfo = JSON.parse(Cookies.get('userInfo'))
-
- if(userInfo.identity === 1){
- state.agencyName = userInfo.agentName;
- state.form.agencyId = userInfo.agentId;
- isAgency.value = true;
- }else {
- getAgency()
- }
- console.log("userinfo",userInfo)
})
+const attribute = ref(null);
+const getUserInfoAgency = () => {
+ const userInfo = JSON.parse(Cookies.get('userInfo'))
+ if (userInfo.identity === 1) {
+ state.agencyName = userInfo.agentName;
+ state.form.agencyId = userInfo.agentId;
+ isAgency.value = true;
+ attribute.value = JSON.parse(Cookies.get('attribute'))
+ console.log("attribute", attribute.value)
+
+ } else {
+ getAgency()
+ }
+}
+
+
+
const openDialog = async (type, value) => {
- getArea()
+ await getUserInfoAgency();
+ await getArea()
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ;
if(type === 'edit') {
const param = {
@@ -394,6 +421,7 @@
const res = await getUserById(param);
if(res.code == 200){
state.form = res.data
+ // debugger
state.socialList = res.data.socialAttach.map(url => {
return {
url: import.meta.env.VITE_APP_BASE_API +'/'+url.path,
@@ -436,6 +464,13 @@
ElMessage.warning(res.message)
}
+ }else if(type === 'add'){
+ console.log("aa",props.majorList)
+ props.majorList.forEach(item => {
+ if(item.certificateNo){
+ item.certificateNo = ''
+ }
+ })
}
if(type == 'pwd'){
state.form.id = value.id
@@ -488,12 +523,9 @@
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
+ reset();
superRef.value.clearValidate();
- superRef.value.resetFields();
- state.salaryList = [];
- state.medicalList = [];
- state.socialList = [];
- state.photoList = [];
+
dialogVisible.value = false;
}else{
ElMessage.warning(res.message)
@@ -514,8 +546,9 @@
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
- superRef.value.clearValidate();
reset()
+ superRef.value.clearValidate();
+
dialogVisible.value = false;
}else{
ElMessage.warning(res.message)
@@ -528,8 +561,9 @@
if(res.code == 200){
ElMessage.success(res.message)
emit('getList')
- superRef.value.clearValidate();
reset()
+ superRef.value.clearValidate();
+
dialogVisible.value = false;
}else{
ElMessage.warning(res.message)
@@ -637,7 +671,8 @@
}
const handlePhotoRemove = async (file) => {
- console.log("fileD",file)
+ // state.form.idPhoto = ''
+
let path = ""
if(file.response && file.response.data){
path = file.response.data.path
@@ -645,19 +680,37 @@
const base = import.meta.env.VITE_APP_BASE_API
path = file.url.substring(base.length+1,file.url.length )
}
- const res = await delPic({path: path})
- if(res.code == 200){
- ElMessage({
- type: 'success',
- message: '文件已删除'
- })
+ await delPic({path: path}).then(res => {
+ if(res.code == 200){
+ // ElMessage({
+ // type: 'success',
+ // message: '文件已删除'
+ // })
+ state.form.idPhoto = ''
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.message
+ })
+ }
+ }).catch(() => {
state.form.idPhoto = ''
- }else{
- ElMessage({
- type: 'warning',
- message: res.message
- })
- }
+ });
+
+
+ // const res = await delPic({path: path})
+ // if(res.code == 200){
+ // ElMessage({
+ // type: 'success',
+ // message: '文件已删除'
+ // })
+ // state.form.idPhoto = ''
+ // }else{
+ // ElMessage({
+ // type: 'warning',
+ // message: res.message
+ // })
+ // }
}
@@ -671,18 +724,28 @@
path = file.response.data.path
}
- const res = await delPic({path: path})
+ await delPic({path: path}).then(res => {
if(res.code == 200){
- ElMessage({
- type: 'success',
- message: '文件已删除'
- })
+ // ElMessage({
+ // type: 'success',
+ // message: '文件已删除'
+ // })
}else{
- ElMessage({
- type: 'warning',
- message: res.message
- })
+ ElMessage({
+ type: 'warning',
+ message: res.message
+ })
}
+ }).catch(() => {
+ if(type === 1){
+ state.form.socialAttach = state.form.socialAttach.filter(item => item.path !== path)
+ }else if(type === 2){
+ state.form.medicalAttach = state.form.medicalAttach.filter(item => item.path !== path)
+ }else {
+ state.form.salaryAttach = state.form.salaryAttach.filter(item => item.path !== path)
+ }
+ });
+
if(type === 1){
state.form.socialAttach = state.form.socialAttach.filter(item => item.path !== path)
}else if(type === 2){
--
Gitblit v1.9.2