From 8c66ae40db47a9b2832fdcdf53cad43a7c124ee6 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 7 Mar 2025 20:43:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=87=AA=E4=B8=BB?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E8=A1=A5=E5=85=85=E9=97=AE=E9=A2=98=202?=
 =?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                       |  4 +--
 src/pages/signUp/info.vue               | 21 ++++++++---
 src/pages/signUp/listForCompanySelf.vue |  4 +--
 src/pages/signUp/self.vue               | 47 ++++++++++++++++++-------
 src/pages/user/signIn.vue               |  3 +-
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 9bff86d..0761191 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "appid" : "__UNI__06C03D0",
     //__UNI__06C03D0
     "description" : "",
-    "versionName" : "1.34.0",
-    "versionCode" : "249",
+    "versionName" : "1.34.3",
+    "versionCode" : "252",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages/signUp/info.vue b/src/pages/signUp/info.vue
index e8fad68..6bb60b8 100644
--- a/src/pages/signUp/info.vue
+++ b/src/pages/signUp/info.vue
@@ -69,6 +69,10 @@
                   <text class="text-red">*</text>
                 </template>
               </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 ? '已上传' : '点击上传小两寸白底证件照'"
                        is-link
                        @click="uploadHeadPhoto2">
@@ -76,6 +80,10 @@
                   <text class="text-red">*</text>
                 </template>
               </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>
               <uv-cell title="身份证号" :value="form.idCardNumber">
@@ -343,7 +351,7 @@
       </view>
     </uv-popup>
     <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="选择公司"/>
     <uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle"
                title="选择职称"/>
@@ -362,7 +370,7 @@
     <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
     <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
       <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-item label="工作单位" borderBottom>
             <uv-input
@@ -371,6 +379,7 @@
               v-model="currentWorkExp.company"
               border="none"
               inputAlign="right"
+              readonly=""
             />
           </uv-form-item>
           <uv-form-item label="岗位" borderBottom>
@@ -580,11 +589,12 @@ const openCompanyPicker = () => {
 }
 const confirmCompany = ({value}) => {
   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.industrialPark = value[0].park
   form.value.zipCode = value[0].zipCode
   form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments
+  currentWorkExp.company = value[0].organizationFullName
 }
 
 const addPopup = ref()
