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

src/api/position.js

@@ -177,30 +177,30 @@ export const getJobDetails = async (params) => {
 }
 
 // 招聘端-刷新职位
-export const refreshJobAdvertised = async (id) => {
+export const refreshJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/refresh?ids=${id}`
+    url: `/app-admin-api/menduner/system/job-advertised/refresh?ids=${ids}`
   })
 }
 
 // 招聘端-开启职位
-export const enableJobAdvertised = async (id) => {
+export const enableJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/enable?ids=${id}`
+    url: `/app-admin-api/menduner/system/job-advertised/enable?ids=${ids}`
   })
 }
 
 // 招聘端-关闭职位
-export const closeJobAdvertised = async (id) => {
+export const closeJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/disable?ids=${id}`,
+    url: `/app-admin-api/menduner/system/job-advertised/disable?ids=${ids}`,
   })
 }
 
 // 招聘端-置顶职位
-export const topJobAdvertised = async (id) => {
+export const topJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/top?ids=${id}`
+    url: `/app-admin-api/menduner/system/job-advertised/top?ids=${ids}`
   })
 }
 

src/components/FormUI/combobox/index.vue

@@ -9,6 +9,7 @@
       :item-title="item.itemText || 'label'"
       :item-value="item.itemValue || 'value'"
       :items="item.items"
+      color="primary"
       variant="outlined"
       :density="item.dense || 'compact'"
       :clearable="item.clearable"

src/locales/en.js

