浏览代码

企业头像丢失bug修复

Xiao_123 9 月之前
父节点
当前提交
118ebb8236

+ 2 - 8
src/layout/company/navBar.vue

@@ -129,12 +129,6 @@ const handleLogout = async () => {
 const enterpriseList = ref([])
 
 const menuList = ref([
-  // { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/recruit/enterprise/memberCenter/myAccount' }) },
-  // { title: t('vipPackage.purchasePackage'), icon: 'mdi-gift-outline', change: () => window.open('/recruit/enterprise/purchasePackage') },
-  // { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/recruit/enterprise/staffInfoSetting' }) },
-  // { title: t('setting.switchToOtherCompany'), icon: 'mdi-home-switch', hidden: enterpriseList.value?.length < 2, change: () => handleSwitchToAnotherEnterprise },
-  // { title: t('enterprise.registeringNewEnterprise'), icon: 'mdi-home-plus-outline', change: () => handleRegisteringNewEnterprise },
-  // { title: t('setting.switchToJobSeeker'), icon: 'mdi-swap-horizontal', change: handleLogout },
   { title: t('setting.logOut'), icon: 'mdi-logout', change: handleLogout }
 ])
 const items = computed(() => {
@@ -146,8 +140,8 @@ let baseInfo = ref(JSON.parse(localStorage.getItem('entBaseInfo')) || {})
 let enterpriseUserAccount = ref(JSON.parse(localStorage.getItem('enterpriseUserAccount')) || {}) // 账户信息
 
 userStore.$subscribe((mutation, state) => {
-  baseInfo.value = state.baseInfo
-  enterpriseUserAccount.value = state.enterpriseUserAccount
+  if (Object.keys(state.baseInfo).length) baseInfo.value = state.entBaseInfo
+  if (Object.keys(state.enterpriseUserAccount).length) enterpriseUserAccount.value = state.enterpriseUserAccount
 })
 
 // 语言切换

+ 1 - 1
src/views/recruit/components/message/components/chatting.vue

@@ -142,7 +142,7 @@
               </v-chip>
               <v-card v-if="val.payload.content?.type !== 2 || val.from_uid !== IM.uid" width="300" class="pa-3 ma-2" color="teal" variant="tonal" :elevation="3">
                 <v-card-text class="d-flex">
-                  <p v-if="val.payload.content?.type === 1">{{ val.payload.content?.query?.title || t('resume.attachmentResume') }}</p>
+                  <p v-if="val.payload.content?.type === 1" style="width: 100%; text-align: left;">{{ val.payload.content?.query?.title || t('resume.attachmentResume') }}</p>
                   <p v-if="val.payload.content?.type === 2">{{ t('resume.requestResume') }}</p>
                 </v-card-text>
                 <v-card-actions class="justify-center">

+ 1 - 1
src/views/recruit/entRegister/register.vue

@@ -225,7 +225,7 @@ const handleCommit = async () => {
   }
   formItems.value.options.forEach(e => { params[e.key] = e.value })
   // 邮箱登录密码校验
-  if (params.password !== params.passwordConfirm) return Snackbar.warning('两次输入的密码不一致,请确认')
+  // if (params.password !== params.passwordConfirm) return Snackbar.warning('两次输入的密码不一致,请确认')
 
   await enterpriseRegisterApply(params)
   localStorage.removeItem('loginAccount')

+ 1 - 0
src/views/recruit/enterprise/entInfoSetting/index.vue

@@ -32,6 +32,7 @@
               class="mb-3"
               :is="item.path"
               @complete="complete"
+              @change="val => tab = val"
             />
           </div>
         </template>

+ 2 - 2
src/views/recruit/enterprise/entInfoSetting/informationSettingsComponents/basicInfo.vue

@@ -6,7 +6,7 @@
       <template #name="{ item }">
         <div v-show="!item.show" class="text-right" style="width: 80px; line-height: 40px;">
           <v-icon :color="statusInfo.color" size="20">{{ statusInfo.mdi }}</v-icon>
-          <span :style="{'color': statusInfo.color,'font-size': '14px'}">{{ statusInfo.label }}</span>
+          <span class="cursor-pointer text-decoration-underline" :style="{'color': statusInfo.color,'font-size': '14px'}" @click="emit('change', 6)">{{ statusInfo.label }}</span>
         </div>
       </template>
       <template #industryId="{ item }">
@@ -40,7 +40,7 @@ import { getDict } from '@/hooks/web/useDictionaries'
 import { useI18n } from '@/hooks/web/useI18n'
 import industryTypeCard from '@/components/industryTypeCard'
 import Snackbar from '@/plugins/snackbar'
-const emit = defineEmits(['complete'])
+const emit = defineEmits(['complete', 'change'])
 
 const { t } = useI18n()
 const CtFormRef = ref()

+ 8 - 0
src/views/recruit/enterprise/hirePosition/components/jobRequirements.vue

@@ -119,6 +119,10 @@ const items = ref({
         value => {
           if (value >= 1) return true
           return '数额不得小于1'
+        },
+        value => {
+          if (value < items.value.options.find(e => e.key === 'payTo').value) return true
+          return '不得大于最高薪资'
         }
       ]
     },
@@ -138,6 +142,10 @@ const items = ref({
         value => {
           if (value >= 1) return true
           return '数额不得小于1'
+        },
+        value => {
+          if (value > items.value.options.find(e => e.key === 'payFrom').value) return true
+          return '不得小于最高薪资'
         }
       ]
     },

+ 1 - 0
src/views/recruit/enterprise/interviewManagement/components/invite.vue

@@ -7,6 +7,7 @@
         class="mb-4"
         model-type="timestamp"
         :disabled-dates="disabledDates"
+        :day-names="['一', '二', '三', '四', '五', '六', '七']"
         :text-input="{ format: 'MM.dd.yyyy HH:mm' }" />
     </template>
   </CtForm>

+ 7 - 0
src/views/recruit/enterprise/personnelManagement/components/invite.vue

@@ -6,6 +6,8 @@
         placeholder="面试时间 *"
         class="mb-4"
         model-type="timestamp"
+        :disabled-dates="disabledDates"
+        :day-names="['一', '二', '三', '四', '五', '六', '七']"
         :text-input="{ format: 'MM.dd.yyyy HH:mm' }" />
     </template>
   </CtForm>
@@ -22,6 +24,11 @@ const props = defineProps({
   }
 })
 
+// 过去的日期不可选
+const disabledDates = (date) => {
+  return date.getTime() < new Date().getTime()
+}
+
 const CtFormRef = ref()
 const formItems = ref({
   options: [

+ 9 - 1
src/views/recruit/enterprise/positionManagement/components/jobRequirements.vue

@@ -119,13 +119,17 @@ const items = ref({
         value => {
           if (value >= 1) return true
           return '数额不得小于1'
+        },
+        value => {
+          if (value < items.value.options.find(e => e.key === 'payTo').value) return true
+          return '不得大于最高薪资'
         }
       ]
     },
     {
       type: 'text',
       key: 'payTo',
-      value: '',
+      value: '10',
       col: 4,
       label: '最高薪资 *',
       flexStyle: 'mx-3',
@@ -138,6 +142,10 @@ const items = ref({
         value => {
           if (value >= 1) return true
           return '数额不得小于1'
+        },
+        value => {
+          if (value > items.value.options.find(e => e.key === 'payFrom').value) return true
+          return '不得小于最高薪资'
         }
       ]
     },

+ 7 - 0
src/views/recruit/enterprise/resume/components/invite.vue

@@ -6,6 +6,8 @@
         placeholder="面试时间 *"
         class="mb-4"
         model-type="timestamp"
+        :disabled-dates="disabledDates"
+        :day-names="['一', '二', '三', '四', '五', '六', '七']"
         :text-input="{ format: 'MM.dd.yyyy HH:mm' }" />
     </template>
   </CtForm>
@@ -22,6 +24,11 @@ const props = defineProps({
   }
 })
 
+// 过去的日期不可选
+const disabledDates = (date) => {
+  return date.getTime() < new Date().getTime()
+}
+
 const CtFormRef = ref()
 const formItems = ref({
   options: [