@@ -647,10 +657,11 @@ const workExpEndDate = ref(dayjs().valueOf())
 const currentWorkExp = ref()
 const workExpPicker = ref()
 const openWorkExpPicker = (item = null, index = -1) => {
+  if (!form.value.companyName) return $toast('请先选择公司')
   if (item) {
     currentWorkExp.value = item
   } else {
-    if (workExp.value.length === 3) return $toast('最多添加3项')
+    if (workExp.value.length === 1) return $toast('最多添加1项')
     currentWorkExp.value = {
       startDate: null,
       endDate: null,
@@ -822,7 +833,7 @@ const join = async () => {
   }
   if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
     return $toast('请输入毕业院校')
-  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.major)
     return $toast('请输入所学专业')
   if (hasPaper.value && !form.value.schoolPaper) {
     return $toast('请上传毕业证')
diff --git a/src/pages/signUp/listForCompanySelf.vue b/src/pages/signUp/listForCompanySelf.vue
index fbf2c03..454f670 100644
--- a/src/pages/signUp/listForCompanySelf.vue
+++ b/src/pages/signUp/listForCompanySelf.vue
@@ -39,7 +39,7 @@
 <script setup>
 import {ref} from 'vue'
 import {onLoad} from "@dcloudio/uni-app";
-import {signUpPeopleSelfListReq, signUpUpdateReq} from "@/api/signUp";
+import {signUpPeopleSelfListReq, signUpSelfUpdateReq, signUpUpdateReq} from "@/api/signUp";
 import {$toast, chooseImg} from "@/utils";
 
 const form = ref({})
@@ -58,7 +58,7 @@ const selectData = item => {
 const disabled = ref(false)
 const save = async () => {
   disabled.value = true
-  await signUpUpdateReq(form.value)
+  await signUpSelfUpdateReq(form.value)
   disabled.value = false
   addPopup.value.close()
   $toast('保存成功')
diff --git a/src/pages/signUp/self.vue b/src/pages/signUp/self.vue
index 7b04a23..4323faf 100644
--- a/src/pages/signUp/self.vue
+++ b/src/pages/signUp/self.vue
@@ -90,6 +90,10 @@
                   <text class="text-red">*</text>
                 </template>
               </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 ? '已上传' : '点击上传小两寸白底证件照'"
                        is-link
                        @click="uploadHeadPhoto2">
@@ -97,6 +101,10 @@
                   <text class="text-red">*</text>
                 </template>
               </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>
               <uv-cell title="身份证号" :value="form.idCardNumber">
@@ -370,9 +378,9 @@
         </view>
       </view>
     </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="选择公司"/>
     <uv-picker ref="titlePicker" :columns="[typeList]" keyName="dictDataName" @confirm="confirmTitle"
                title="选择职称"/>
@@ -391,7 +399,7 @@
     <uv-picker ref="houseTypePicker" :columns="[houseTypeColumns]" @confirm="confirmHouseType"></uv-picker>
     <uv-popup ref="workExpPicker" mode="bottom" round="15" closeable>
       <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-item label="工作单位" borderBottom>
             <uv-input
@@ -400,6 +408,7 @@
               v-model="currentWorkExp.company"
               border="none"
               inputAlign="right"
+              readonly
             />
           </uv-form-item>
           <uv-form-item label="岗位" borderBottom>
@@ -679,11 +688,12 @@ const openCompanyPicker = () => {
 }
 const confirmCompany = ({value}) => {
   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.industrialPark = value[0].park
   form.value.zipCode = value[0].zipCode
   form.value.companyAddress = value[0].province + value[0].city + value[0].region + value[0].comments
+  currentWorkExp.value.company = value[0].organizationFullName
 }
 
 const addPopup = ref()
@@ -734,7 +744,10 @@ const getUserDetail = async () => {
       form.value.age = dayjs().diff(birthday, 'year')
     }
     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.companyPark) form.value.industrialPark = data.companyPark
     if (data.headPhoto) form.value.idCardHeader = data.headPhoto
@@ -749,15 +762,17 @@ const workExpEndDate = ref(dayjs().valueOf())
 const currentWorkExp = ref()
 const workExpPicker = ref()
 const openWorkExpPicker = (item = null, index = -1) => {
+  console.log(form.value.companyName)
+  if (!form.value.companyName) return $toast('请先选择公司')
   if (item) {
     currentWorkExp.value = item
   } else {
-    if (workExp.value.length === 3) return $toast('最多添加3项')
+    if (workExp.value.length === 1) return $toast('最多添加1项')
     currentWorkExp.value = {
       startDate: null,
       endDate: null,
       toNow: false,
-      company: '',
+      company: form.value.companyName,
       position: '',
       proveName: '',
       provePhone: '',
@@ -820,15 +835,19 @@ const join = async () => {
   if (!form.value.companyName) {
     return $toast('请输入公司名称')
   }
-  if (!form.value.industrialPark) {
-    return $toast('请输入所属工业园区')
-  }
+  // if (!form.value.industrialPark) {
+  //   return $toast('请输入所属工业园区')
+  // }
   if (!form.value.workTypeName) {
     return $toast('请选择工种')
   }
   if (form.value.workTypeName !== '无' && !form.value.level) {
     return $toast('请选择工种等级')
   }
+  if (form.value.workTypeName === '无') {
+    form.value.level = ""
+  }
+
   if (!form.value.age) {
     return $toast('请输入年龄')
   }
@@ -894,7 +913,7 @@ const join = async () => {
   }
   if (!['初中', '职业高中', '技工学校', '中等专科', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
     return $toast('请输入毕业院校')
-  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.school)
+  if (!['初中', '普通高中', '其他'].includes(form.value.education) && !form.value.major)
     return $toast('请输入所学专业')
   if (!backPass.value) return $toast('请上传身份证反面')
   if (!workDateEndJudge.value) form.value.workDateEnd = '无'
@@ -909,6 +928,9 @@ const join = async () => {
       return $toast('请上传劳动合同盖章页三页')
     }
   }
+  const levelIndex = levelList.findIndex(({value}) => value === form.value.level)
+  if (form.value.workTypeName !== '无' && form.value.reqLevel <= levelIndex)
+    return $toast('预约等级需大于现等级')
   uni.showModal({
     title: '提示',
     content: '确认要报名吗?',
@@ -1153,7 +1175,6 @@ const getConditionList = async () => {
     page: 1,
     limit: 999
   })
-  console.log(form.value.reqLevel)
   conditionList.value = []
   if (form.value.reqLevel === 0) {
     conditionList.value = data.list.filter(item => {
diff --git a/src/pages/user/signIn.vue b/src/pages/user/signIn.vue
index 415fab5..629e24d 100644
--- a/src/pages/user/signIn.vue
+++ b/src/pages/user/signIn.vue
@@ -289,7 +289,8 @@ export default {
       if (!this.formData.organizationType) return $toast('请选择企业类型')
       if (!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({
         phone: this.formData.phone,
         code: this.formData.code