Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env.dev

src/router/routes/home.js

@@ -1,16 +1,5 @@
 import { SmileOutlined } from '@ant-design/icons-vue'
 
 export default [
-    {
+
-        path: 'home',
-        name: 'home',
-        component: 'home/index.vue',
-        meta: {
-            icon: SmileOutlined,
-            title: '欢迎页',
-            isMenu: true,
-            keepAlive: true,
-            permission: '*',
-        },
-    },
 ]

src/views/talentCenter/recruitment/components/EditDialog.vue

@@ -14,7 +14,7 @@
                             <a-form-item :label="'所属基地'" name="jobAreaId">
                                 <div style="display: flex;justify-content: space-between;">
                                     <a-select v-model:value="formData.jobAreaId" allowClear>
-                                        <a-select-option v-for="item in areaList" :value="item.code">{{ item.name }}</a-select-option>
+                                        <a-select-option v-for="item in areaList" :value="item.id">{{ item.name }}</a-select-option>
                                     </a-select>
                                     <a-button type="primary" @click="childOpen = true">新增基地</a-button>
                                 </div>
@@ -134,11 +134,7 @@ const initData = async () => {
         const { success, data, total } = await apis.recruitment.getAreasList({ pageSize: 999, page: 1, })
         if (config('http.code.success') === success) {
             hideSpining()
-            areaList.value = data.map(item => {
+            areaList.value = data.filter(el=>el.status==='enabled').map(item => ({ code: item.id, name: item.name }))
-                if (item.status === 'enabled') {
-                    return { code: item.id, name: item.name }
-                }
-            })
         }
     } catch (error) {
         message.error({ content: error.message })

src/views/talentCenter/recruitment/index.vue

@@ -55,11 +55,11 @@
                                 <div class="text-ellipsis">{{ record.introduce }}</div>
                             </a-tooltip>
                         </template>
-                        <template v-if="column.dataIndex === 'benefits'">
+                        <!-- <template v-if="column.dataIndex === 'benefits'">
                             <a-tooltip :title="record.benefits">
                                 <div class="text-ellipsis">{{ record.benefits }}</div>
                             </a-tooltip>
-                        </template>
+                        </template> -->
                         <template v-if="column.dataIndex === 'duty'">
                             <a-tooltip :title="record.duty">
                                 <div class="text-ellipsis">{{ record.duty }}</div>