fix:机构管理人员管理逻辑调整

Signed-off-by: tsz <2417024719@qq.com>

entbase-pc/src/views/ent/components/depart.vue

@@ -10,7 +10,6 @@
         <div class="ent-depart-table"  v-loading="loading">
             <h4>
               <strong>公司/部⻔名称</strong>
-              <strong v-if="$store.state.companyMsg.nicheDis_show === 1">资讯分配</strong>
               <strong>管理员</strong>
               <strong>人数</strong>
               <strong v-if="hasAuth">操作</strong>
@@ -18,14 +17,6 @@
             <ul>
                 <li v-if="companyMsg">
                     <span>{{ companyData.department }}</span>
-                    <span v-if="$store.state.companyMsg.nicheDis_show === 1">
-                      <el-tooltip popper-class="depart-tooltip" class="item" effect="dark" :content="companyData.nicheDis" placement="bottom">
-                        <template slot="content">
-                          <div class="tooltip-content">{{ companyData.nicheDis }}</div>
-                        </template>
-                        <i style="display: block;width: 308px;" class="ellipsis">{{ companyData.nicheDis }}</i>
-                      </el-tooltip>
-                    </span>
                     <span>{{ companyMsg.role }}</span>
                     <span>{{ companyMsg.num }}</span>
                     <span>
@@ -46,7 +37,6 @@
                     node-key="id">
                     <span class="custom-tree-node" slot-scope="{ data }">
                         <span>{{ data.label }}</span>
-                        <span v-if="$store.state.companyMsg.nicheDis_show === 1">{{ data.nicheDis || "--" }}</span>
                         <span>{{ data.aname || "--" }}</span>
                         <span>{{ data.user_count }}</span>
                         <span>

entbase-pc/src/views/ent/components/personal.vue

@@ -96,15 +96,16 @@
         <el-table-column :style="{ width: '21.4%' }" label="角色" width="21.4%">
           <template slot-scope="scope">
             <span v-if="scope.row.role == '企业管理员'" class="company_user">
-              {{ scope.row.role }}<i>、</i>{{ setAllocition(scope.row.niche_dis) }}
+              {{ scope.row.role }}
+              <span v-if="$store.state.companyMsg.nicheDis_show === 1">、{{ setAllocition(scope.row.niche_dis) }}</span>
             </span>
             <span v-if="scope.row.role == '部门管理员'" class="depart_user">
-              {{ scope.row.role }}<i>、</i>{{ setAllocition(scope.row.niche_dis) }}
+              {{ scope.row.role }}
+              <span v-if="$store.state.companyMsg.nicheDis_show === 1">、{{ setAllocition(scope.row.niche_dis) }}</span>
             </span>
             <span v-if="scope.row.role == ''">
               {{ $store.state.companyMsg.nicheDis_show === 1 ? '销售' : '员工' }}
-              <!-- <i>、</i> -->
-              <!-- <span>{{ setAllocition(scope.row.niche_dis) }}</span> -->
+              <span v-if="$store.state.companyMsg.nicheDis_show === 1 && setAllocition(scope.row.niche_dis) !== '销售'">、{{ setAllocition(scope.row.niche_dis) }}</span>
             </span>
           </template>
         </el-table-column>