Merge branch 'jobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into jobFair

src/layout/company/navBar.vue

@@ -17,7 +17,7 @@
           <div class="cursor-pointer mx-3 commonHover" @click="handleLogout(false)">我要求职</div>
 
           <div class="enterprise-septal-line"></div>
-          <div class="d-flex align-center mx-3 cursor-pointer commonHover" @click="router.push('/recruit/enterprise/membershipPackage/index?key=1')">
+          <div class="d-flex align-center mx-3 cursor-pointer commonHover" @click="router.push('/recruit/enterprise/tradingOrder?key=tab_recharge')">
             <div>剩余M豆：{{ enterpriseUserAccount?.balance ? enterpriseUserAccount?.balance / 100 : 0 }}个</div>
           </div>
 

src/permission.js

@@ -27,7 +27,7 @@ router.beforeEach(async (to, from, next) => {
   const isTeacherRoute = to.path.includes(TEACHER_PATH)
   const schoolInfo = localStorage.getItem('schoolInfo')
   if (isTeacherRoute && !schoolInfo) {
-    next(`/login?redirect=${to.fullPath}`)
+    next(`/flameLogin?redirect=${to.fullPath}`)
   }
   
   if (to.path === '/enterpriseVerification') {

src/plugins/dialogExtend/components/studentInfoForm.vue

@@ -154,14 +154,13 @@ const items = ref({
       type: 'combobox',
       key: 'schoolClassId',
       value: null,
-      label: '所在班级 *',
+      label: '所在班级',
       outlined: true,
       clearable: true,
       canBeInputted: true,
       itemTextName: 'schoolClassName',
       itemText: 'name',
       itemValue: 'id',
-      rules: [v => !!v || '请选择所在班级'],
       items: []
     },
     {
@@ -171,6 +170,7 @@ const items = ref({
       label: '所学专业 *',
       outlined: true,
       itemText: 'nameCn',
+      noDataText: '请输入专业名称搜索',
       itemValue: 'id',
       rules: [v => !!v || '请选择所学专业'],
       search: e => getMajorData(e),
@@ -181,9 +181,8 @@ const items = ref({
       key: 'studentNo',
       value: '',
       default: null,
-      label: '学号 *',
-      outlined: true,
-      rules: [v => !!v || '请填写学号']
+      label: '学号',
+      outlined: true
     },
     {
       type: 'text',
@@ -306,6 +305,7 @@ const getQuery = async () => {
   items.value.options.forEach(e => {
     if (Object.prototype.hasOwnProperty.call(e, 'data')) return obj[e.key] = e.data
     if (e.key === 'schoolClassId') {
+      if (!e.value) return obj[e.key] = null
       const classObj = e.items.find(k => k[e.itemValue] === e.value)
       if (!classObj) {
         obj[e.key] = null

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v25.03.19.1914'
+export const vue_version = 'v25.03.24.1748'

src/views/recruit/enterprise/resume/components/table.vue

@@ -119,6 +119,7 @@ const inviteRef = ref()
 const showInvite = ref(false)
 const headers = ref([
   { title: '姓名', value: 'name', sortable: false },
+  { title: '人才类型', key: 'person.type', sortable: false, value: item => item.person?.type ? item.person.type === '1' ? '在校学生' : '职场人士' : '' },
   { title: '求职状态', key: 'person.jobStatusName', sortable: false },
   { title: '工作经验', key: 'person.expName', sortable: false },
   { title: '最高学历', key: 'person.eduName', sortable: false },

src/views/recruit/enterprise/search/retrieval/index.vue

@@ -175,17 +175,6 @@ getDict('positionData', {}, 'positionData').then(({ data }) => {
 const total = ref(0)
 const items = ref([])
 const loading = ref(false)
-// const headers = ref([
-//   { title: '姓名', key: 'name', sortable: false },
-//   { title: '求职状态', key: 'jobStatusName', sortable: false },
-//   { title: '工作年限', key: 'expName', sortable: false },
-//   { title: '最高学历', key: 'eduName', sortable: false },
-//   { title: '所在城市', key: 'areaName', sortable: false },
-//   { title: '户籍地', key: 'regName', sortable: false },
-//   { title: '婚姻状况', key: 'maritalStatusName', sortable: false },
-//   { title: '首次工作时间', key: 'firstWorkTime', sortable: false, value: item => timesTampChange(item.firstWorkTime, 'Y-M-D') },
-//   { title: '操作', key: 'actions', sortable: false }
-// ])
 
 const getData = async () => {
   loading.value = true
@@ -197,9 +186,10 @@ const getData = async () => {
       return
     }
     items.value = dealDictArrayData([], res.list).map(e => {
+      e.name = e.name + `（${e.type === '1' ? '在校学生' : '职场人士'}）`
       e.regName = e.reg?.str ?? ''
       e.areaName = e.area?.str ?? '暂无'
-      e.subTitle = [e.jobStatusName, e.expName ? e.expName + '工作经验' : null, e.eduName, e.maritalStatusName].filter(k => k).join(' | ')
+      e.subTitle = [e.jobStatusName, e.expName ? e.expName + '' : null, e.eduName, e.maritalStatusName].filter(k => k).join(' | ')
       if (e.workList?.length) {
         e.workList.forEach(exp => {
           exp.startTimeStr = exp.startTime ? timesTampChange(exp.startTime, 'Y-M') : '未填写工作时间'

src/views/recruit/personal/PersonalCenter/student/information/index.vue

@@ -73,14 +73,13 @@ const items = ref({
       type: 'combobox',
       key: 'schoolClassId',
       value: null,
-      label: '所在班级 *',
+      label: '所在班级',
       outlined: true,
       clearable: true,
       canBeInputted: true,
       itemTextName: 'schoolClassName',
       itemText: 'name',
       itemValue: 'id',
-      rules: [v => !!v || '请选择所在班级'],
       items: []
     },
     {
@@ -100,9 +99,8 @@ const items = ref({
       key: 'studentNo',
       value: '',
       default: null,
-      label: '学号 *',
-      outlined: true,
-      rules: [v => !!v || '请填写学号']
+      label: '学号',
+      outlined: true
     },
     {
       type: 'text',
@@ -185,6 +183,7 @@ const handleSubmit = async () => {
   items.value.options.forEach(item => {
     // 班级有下拉选择的，需要根据选择的值赋值
     if (item.key === 'schoolClassId') {
+      if (!item.value) return params[item.key] = null
       const classObj = item.items.find(e => e[item.itemValue] === item.value)
       if (!classObj) {
         params[item.key] = null

src/views/recruit/personal/PersonalCenter/studentInformation/index.vue

@@ -76,9 +76,8 @@ const items = ref({
       key: 'studentNo',
       value: '',
       default: null,
-      label: '学号 *',
-      outlined: true,
-      rules: [v => !!v || '请填写学号']
+      label: '学号',
+      outlined: true
     },
     {
       type: 'text',

src/views/recruit/personal/jobFair/details/enterprises.vue

@@ -237,7 +237,7 @@ const handleShare = () => {
 
       ctx.font = 'bold 16px Arial'
       ctx.fillStyle = '#10325d'
-      const text = '诚挚邀约 共享机遇'
+      const text = '扫码投递'
       const textWidth = ctx.measureText(text).width
       const textX = x + (secondImgWidth - textWidth) / 2
       const textY = y + secondImgHeight + 30

src/views/register/schoolForm.vue

@@ -40,42 +40,6 @@
 						/>
 					</div>
 				</template>
-				<template #idCardFront="{ item }">
-					<div class="d-flex flex-column">
-						<p class="color-999 font-size-14 mb-3">
-							<span class="color-error">*</span>
-							身份证正面图片
-						</p>
-						<Img
-							class="upload-box"
-							tips="上传图片"
-							:value="item.value"
-							:showSnackbar="false"
-							@imgClick="handlePreview"
-							:showCursor="true"
-							@success="url => item.value = url"
-							@delete="item.value = null"
-						/>
-					</div>
-				</template>
-				<template #idCardBack="{ item }">
-					<div class="d-flex flex-column">
-						<p class="color-999 font-size-14 mb-3">
-							<span class="color-error">*</span>
-							身份证背面图片
-						</p>
-						<Img
-							class="upload-box"
-							tips="上传图片"
-							:value="item.value"
-							:showSnackbar="false"
-							@imgClick="handlePreview"
-							:showCursor="true"
-							@success="url => item.value = url"
-							@delete="item.value = null"
-						/>
-					</div>
-				</template>
 			</CtForm>
 			<div class="text-center my-10">
 				<v-btn color="primary" width="250" @click.stop="handleSubmit">提 交</v-btn>
@@ -176,20 +140,6 @@ const formItems = ref({
 			value: '',
 			col: 4,
 			rules: [v => !!v || '请上传您的在岗证明图片']
-		},
-		{
-			slotName: 'idCardFront',
-			key: 'idCardFront',
-			value: '',
-			col: 4,
-			rules: [v => !!v || '请上传您的身份证正面图片']
-		},
-		{
-			slotName: 'idCardBack',
-			key: 'idCardBack',
-			value: '',
-			col: 4,
-			rules: [v => !!v || '请上传您的身份证背面图片']
 		}
   ]
 })
@@ -252,6 +202,8 @@ const handleSubmit = async () => {
 		obj[item.key] = item.value
 	})
 
+	if (!obj.employmentCertificate) return Snackbar.warning('请上传在岗证明')
+
 	// 修改信息需提交原始数据
 	if (isUpdate.value) obj = Object.assign(formData.value, obj)
 

src/views/register/schoolInReview.vue

@@ -9,9 +9,9 @@
           <div style="width: 100%;">
             <div class="mt-5 mb-1">如有疑问请扫码添加下方企业微信联系我们：</div>
             <div style="width: 150px; height: 150px; margin: auto;">
-              <v-img src="https://minio.menduner.com/dev/menduner/contact.png" width="150" height="150"></v-img>
+              <v-img src="https://minio.menduner.com/dev/90d8688e33f024a1be2460a3524709ac7f027e9f023b3fce77acf60fdfd2c587.png" width="150" height="150"></v-img>
             </div>
-            <div class="text-center ml-5">潘青海先生（Peter Pan）</div> 
+            <div class="text-center ml-5">郑玉洁女士</div> 
           </div>
         </div>
 
@@ -27,9 +27,9 @@
           <div style="width: 100%;">
             <div class="mt-5 mb-1">如有疑问请扫码添加下方企业微信联系我们：</div>
             <div style="width: 150px; height: 150px; margin: auto;">
-              <v-img src="https://minio.menduner.com/dev/menduner/contact.png" width="150" height="150"></v-img>
+              <v-img src="https://minio.menduner.com/dev/90d8688e33f024a1be2460a3524709ac7f027e9f023b3fce77acf60fdfd2c587.png" width="150" height="150"></v-img>
             </div>
-            <div class="text-center ml-5">潘青海先生（Peter Pan）</div>
+            <div class="text-center ml-5">郑玉洁女士</div>
           </div>
         </div>
       </div>