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

src/layout/company/navBar.vue

@@ -14,8 +14,8 @@
         
         <div class="d-flex user-nav">
           <div class="d-flex align-center cursor-pointer" @click="handleEnterpriseClick">
-            <v-img rounded width="40" height="40" src="https://minio.citupro.com/dev/menduner/7.png" ></v-img>
-            <span class="ml-3">广州辞图科技有限公司</span>
+            <v-img @click="enterpriseClick(2)" rounded width="40" height="40" src="https://minio.citupro.com/dev/menduner/7.png" ></v-img>
+            <span @click="enterpriseClick(1)" class="ml-3">广州辞图科技有限公司</span>
           </div>
           <div class="line"></div>
           
@@ -105,7 +105,11 @@ const handleToPersonalCenter = () => {
   // router.push({ path: '/personalCenter' })
 }
 const handleEnterpriseClick = () => {
-  router.push({ path: '/enterprise/enterpriseCenter?key=briefIntroduction' })
+  // router.push({ path: '/enterprise/enterpriseCenter?key=mIntroduction' })
+}
+const enterpriseClick = (tabKey = 1) => {
+  const path = '/enterprise/systemManagement/informationSettings'
+  router.push({ path, query: { tabKey } })
 }
 
 // 退出登录

src/router/modules/enterprise.js

@@ -120,6 +120,23 @@ const enterprise = [
       }
     ]
   },
+  {
+    path: '/enterprise/personnelManagement',
+    component: Layout,
+    name: 'personnelManagement',
+    meta: {
+      title: '牛人管理',
+      enName: 'Personnel Management',
+      icon: 'mdi-account-settings-outline'
+    },
+    children: [
+      {
+        path: '/enterprise/personnelManagement',
+        show: true,
+        component: () => import('@/views/enterprise/personnelManagement/index.vue')
+      }
+    ]
+  },
   {
     path: '/enterprise/systemManagement',
     component: Layout,
@@ -133,7 +150,6 @@ const enterprise = [
     children: [
       {
         path: '/enterprise/systemManagement/informationSettings',
-        // show: true,
         meta: {
           title: '企业信息设置',
           enName: 'Enterprise Information Settings'

src/views/enterprise/personnelManagement/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>牛人管理</div>
+</template>
+
+<script setup>
+defineOptions({ name: 'enterprise-personnelManagement-management'})
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/enterprise/systemManagement/informationSettings.vue

@@ -3,7 +3,7 @@
   <div>
     <v-card class="card-box pa-5">
       <div>
-        <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#fff">
+        <v-tabs v-model="tab" @update:model-value="handleTabClick" align-tabs="start" color="primary" bg-color="#fff">
           <v-tab :value="1">{{ $t('enterprise.infoSetting.basicInfo') }}</v-tab>
           <v-tab :value="2">{{ $t('enterprise.infoSetting.enterpriseLogo') }}</v-tab>
           <v-tab :value="3">{{ $t('enterprise.infoSetting.enterpriseAlbum') }}</v-tab>
@@ -43,11 +43,11 @@ import enterpriseAlbum from './informationSettingsComponents/enterpriseAlbum.vue
 import welfareLabel from './informationSettingsComponents/welfareLabel.vue'
 import enterpriseVideo from './informationSettingsComponents/enterpriseVideo.vue'
 import recruitmentQRCode from './informationSettingsComponents/recruitmentQRCode.vue'
-import { provide, ref } from 'vue'
+import { provide, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+const route = useRoute(); const router = useRouter()
 defineOptions({ name: 'enterprise-system-management-information-settings'})
 
-const tab = ref(1)
-
 const infoData = {
   name: '苏州工业园区娄葑镇香草叶咖啡店', // 企业名称
   suoZaiDi: '江苏 苏州 吴中区',
@@ -59,6 +59,13 @@ const infoData = {
   content: '香草叶总部位于苏州，始创于2010年；主营业务是中西结合简餐，以西式为主，适宜商务宴请、休闲小憩、情侣约会、家庭和朋友聚餐。创始人基于对西餐的热爱和菜品高品质的要求，不断研发和丰富菜品，中西结合式简餐，深受顾客朋友们的喜爱。诚邀志同道合者，热爱餐饮业的有志之士加盟香草叶！',
 }
 provide('infoData', JSON.stringify(infoData))
+
+// tab
+const tab = ref(1)
+watch(() => route?.query?.tabKey, (newVal) => { if (newVal) tab.value = newVal - 0 })
+const handleTabClick = () => {
+  router.push(`${route.path}?tabKey=${tab.value.toString()}`)
+}
 </script>
 
 <style scoped lang="scss">

src/views/enterprise/systemManagement/informationSettingsComponents/basicInfo.vue

@@ -162,6 +162,19 @@ const formItems = ref({
   ]
 })
 formItems.value.options.forEach(e => { if (infoData[e.key]) e.value = infoData[e.key] })
+const handleSave = async () => {
+  // const { valid } = await formPageRef.value.formRef.validate()
+  // if (!valid) return
+  // items.value.options.forEach(e => {
+  //   if (arr.includes(e.key)) query[e.key] = e.value 
+  // })
+  // if (editId.value) query.id = editId.value
+  // await saveResumeJobInterested(query)
+  // Snackbar.success('保存成功')
+  // isAdd.value = false
+  // resetForm()
+  // getJobInterested()
+}
 </script>
 <style lang="scss" scoped>
 .topTip {

src/views/recruit/position/components/areaCascader/index.vue

@@ -135,9 +135,9 @@ const getIdChecked = (item, levelIndex) => {
 // item: 当前操作数据（被点击的数据本身）
 // index: 当前操作数据的层级
 // expand: 展开下级
-// updateSearch: 是否刷新数据(职位列表)：回显选中不需要刷新，刷新页面使用的是路由中的参数
+// updateSearch: 是否刷新数据(职位列表)：刷新页面回显选中不需要刷新 使用的是路由中的参数
 const handleNext = ({ item, index, expand = true, updateSearch = true }) => {
-  getIdChecked(item, index)
+  if (expand) getIdChecked(item, index) // 设置默认选中第一个并展开
   if (updateSearch) emits('checkedInput', idChecked)
   if (expand && item.children && item.children.length) {
     treeList.value[index + 1] = item.children

src/views/recruit/position/components/cityFilter.vue

@@ -5,7 +5,7 @@
       </v-tabs>
       <v-window v-model="tab" class="mt-3">
         <v-window-item :value="1">
-          <areaTree :defaultOpen="2" @checkedInput="checkedInputChange"></areaTree>
+          <areaTree :defaultOpen="1" @checkedInput="checkedInputChange"></areaTree>
         </v-window-item>
       </v-window>
     </div>