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

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

@@ -46,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>
@@ -62,7 +54,7 @@
             <v-btn v-if="item.userType === '0'" color="primary" variant="text" @click="handleEdit(item)">编辑</v-btn>
             <v-btn v-if="item.status === '1' && item.userType !== '1'" color="primary" variant="text" @click="handleAction('', 0, item)">{{ $t('enterprise.userManagement.enable') }}</v-btn>
             <v-btn v-if="item.status === '0' && item.userType !== '1'" color="primary" variant="text" @click="handleAction('', 1, item)">{{ $t('enterprise.userManagement.disable') }}</v-btn>
-            <v-btn v-if="item.status === '0' && item.userType !== '1'" color="primary" variant="text" @click="handleRole(item)">分配角色</v-btn>
+            <v-btn v-if="item.status === '0' && item.userType !== '1' && item.enterpriseId.toString() === enterpriseInfo?.enterpriseId.toString()" color="primary" variant="text" @click="handleRole(item)">分配角色</v-btn>
           </template>
         </CtTable>
       </v-col>
@@ -125,7 +117,6 @@ import {
 } from '@/api/recruit/enterprise/system/role'
 
 const { t } = useI18n()
-const showBadge = ref(false) // 性别设置甲方要求已去掉
 const total = ref(0)
 const loading = ref(false)
 const query = ref({
@@ -134,6 +125,10 @@ const query = ref({
   enterpriseId: '',
   name: null
 })
+
+// 企业基本信息
+const enterpriseInfo = ref(localStorage.getItem('entBaseInfo') ? JSON.parse(localStorage.getItem('entBaseInfo')) : {})
+
 const tableData = ref([])
 const treeData = ref([])
 const headers = [
@@ -153,13 +148,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'
-// })
 
 
 // 角色分配