@@ -223,6 +223,8 @@ export default {
     trainingExperience: 'Training Experience',
     educationExp: 'Educational Experience',
     workExperience: 'Work Experience',
+    workExperienceTips: 'Tip: Please fill in from near to far',
+    jobContent: 'Job Content',
     projectExperience: 'Project Experience',
     vocationalSkills: 'Vocational Skills',
     firstWorkTime: 'First Work Time',

src/locales/zh-CN.js

@@ -223,6 +223,8 @@ export default {
     trainingExperience: '培训经历',
     educationExp: '教育经历',
     workExperience: '工作经历',
+    workExperienceTips: '提示：请由近至远填写',
+    jobContent: '工作内容：',
     projectExperience: '项目经历',
     vocationalSkills: '职业技能',
     firstWorkTime: '首次工作时间',

src/views/recruit/enterprise/informationManagement/informationSettingsComponents/authentication.vue

@@ -12,15 +12,15 @@
       <div>姓名：{{ info.name }}</div>
       <div class="my-5">身份证号：{{ maskNumber(info.identityNo) }}</div>
       <div class="d-flex" v-if="info.status !== '1'">
-        <span>国徽照</span>
+        <span>人像照</span>
         <div class="ml-10" style="width: 120px; height: 120px;">
-          <v-img :src="info.backUrl" width="120" height="120" rounded alt=""/>
+          <v-img :src="info.frontUrl" width="120" height="120" rounded alt=""/>
         </div>
       </div>
       <div class="d-flex mt-5" v-if="info.status !== '1'">
-        <span>人像照</span>
+        <span>国徽照</span>
         <div class="ml-10" style="width: 120px; height: 120px;">
-          <v-img :src="info.frontUrl" width="120" height="120" rounded alt=""/>
+          <v-img :src="info.backUrl" width="120" height="120" rounded alt=""/>
         </div>
       </div>
     </div>
@@ -90,17 +90,17 @@ const formItems = ref({
       ]
     },
     {
-      slotName: 'backUrl',
-      key: 'backUrl',
+      key: 'frontUrl',
+      slotName: 'frontUrl',
       value: '',
-      label: '身份证-国徽照 *',
+      label: '身份证-人像照 *',
       rules: [v => !!v || '请上传']
     },
     {
-      key: 'frontUrl',
-      slotName: 'frontUrl',
+      slotName: 'backUrl',
+      key: 'backUrl',
       value: '',
-      label: '身份证-人像照 *',
+      label: '身份证-国徽照 *',
       rules: [v => !!v || '请上传']
     }
   ]

src/views/recruit/enterprise/positionManagement/components/item.vue

@@ -16,8 +16,8 @@
             <v-checkbox v-model="val.select" hide-details color="primary" @update:model-value="handleChangeSelect"></v-checkbox>
           </div>
           <div :class="[{'ml-10': tab !== 3 && tab !== 4} ,'d-flex' ,'align-center']">
-            <span v-if="val.name.indexOf('style')" v-html="val.name" class="position-name" @click="handleDetails(val)"></span>
-            <span v-else class="position-name" @click="handleDetails(val)">{{ val.name }}</span>
+            <span v-if="val.name.indexOf('style')" v-html="val.name" class="position-name"></span>
+            <span v-else class="position-name">{{ val.name }}</span>
             <svg-icon v-if="tab === 4" class="ml-3" name="pin" size="25"></svg-icon>
           </div>
           <div :class="['mt-3', 'other-info', 'ellipsis', {'ml-10': tab !== 3 && tab !== 4}]">
@@ -33,20 +33,14 @@
           </div>
           <div v-if="val?.hire" class="mt-2">
             <v-chip v-if="val?.hirePrice && val.hirePrice > 0" class="mr-3" label color="primary" size="small">赏金：{{ commissionCalculation(val.hirePrice, 1) }}元</v-chip>
-            <v-chip v-if="val?.hirePoint && val.hirePoint > 0" label color="primary" size="small">积分：{{ commissionCalculation(val.hirePoint, 1) }}点</v-chip>
+            <!-- <v-chip v-if="val?.hirePoint && val.hirePoint > 0" label color="primary" size="small">积分：{{ commissionCalculation(val.hirePoint, 1) }}点</v-chip> -->
           </div>
         </div>
         <div class="d-flex align-center">
-          <div v-if="tab === 1">
-            <!-- <v-btn color="primary" variant="tonal">{{ $t('position.talentSearch') }}</v-btn> -->
-            <v-btn class="ml-3" color="primary" @click="handleAction(2, '', val)">{{ $t('common.refresh') + $t('common.position') }}</v-btn>
-          </div>
-          <div v-if="tab === 2">
-            <v-btn color="primary" @click="handleAction(1, '', val)">{{ $t('common.activatePosition') }}</v-btn>
-          </div>
-          <div v-if="tab === 4 && (val.status-0) === 99">
-            <v-chip color="warning" label>职位待发布，支付后成功后自动发布</v-chip>
-          </div>
+          <v-btn v-if="tab === 1" class="ml-3" color="primary" @click="handleAction(2, '', val)">{{ $t('common.refresh') + $t('common.position') }}</v-btn>
+          <v-btn v-if="tab === 2" color="primary" @click="handleAction(1, '', val)">{{ $t('common.activatePosition') }}</v-btn>
+          <v-chip v-if="tab === 4 && (val.status-0) === 99" color="warning" label>职位待发布，支付后成功后自动发布</v-chip>
+          <v-chip v-if="tab === 4 && val.status === '1'" color="error" class="cursor-pointer" label  style="text-decoration: underline;" @click="handleAction(1, '', val)">职位已关闭，点击激活职位</v-chip>
         </div>
       </div>
       <div class="bottom pa-5 d-flex justify-space-between align-center">
@@ -58,20 +52,16 @@
               <span class="lines"></span>
             </div>
             <div v-if="tab === 1">
-              <span class="cursor-pointer" @click="handleAction(3, '', val)">{{ $t('common.topping') }}</span>
+              <span class="cursor-pointer actions" @click="handleAction(3, '', val)">{{ $t('common.topping') }}</span>
               <span class="lines"></span>
-              <span class="cursor-pointer" @click="handleAction(0, '', val)">{{ $t('common.close') }}</span>
+              <span class="cursor-pointer actions" @click="handleAction(0, '', val)">{{ $t('common.close') }}</span>
               <span class="lines"></span>
             </div>
-            <span class="cursor-pointer" @click="handleToStatistics">{{ $t('position.recruitmentStatistics') }}</span>
-            <div v-if="tab !== 3">
+            <div v-if="tab !== 3" class="cursor-pointer actions" @click="handleEdit(val)">{{ $t('common.edit') }}</div>
+            <div v-if="tab === 4 && (val.status - 0) !== 99 && val.status !== '1'">
               <span class="lines"></span>
-              <span class="cursor-pointer" @click="handleEdit(val)">{{ $t('common.edit') }}</span>
+              <span class="cursor-pointer actions" @click="handleAction(0, '', val)">{{ $t('common.close') }}</span>
             </div>
-            <!-- <div v-if="tab === 4">
-              <span class="lines"></span>
-              <span class="cursor-pointer">{{ $t('common.close') }}</span>
-            </div> -->
           </div>
         </div>
       </div>
@@ -187,14 +177,9 @@ const handleEdit = (val) => {
 }
 
 // 职位详情
-const handleDetails = (val) => {
-  window.open(`/recruit/enterprise/position/details/${val.id}`)
-}
-
-// 跳转招聘统计
-const handleToStatistics = () => {
-  router.push('/recruit/enterprise/statistics/overallAnalysis')
-}
+// const handleDetails = (val) => {
+//   window.open(`/recruit/enterprise/position/details/${val.id}`)
+// }
 </script>
 
 <style scoped lang="scss">
@@ -241,18 +226,7 @@ const handleToStatistics = () => {
   font-size: 14px;
   color: var(--color-888);
 }
-.resume {
-  display: flex;
-  font-size: 13px;
-  flex-direction: column;
-  align-items: center;
-  color: var(--color-888);
-  margin-right: 100px;
-  cursor: pointer;
-}
-.resume-number {
-  font-size: 20px;
-  font-weight: 700;
-  color: var(--color-999);
+.actions:hover {
+  color: var(--v-primary-base);
 }
 </style>

src/views/recruit/personal/remuse/components/workExperience.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="resume-box">
     <div class="resume-header mb-3">
-      <div class="resume-title">{{ $t('resume.workExperience') }}</div>
+      <div class="resume-title">
+        {{ $t('resume.workExperience') }}
+        <span class="color-warning font-size-14">（{{ $t('resume.workExperienceTips')}}）</span>
+      </div>
       <v-btn  variant="text" color="primary" prepend-icon="mdi-plus-box" @click="handle(0)">{{ $t('common.add') }}</v-btn>
     </div>
     <!-- 编辑-表单 -->
@@ -39,7 +42,7 @@
           <span class="color6 font15">{{ item.positionName }}</span>
         </div>
         <div class="level3">
-          <span class="color6 font15">工作内容：{{ item.content }}</span>
+          <span class="color6 font15">{{ $t('resume.jobContent') }} {{ item.content }}</span>
         </div>
       </div>
     </div>