From bfef2622ae158292d9612342c789968d63bcb868 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 30 Jul 2025 17:39:04 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/manifest.json | 4 +-
src/pages/user/userDetail.vue | 291 +++++++++++++++++++---------------
2 files changed, 169 insertions(+), 126 deletions(-)
diff --git a/src/manifest.json b/src/manifest.json
index ca522cc..d0e411d 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
"appid" : "__UNI__06C03D0",
//__UNI__06C03D0
"description" : "",
- "versionName" : "3.0.5",
- "versionCode" : "283",
+ "versionName" : "3.0.6",
+ "versionCode" : "284",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages/user/userDetail.vue b/src/pages/user/userDetail.vue
index cbedd33..30b5d02 100644
--- a/src/pages/user/userDetail.vue
+++ b/src/pages/user/userDetail.vue
@@ -7,97 +7,59 @@
-
-
-
-
-
+
- {{ formData.idCardFront ? '已上传' : '' }}
+ {{ formData.headPhoto ? '已上传' : '' }}
+ @click="uploadHeadPhoto" size="small">
-
+
- {{ formData.idCardBack ? '已上传' : '' }}
+ {{ formData.headPhoto2 ? '已上传' : '' }}
+ @click="uploadHeadPhoto2" size="small">
-
-
-
-
-
+
- {{ formData.headPhoto ? '已上传' : '' }}
+ {{ formData.idCardFront ? '已上传' : '' }}
+ @click="uploadIdCardFront" size="small">
-
+
- {{ formData.headPhoto2 ? '已上传' : '' }}
+ {{ formData.idCardBack ? '已上传' : '' }}
+ @click="uploadIdCardBack" size="small">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
+
+ {{
+ formData.gender === 0 ? '男' : '女'
+ }}
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+ 无
+
+
+
+ 有
+
+
+
+
+
+
+
@@ -126,6 +100,11 @@
+
+
+
+
@@ -134,12 +113,6 @@
-
-
-
-
@@ -158,6 +131,10 @@
+
+
+
+
@@ -174,6 +151,18 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -198,6 +187,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formData.jobTitlePaper ? '已上传' : '' }}
+
+
+
+
+
+
+ 无
+
+
+
+ 有
+
+
+
+ {{ formData.workTypePaper ? '已上传' : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -276,20 +328,6 @@
-
- {{ formData.jobTitlePaper ? '已上传' : '' }}
-
-
-
-
-
- {{ formData.workTypePaper ? '已上传' : '' }}
-
-
-
-
{{ formData.chineseSkill ? '已上传' : '' }}
@@ -407,6 +445,9 @@ import {checkLogin} from "@/utils/app";
const minDate = dayjs().subtract(80, 'year').valueOf()
+const hasPaper = ref(false)
+const hasWorkTypePaper = ref(false)
+
const formData = ref({
realname: '',
idCard: '',
@@ -435,6 +476,7 @@ const formData = ref({
workContractEndTime: '',
jobTitlePaper: '',
workTypePaper: '',
+ workTypeNumber: '',
jobIntention: '',
houseType: '',
personSupplementary: '',
@@ -465,6 +507,9 @@ const formData = ref({
contactExpirePage: '',
contactSignPage: '',
socialSecurity: '',
+ address: '',
+ gender: null,
+ nation: null,
})
const graduateDate = ref(dayjs().subtract(5, 'year').valueOf())
@@ -478,9 +523,10 @@ const outSchoolDate = ref(dayjs().subtract(5, 'year').valueOf())
const getUserDetail = async () => {
const {data} = await userDetailReq()
for (let key in formData.value) {
- if (data[key]) formData.value[key] = data[key]
+ if (data[key] !== null && data[key] !== undefined) formData.value[key] = data[key]
}
- console.log(formData.value)
+ if (formData.value.schoolPaper) hasPaper.value = true
+ if (formData.value.workTypePaper) hasWorkTypePaper.value = true
}
const companyPicker = ref()
@@ -523,7 +569,6 @@ const confirmEdu = ({value}) => {
formData.value.education = value[0]
}
const eduColumns = ref([
- '小学',
'初中',
'职业高中',
'技工学校',
@@ -773,75 +818,70 @@ const uploadHeadPhoto2 = async () => {
const disabled = ref(false)
const submit = async () => {
if (!formData.value.position) {
- toast("请选择职称")
- return
+ return $toast("请选择职称")
}
if (!formData.value.education) {
- toast("请选择学历")
- return
+ return $toast("请选择学历")
}
if (!formData.value.major && !['小学', '初中', '普通高中'].includes(formData.value.education)) {
- toast("请输入专业")
- return
+ return $toast("请输入专业")
}
if (!formData.value.inSchoolDate) {
- toast("请选择入学时间")
- return
+ return $toast("请选择入学时间")
}
if (!formData.value.school) {
- toast("请输入学校名称")
- return
- }
- if (!formData.value.schoolNo && !['小学', '初中', '普通高中'].includes(formData.value.education)) {
- toast("请输入毕业证编号")
- return
+ return $toast("请输入学校名称")
}
+ // if (!formData.value.schoolNo && !['小学', '初中', '普通高中'].includes(formData.value.education)) {
+ // return $toast("请输入毕业证编号")
+ // }
if (!formData.value.political) {
- toast("请选择政治面貌")
- return
+ return $toast("请选择政治面貌")
}
if (!formData.value.headPhoto) {
- toast("请上传证件照")
- return
+ return $toast("请上传证件照")
}
if (!formData.value.company) {
- toast("请选择所属公司")
- return
+ return $toast("请选择所属公司")
}
if (!formData.value.workContractStartTime) {
- toast("请选择劳动合同签订开始时间")
- return
+ return $toast("请选择劳动合同签订开始时间")
}
if (!formData.value.workContractEndTime) {
- toast("请选择劳动合同签订结束时间")
- return
+ return $toast("请选择劳动合同签订结束时间")
}
if (!formData.value.outSchoolDate) {
- toast("请选择毕业时间")
- return
+ return $toast("请选择毕业时间")
}
if (!formData.value.workTime) {
- toast("请选择参加工作时间")
- return
+ return $toast("请选择参加工作时间")
}
if (!formData.value.inCompanyTime) {
- toast("请选择入职时间")
- return
+ return $toast("请选择入职时间")
}
if (!formData.value.position) {
- toast("请选择职称")
- return
+ return $toast("请选择职称")
}
if (dayjs(formData.value.workContractStartTime).isAfter(formData.value.workContractEndTime)) {
- toast("合同结束时间不能早于开始时间")
- return
+ return $toast("合同结束时间不能早于开始时间")
+ }
+ if (hasPaper.value) {
+ if (!formData.value.schoolNo) return $toast('请填写毕业证编号')
+ if (!formData.value.schoolPaper) return $toast('请上传毕业证')
+ }
+ if (formData.value.position !== '无职称' && !formData.value.jobTitlePaper) {
+ return $toast('请上传职称等级证书')
+ }
+ if (hasWorkTypePaper.value) {
+ if (!formData.value.workTypePaper) return $toast('请上传工种等级证书')
+ if (!formData.value.workTypeNumber) return $toast('请输入工种证书编号')
}
disabled.value = true
formData.value.hasSetData = 1
const res = await updateUserDetailReq(formData.value)
disabled.value = false
if (res) {
- toast("已保存")
+ $toast("已保存")
uni.switchTab({url: '/pages/index/index'})
}
}
@@ -903,6 +943,9 @@ const uploadIdCardFront = async () => {
formData.value.idCardFront = res[0]
formData.value.realname = data.realName
formData.value.idCard = data.idCardNumber
+ formData.value.address = data.address
+ formData.value.gender = data.gender
+ formData.value.nation = data.nation
}
}