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

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

@@ -222,7 +222,8 @@ const handleAction = async (index, type, { id }, item) => {
 
   // 关闭职位提醒
   if (index === 0) {
-    Confirm('系统提示', '是否确认关闭所选职位？关闭后再激活需重新收取费用！').then(async () => {
+    const text = baseInfo.value?.entitlement?.publishJobCount && baseInfo.value?.entitlement?.publishJobCount > 0 ? '将消耗一个发布点数' : '将重新收取费用'
+    Confirm('系统提示', `是否确认关闭所选职位？关闭后再激活，${text}`).then(async () => {
       await apiList[index](ids)
       Snackbar.success(t('common.operationSuccessful'))
       // 清空选项

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

@@ -88,7 +88,7 @@ const getJobList = async (k) => {
   const list = dealDictArrayData([], data)
   k.items = list.map(e => {
     const salary = e.payFrom && e.payTo ? `${e.payFrom}-${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id }
+    return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === '0' ? '招聘中' : '已关闭'}`, value: e.id }
   })
   return k.items
 }

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

@@ -96,7 +96,7 @@ const getJobList = async () => {
     const list = dealDictArrayData([], data)
     selectItems.value.items = list.map(e => {
       const salary = e.payFrom && e.payTo ? `${e.payFrom}-${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-      return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id, data: e }
+      return { label: `${e.name}${e.areaName ? '_' + e.areaName : ''} ${salary}_${e.status === '0' ? '招聘中' : '已关闭'}`, value: e.id, data: e }
     })
   }
 }