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

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElImage: typeof import('element-plus/es')['ElImage']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']
@@ -76,7 +75,4 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

src/components/Enterprise/hotPromoted.vue

@@ -21,7 +21,7 @@
           </div>
         </div>
         <div v-ellipse-tooltip.top class="px-5 py-1 ellipsis-tag" :style="{'height': '33px', 'border-bottom': item.enterprise.welfareList && item.enterprise.welfareList.length ? '1px solid #EBEBEB' : 'none'}">
-          <span class="welfareTag mr-5" v-for="(k, i) in item.enterprise.welfareList" :key="i">{{ k }}</span>
+          <span class="welfareTag" v-for="(k, i) in item.enterprise.welfareList" :key="i">{{ spaces(i ? 4 : 0) + k }}</span>
         </div>
         <!-- 职位列表 -->
         <!-- :class="{'company-job-item-hover': k.active}" -->
@@ -62,6 +62,7 @@ import { timesTampChange } from '@/utils/date'
 import { formatName } from '@/utils/getText'
 import { jumpToEnterpriseDetail } from '@/utils/position'
 import { useRouter } from 'vue-router'
+  import { spaces } from '@/utils/index.js'
 
 const props = defineProps({
   items: {

src/components/Position/item.vue

@@ -129,6 +129,8 @@ const handlePosition = (item) => {
   }
   &:hover {
     box-shadow: 0 16px 40px 0 rgba(153, 153, 153, .3);
+    background-color: var(--v-primary-lighten5);
+    // border: 1px solid var(--v-primary-lighten4);
   }
 }
 .job-info {
@@ -207,7 +209,7 @@ const handlePosition = (item) => {
   font-weight: 500;
   color: #404040;
   &:hover {
-    color: var(--v-primary-base);
+    color: var(--v-error-base);
   }
 }
 </style>

src/styles/index.scss

@@ -7,6 +7,7 @@
   --v-primary-lighten2: #4DB6AC;
   --v-primary-lighten3: #80CBC4;
   --v-primary-lighten4: #B2DFDB;
+  --v-primary-lighten5: #b2dfdb9c;
   --color-222: #222;
   --color-333: #333;
   --color-666: #666;

src/views/recruit/enterprise/invoiceManagement/index.vue

@@ -101,6 +101,8 @@ const handleChangeCategory = (categoryType = 0) => { // 0: 个人, 1: 企业
   })
   nextTick(() => {
     formItems.value.options = arr
+    const typeItem = formItems.value.options.find(e => e.key === 'type')
+    handleChangeType(typeItem?.value || 0)
   })
 }
 
@@ -109,10 +111,10 @@ const handleChangeType = (isVerified) => {
   invoiceHeaderTip.value = isVerified
   formItems.value.options.forEach(e => {
     if (business.value[e.key]) e.value = business.value[e.key] // business.value
-    if (e.key === 'title') e.disabled = isVerified
+    if (e.key === 'title') e.disabled = Boolean(isVerified)
     if (e.rulesBaseLabel) {
       e.label = isVerified ? `${e.rulesBaseLabel} *` : e.rulesBaseLabel
-      e.rules = isVerified ? [v => !!v || `请输入${e.rulesBaseLabel}`, ...e.rules] : []
+      e.rules = isVerified ? e.rules ? [v => !!v || `请输入${e.rulesBaseLabel}`, ...e.rules] : [v => !!v || `请输入${e.rulesBaseLabel}`] : []
     }
   })
 }
@@ -258,7 +260,6 @@ const handle = (item) => {
   editId.value = item?.id || null
   editInfo.value = item || null
   handleChangeCategory(item?.category || 0)
-  handleChangeType(item?.type || 0)
   show.value = true
 }