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

src/locales/en.js

@@ -127,6 +127,7 @@ export default {
     drafts: 'Drafts',
     closed: 'Closed',
     recruitmentInProgress: 'Recruitment In Progress',
+    publicRecruitment: 'Crowdsourced positions',
     newPositionsAdded: 'New positions added',
     screen: 'Screen',
     positionName: 'Please enter the position name',

src/locales/zh-CN.js

@@ -124,6 +124,7 @@ export default {
     haveSeenMe: '看过我',
     pausePublishing: '暂停发布',
     expiredPosition: '到期职位',
+    publicRecruitment: '众聘岗位',
     drafts : '草稿箱',
     closed: '已关闭',
     recruitmentInProgress: '招聘中',

src/views/enterprise/informationSetting/index.vue

@@ -2,18 +2,20 @@
   <v-card class="pa-5 card-box d-flex flex-column align-center">
     <CtForm ref="CtFormRef" :items="formItems" style="width: 700px;">
       <template #avatar="{ item }">
+        <div style="color: #7a7a7a;">头像</div>
         <div class="avatarsBox" @mouseover="showIcon = true" @mouseleave="showIcon = false">
           <v-avatar class="elevation-5" size=80 :image="item.value || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
-            <div v-show="showIcon" @click="openFileInput" v-bind="$attrs" class="mdi mdi-camera-outline">
-              <input
-                type="file"
-                ref="fileInput"
-                accept="image/png, image/jpg, image/jpeg"
-                style="display: none;"
-                @change="handleUploadFile"
-              />
-            </div>
+          <div v-show="showIcon" @click="openFileInput" v-bind="$attrs" class="mdi mdi-camera-outline">
+            <input
+              type="file"
+              ref="fileInput"
+              accept="image/png, image/jpg, image/jpeg"
+              style="display: none;"
+              @change="handleUploadFile"
+            />
+          </div>
         </div>
+        <div style="font-size: 14px; color: #999;">只支持JPG、JPEG、PNG类型的图片，大小不超过10M</div>
       </template>
     </CtForm>
     <v-btn class="buttons mt-5" color="primary" @click.stop="handleSubmit">提 交</v-btn>
@@ -39,7 +41,8 @@ const formItems = ref({
     {
       slotName: 'avatar',
       key: 'avatar',
-      value: ''
+      value: '',
+      flexStyle: 'align-center'
     },
     {
       type: 'ifRadio',

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

@@ -56,6 +56,10 @@
               <span class="lines"></span>
               <span class="cursor-pointer" @click="handleEdit(val)">{{ $t('common.edit') }}</span>
             </div>
+            <div v-if="tab === 4">
+              <span class="lines"></span>
+              <span class="cursor-pointer">{{ $t('common.close') }}</span>
+            </div>
           </div>
         </div>
       </div>

src/views/enterprise/positionManagement/index.vue

@@ -10,19 +10,11 @@
       
       <div class="mt-3">
         <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
-          <v-tab :value="1"> {{ $t('position.recruitmentInProgress') }}</v-tab>
-          <v-tab :value="2"> {{ $t('position.closed') }}</v-tab>
-          <v-tab :value="3"> {{ $t('position.expiredPosition') }}</v-tab>
+          <v-tab v-for="val in tabList" :key="val.value" :value="val.value"> {{ val.label }}</v-tab>
         </v-tabs>
         <v-window v-model="tab" class="mt-1">
-          <v-window-item :value="1">
-            <PositionItem v-if="items.length" :tab="tab" :items="items" @refresh="getPositionList"></PositionItem>
-          </v-window-item>
-          <v-window-item :value="2">
-            <PositionItem v-if="items.length" :tab="tab" :items="items" @refresh="getPositionList"></PositionItem>
-          </v-window-item>
-          <v-window-item :value="3">
-            <PositionItem v-if="items.length" :tab="tab" :items="items"></PositionItem>
+          <v-window-item v-for="val in tabList" :key="val.value" :value="val.value">
+            <PositionItem v-if="items.length" :tab="val.value" :items="items" @refresh="getPositionList"></PositionItem>
           </v-window-item>
         </v-window>
         <Empty v-if="!items.length" :message="tipsText" :elevation="false"></Empty>
@@ -46,7 +38,9 @@ import PositionItem from './components/item.vue'
 import { useRouter } from 'vue-router'
 import { getJobAdvertisedList } from '@/api/position'
 import { dealDictArrayData } from '@/views/recruit/position/components/dict'
+import { useI18n } from '@/hooks/web/useI18n'
 
+const { t } = useI18n()
 const router = useRouter()
 const tab = ref(1)
 const total = ref(0)
@@ -55,6 +49,12 @@ const query = ref({
   pageSize: 10,
   pageNo: 1
 })
+const tabList = [
+  { label: t('position.recruitmentInProgress'), value: 1 },
+  { label: t('position.closed'), value: 2 },
+  { label: t('position.expiredPosition'), value: 3 },
+  { label: t('position.publicRecruitment'), value: 4 }
+]
 
 const items = ref([])
 const textItem = ref({

src/views/enterprise/systemManagement/userManagement/index.vue

@@ -43,8 +43,7 @@ const items = ref([])
 const selected = ref([])
 const query = ref({
   pageNo: 1,
-  pageSize: 10,
-  status: 0
+  pageSize: 10
 })
 
 const headers = [