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

components.d.ts

@@ -30,6 +30,7 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v25.02.10.1944'
+export const vue_version = 'v25.02.11.1749'

src/views/recruit/enterprise/systemManagement/groupAccount/index.vue

@@ -27,7 +27,10 @@
       <div style="width: 80%" class="ml-3">
         <div class="d-flex justify-space-between px-3">
           <TextInput v-model="query.name" :item="textItem" @change="getUserList"></TextInput>
-          <v-btn prepend-icon="mdi-plus" color="primary" @click="handleAdd(0)">{{ $t('enterprise.userManagement.inviteNewColleagues') }}</v-btn>
+          <div>
+            <v-btn class="mr-3" color="primary" variant="outlined" width="100" @click="getTreeData">刷 新</v-btn>
+            <v-btn prepend-icon="mdi-plus" color="primary" @click="handleAdd(0)">{{ $t('enterprise.userManagement.inviteNewColleagues') }}</v-btn>
+          </div>
         </div>
         <CtTable
           :items="tableData"
@@ -43,14 +46,6 @@
         >
           <template #name="{ item }">
             <div class="d-flex align-center">
-              <!-- <v-badge
-                v-if="(item?.sex === '1' || item?.sex === '2') && showBadge"
-                bordered
-                offset-y="6"
-                :color="badgeColor(item)"
-                :icon="badgeIcon(item)">
-                <v-avatar size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
-              </v-badge> -->
               <v-avatar size="40" :image="getUserAvatar(item.avatar, item.sex)"></v-avatar>
               <span class="ml-3">{{ item?.name }}</span>
             </div>
@@ -94,7 +89,7 @@
 
 <script setup>
 defineOptions({ name: 'group-account'})
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { timesTampChange } from '@/utils/date'
 import { getEnterpriseTree } from '@/api/recruit/enterprise/system/group'
@@ -109,7 +104,6 @@ import { getToken } from '@/utils/auth'
 import { formatName } from '@/utils/getText';
 
 const { t } = useI18n()
-const showBadge = ref(false) // 性别设置甲方要求已去掉
 const total = ref(0)
 const loading = ref(false)
 const query = ref({
@@ -137,13 +131,6 @@ const textItem = ref({
   clearable: true,
   label: '请输入用户名称搜索'
 })
-// const badgeColor = computed(() => (item) => {
-//   return (item && item.sex) ? (item.sex === '1' ? '#1867c0' : 'error') : 'error'
-// })
-
-// const badgeIcon = computed(() => (item) => {
-//   return (item && item.sex) ? (item.sex === '1' ? 'mdi-gender-male' : 'mdi-gender-female') : 'mdi-gender-female'
-// })
 
 // 获取用户列表
 const getUserList = async () => {
@@ -159,6 +146,7 @@ const getUserList = async () => {
 
 // 获取树形列表
 const getTreeData = async () => {
+  treeData.value = []
   const data = await getEnterpriseTree()
   if (!data) return
   treeData.value = [data]
@@ -214,14 +202,6 @@ const formItems = ref({
       key: 'avatar',
       value: null
     },
-    // {
-    //   type: 'ifRadio',
-    //   key: 'sex',
-    //   value: '',
-    //   label: '性别 *',
-    //   width: 90,
-    //   items: []
-    // },
     {
       type: 'text',
       key: 'name',
@@ -262,11 +242,6 @@ const formItems = ref({
     }
   ]
 })
-// getDict('menduner_sex').then(({ data }) => {
-//   data = data?.length && data || []
-//   formItems.value.options.find(e => e.key === 'sex').items = data
-// })
-
 
 // 编辑员工信息
 const showEdit = ref(false)
@@ -333,7 +308,6 @@ const handleSubmit = async () => {
     id: editId.value
   } 
   formItems.value.options.forEach(e => { obj[e.key] = e.value })
-  // if (!obj.sex || obj.sex === '0') return Snackbar.warning('请选择员工性别')
   await updateGroupUserAccount(obj)
   showEdit.value = false
   editId.value = null

src/views/recruit/personal/home/components/homeJobTypeCard/index.vue

@@ -241,9 +241,8 @@ const handleClick = (item) => {
   }
   .rightCard {
     height: 384px;
-    // min-width: 786px;
     margin: 4px 0;
-    padding: 0 16px;
+    padding: 12px;
     overflow-y: auto;
     .categoryName { font-size: 16px; line-height: 28px; margin-top: 6px; color: var(--v-primary-base)}
     .categoryName2 { font-size: 14px; color: var(--color-666); width: 110px; margin-right: 4px;}