18577375184
/
gjjd-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、修复自主材料补充问题 

2、其他bug修复
master
梁欣 2 months ago
parent
b970de9bb6
commit
8c66ae40db
5 changed files with 56 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/manifest.json
  2. 21
      src/pages/signUp/info.vue
  3. 4
      src/pages/signUp/listForCompanySelf.vue
  4. 47
      src/pages/signUp/self.vue
  5. 3
      src/pages/user/signIn.vue

4
src/manifest.json
View File

@ -3,8 +3,8 @@
"appid" : "__UNI__06C03D0", "appid" : "__UNI__06C03D0",
//__UNI__06C03D0 //__UNI__06C03D0
"description" : "", "description" : "",
"versionName" : "1.34.0",
"versionCode" : "249",
"versionName" : "1.34.3",
"versionCode" : "252",
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

21
src/pages/signUp/info.vue
View File

@ -69,6 +69,10 @@
<text class="text-red">*</text> <text class="text-red">*</text>
</template> </template>
</uv-cell> </uv-cell>
<text class="text-24 text-gray mt-15 ml-10"
@click="showPreview('https://oss.wsdns.cn/20250224/11e8ae6449b64cac91e65ece508a07fe.png')">
查看样例
</text>
<uv-cell title="小两寸白底证件照" :value="form.idCardHeader2 ? '已上传' : '点击上传小两寸白底证件照'" <uv-cell title="小两寸白底证件照" :value="form.idCardHeader2 ? '已上传' : '点击上传小两寸白底证件照'"
is-link is-link
@click="uploadHeadPhoto2"> @click="uploadHeadPhoto2">
@ -76,6 +80,10 @@
<text class="text-red">*</text> <text class="text-red">*</text>
</template> </template>
</uv-cell> </uv-cell>
<text class="text-24 text-gray mt-15 ml-10"
@click="showPreview('https://oss.wsdns.cn/20250224/11e8ae6449b64cac91e65ece508a07fe.png')">
查看样例
</text>
<uv-cell title="姓名" :value="form.name"> <uv-cell title="姓名" :value="form.name">
</uv-cell> </uv-cell>
<uv-cell title="身份证号" :value="form.idCardNumber"> <uv-cell title="身份证号" :value="form.idCardNumber">
@ -343,7 +351,7 @@
</view> </view>
</uv-popup> </uv-popup>
<uv-picker ref="levelPicker" :columns="[levelList]" @confirm="confirmLevel" title="选择等级"/> <uv-picker ref="levelPicker" :columns="[levelList]" @confirm="confirmLevel" title="选择等级"/>
<uv-picker ref="companyPicker" :columns="[companyList]" keyName="organizationName" @confirm="confirmCompany"
<uv-picker ref="companyPicker" :columns="[companyList]" keyName="organizationFullName" @confirm="confirmCompany"
title="选择公司"/> title="选择公司"/>
<uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle" <uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle"
title="选择职称"/> title="选择职称"/>
@ -362,7 +370,7 @@
<uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker> <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
<uv-popup ref="workExpPicker" mode="bottom" round="15" closeable> <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
<view class="p-50"> <view class="p-50">
<view class="text-25 text-gray my-15">温馨提示：请按实填写，并填写工作单位全称，否则可能影响材料制作</view>
<view class="text-25 text-gray my-15">温馨提示：请按实填写，仅需填写本单位的工作经历，否则可能影响材料制作</view>
<uv-form labelPosition="left" labelWidth="120"> <uv-form labelPosition="left" labelWidth="120">
<uv-form-item label="工作单位" borderBottom> <uv-form-item label="工作单位" borderBottom>
<uv-input <uv-input
@ -371,6 +379,7 @@
v-model="currentWorkExp.company" v-model="currentWorkExp.company"
border="none" border="none"
inputAlign="right" inputAlign="right"
readonly=""
/> />
</uv-form-item> </uv-form-item>
<uv-form-item label="岗位" borderBottom> <uv-form-item label="岗位" borderBottom>
@ -580,11 +589,12 @@ const openCompanyPicker = () => {
} }
const confirmCompany = ({value}) => { const confirmCompany = ({value}) => {
form.value.companyId = value[0].organizationId form.value.companyId = value[0].organizationId
form.value.companyName = value[0].organizationName
form.value.companyName = value[0].organizationFullName
form.value.companyCode = value[0].organizationCode form.value.companyCode = value[0].organizationCode
form.value.industrialPark = value[0].park form.value.industrialPark = value[0].park
form.value.zipCode = value[0].zipCode form.value.zipCode = value[0].zipCode
form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments
currentWorkExp.company = value[0].organizationFullName
} }
const addPopup = ref() const addPopup = ref()
@ -647,10 +657,11 @@ const workExpEndDate = ref(dayjs().valueOf())
const currentWorkExp = ref() const currentWorkExp = ref()
const workExpPicker = ref() const workExpPicker = ref()
const openWorkExpPicker = (item = null, index = -1) => { const openWorkExpPicker = (item = null, index = -1) => {
if (!form.value.companyName) return $toast('请先选择公司')
if (item) { if (item) {
currentWorkExp.value = item currentWorkExp.value = item
} else { } else {
if (workExp.value.length === 3) return $toast('最多添加3项')
if (workExp.value.length === 1) return $toast('最多添加1项')
currentWorkExp.value = { currentWorkExp.value = {
startDate: null, startDate: null,
endDate: null, endDate: null,
@ -822,7 +833,7 @@ const join = async () => {
} }
if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school) if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
return $toast('请输入毕业院校') return $toast('请输入毕业院校')
if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.major)
return $toast('请输入所学专业') return $toast('请输入所学专业')
if (hasPaper.value && !form.value.schoolPaper) { if (hasPaper.value && !form.value.schoolPaper) {
return $toast('请上传毕业证') return $toast('请上传毕业证')

4
src/pages/signUp/listForCompanySelf.vue
View File

@ -39,7 +39,7 @@
<script setup> <script setup>
import {ref} from 'vue' import {ref} from 'vue'
import {onLoad} from "@dcloudio/uni-app"; import {onLoad} from "@dcloudio/uni-app";
import {signUpPeopleSelfListReq, signUpUpdateReq} from "@/api/signUp";
import {signUpPeopleSelfListReq, signUpSelfUpdateReq, signUpUpdateReq} from "@/api/signUp";
import {$toast, chooseImg} from "@/utils"; import {$toast, chooseImg} from "@/utils";
const form = ref({}) const form = ref({})
@ -58,7 +58,7 @@ const selectData = item => {
const disabled = ref(false) const disabled = ref(false)
const save = async () => { const save = async () => {
disabled.value = true disabled.value = true
await signUpUpdateReq(form.value)
await signUpSelfUpdateReq(form.value)
disabled.value = false disabled.value = false
addPopup.value.close() addPopup.value.close()
$toast('保存成功') $toast('保存成功')

47
src/pages/signUp/self.vue
View File

@ -90,6 +90,10 @@
<text class="text-red">*</text> <text class="text-red">*</text>
</template> </template>
</uv-cell> </uv-cell>
<text class="text-24 text-gray mt-15 ml-10"
@click="showPreview('https://oss.wsdns.cn/20250224/11e8ae6449b64cac91e65ece508a07fe.png')">
查看样例
</text>
<uv-cell title="小两寸白底证件照" :value="form.idCardHeader2 ? '已上传' : '点击上传小两寸白底证件照'" <uv-cell title="小两寸白底证件照" :value="form.idCardHeader2 ? '已上传' : '点击上传小两寸白底证件照'"
is-link is-link
@click="uploadHeadPhoto2"> @click="uploadHeadPhoto2">
@ -97,6 +101,10 @@
<text class="text-red">*</text> <text class="text-red">*</text>
</template> </template>
</uv-cell> </uv-cell>
<text class="text-24 text-gray mt-15 ml-10"
@click="showPreview('https://oss.wsdns.cn/20250224/11e8ae6449b64cac91e65ece508a07fe.png')">
查看样例
</text>
<uv-cell title="姓名" :value="form.name"> <uv-cell title="姓名" :value="form.name">
</uv-cell> </uv-cell>
<uv-cell title="身份证号" :value="form.idCardNumber"> <uv-cell title="身份证号" :value="form.idCardNumber">
@ -370,9 +378,9 @@
</view> </view>
</view> </view>
</uv-popup> </uv-popup>
<uv-picker ref="levelPicker" :columns="[levelList]" @confirm="confirmLevel" title="选择等级"/>
<uv-picker ref="reqLevelPicker" :columns="[levelList]" @confirm="confirmReqLevel" title="选择等级"/>
<uv-picker ref="companyPicker" :columns="[companyList]" keyName="organizationName" @confirm="confirmCompany"
<uv-picker ref="levelPicker" :columns="[levelList]" @confirm="confirmLevel" title="选择现工种等级"/>
<uv-picker ref="reqLevelPicker" :columns="[levelList]" @confirm="confirmReqLevel" title="选择预约工种等级"/>
<uv-picker ref="companyPicker" :columns="[companyList]" keyName="organizationFullName" @confirm="confirmCompany"
title="选择公司"/> title="选择公司"/>
<uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle" <uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle"
title="选择职称"/> title="选择职称"/>
@ -391,7 +399,7 @@
<uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker> <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
<uv-popup ref="workExpPicker" mode="bottom" round="15" closeable> <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
<view class="p-50"> <view class="p-50">
<view class="text-25 text-gray my-15">温馨提示：请按实填写，并填写工作单位全称，否则可能影响材料制作</view>
<view class="text-25 text-gray my-15">温馨提示：请按实填写，仅需填写本单位的工作经历，否则可能影响材料制作</view>
<uv-form labelPosition="left" labelWidth="120"> <uv-form labelPosition="left" labelWidth="120">
<uv-form-item label="工作单位" borderBottom> <uv-form-item label="工作单位" borderBottom>
<uv-input <uv-input
@ -400,6 +408,7 @@
v-model="currentWorkExp.company" v-model="currentWorkExp.company"
border="none" border="none"
inputAlign="right" inputAlign="right"
readonly
/> />
</uv-form-item> </uv-form-item>
<uv-form-item label="岗位" borderBottom> <uv-form-item label="岗位" borderBottom>
@ -679,11 +688,12 @@ const openCompanyPicker = () => {
} }
const confirmCompany = ({value}) => { const confirmCompany = ({value}) => {
form.value.companyId = value[0].organizationId form.value.companyId = value[0].organizationId
form.value.companyName = value[0].organizationName
form.value.companyName = value[0].organizationFullName
form.value.companyCode = value[0].organizationCode form.value.companyCode = value[0].organizationCode
form.value.industrialPark = value[0].park form.value.industrialPark = value[0].park
form.value.zipCode = value[0].zipCode form.value.zipCode = value[0].zipCode
form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments
currentWorkExp.value.company = value[0].organizationFullName
} }
const addPopup = ref() const addPopup = ref()
@ -734,7 +744,10 @@ const getUserDetail = async () => {
form.value.age = dayjs().diff(birthday, 'year') form.value.age = dayjs().diff(birthday, 'year')
} }
if (data.realname) form.value.name = data.realname if (data.realname) form.value.name = data.realname
if (data.company) form.value.companyName = data.company
if (data.company) {
form.value.companyName = data.company
currentWorkExp.value.company = data.company
}
if (data.outSchoolDate) form.value.graduateDate = data.outSchoolDate if (data.outSchoolDate) form.value.graduateDate = data.outSchoolDate
if (data.companyPark) form.value.industrialPark = data.companyPark if (data.companyPark) form.value.industrialPark = data.companyPark
if (data.headPhoto) form.value.idCardHeader = data.headPhoto if (data.headPhoto) form.value.idCardHeader = data.headPhoto
@ -749,15 +762,17 @@ const workExpEndDate = ref(dayjs().valueOf())
const currentWorkExp = ref() const currentWorkExp = ref()
const workExpPicker = ref() const workExpPicker = ref()
const openWorkExpPicker = (item = null, index = -1) => { const openWorkExpPicker = (item = null, index = -1) => {
console.log(form.value.companyName)
if (!form.value.companyName) return $toast('请先选择公司')
if (item) { if (item) {
currentWorkExp.value = item currentWorkExp.value = item
} else { } else {
if (workExp.value.length === 3) return $toast('最多添加3项')
if (workExp.value.length === 1) return $toast('最多添加1项')
currentWorkExp.value = { currentWorkExp.value = {
startDate: null, startDate: null,
endDate: null, endDate: null,
toNow: false, toNow: false,
company: '',
company: form.value.companyName,
position: '', position: '',
proveName: '', proveName: '',
provePhone: '', provePhone: '',
@ -820,15 +835,19 @@ const join = async () => {
if (!form.value.companyName) { if (!form.value.companyName) {
return $toast('请输入公司名称') return $toast('请输入公司名称')
} }
if (!form.value.industrialPark) {
return $toast('请输入所属工业园区')
}
// if (!form.value.industrialPark) {
// return $toast('请输入所属工业园区')
// }
if (!form.value.workTypeName) { if (!form.value.workTypeName) {
return $toast('请选择工种') return $toast('请选择工种')
} }
if (form.value.workTypeName !== '无' && !form.value.level) { if (form.value.workTypeName !== '无' && !form.value.level) {
return $toast('请选择工种等级') return $toast('请选择工种等级')
} }
if (form.value.workTypeName === '无') {
form.value.level = ""
}
if (!form.value.age) { if (!form.value.age) {
return $toast('请输入年龄') return $toast('请输入年龄')
} }
@ -894,7 +913,7 @@ const join = async () => {
} }
if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school) if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
return $toast('请输入毕业院校') return $toast('请输入毕业院校')
if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.major)
return $toast('请输入所学专业') return $toast('请输入所学专业')
if (!backPass.value) return $toast('请上传身份证反面') if (!backPass.value) return $toast('请上传身份证反面')
if (!workDateEndJudge.value) form.value.workDateEnd = '无' if (!workDateEndJudge.value) form.value.workDateEnd = '无'
@ -909,6 +928,9 @@ const join = async () => {
return $toast('请上传劳动合同盖章页三页') return $toast('请上传劳动合同盖章页三页')
} }
} }
const levelIndex = levelList.findIndex(({value}) => value === form.value.level)
if (form.value.workTypeName !== '无' && form.value.reqLevel <= levelIndex)
return $toast('预约等级需大于现等级')
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认要报名吗?', content: '确认要报名吗?',
@ -1153,7 +1175,6 @@ const getConditionList = async () => {
page: 1, page: 1,
limit: 999 limit: 999
}) })
console.log(form.value.reqLevel)
conditionList.value = [] conditionList.value = []
if (form.value.reqLevel === 0) { if (form.value.reqLevel === 0) {
conditionList.value = data.list.filter(item => { conditionList.value = data.list.filter(item => {

3
src/pages/user/signIn.vue
View File

@ -289,7 +289,8 @@ export default {
if (!this.formData.organizationType) return $toast('请选择企业类型') if (!this.formData.organizationType) return $toast('请选择企业类型')
if (!this.formData.confirmPassword) return $toast('请输入确认密码') if (!this.formData.confirmPassword) return $toast('请输入确认密码')
if (this.formData.password !== this.formData.confirmPassword) return $toast('两次密码不一致') if (this.formData.password !== this.formData.confirmPassword) return $toast('两次密码不一致')
const regex = /^[\u4e00-\u9fa5]+$/;
if (!regex.test(this.formData.realname)) return $toast('请输入中文姓名')
const checkCodeRes = await checkCodeReq({ const checkCodeRes = await checkCodeReq({
phone: this.formData.phone, phone: this.formData.phone,
code: this.formData.code code: this.formData.code

Write Preview
Loading…
Cancel
Save