ims在线用户信息

src/views/neUser/ims/index.vue

@@ -22,6 +22,8 @@ let queryParams = reactive({
   imsi: '',
   /**msisdn */
   msisdn: '',
+  /** 租户名称*/
+  tenantName: '',
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -33,6 +35,7 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     imsi: '',
     msisdn: '',
+    tenantName: '',
     pageNum: 1,
     pageSize: 20,
   });
@@ -80,7 +83,13 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 150,
   },
-
+  {
+    title: 'Tenant Name',
+    dataIndex: 'tenantName',
+    align: 'center',
+    key: 'tenantName',
+    width: 150,
+  },
   {
     title: 'Barring',
     dataIndex: 'barring',
@@ -212,7 +221,7 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item :label="t('views.neUser.ims.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
@@ -221,17 +230,29 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi">
               <a-input v-model:value="queryParams.imsi" allow-clear></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item label="MSISDN" name="msisdn">
               <a-input v-model:value="queryParams.msisdn" allow-clear></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+
+          <a-col :lg="8" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.neUser.sub.tenantName')"
+              name="tenantName "
+            >
+              <a-input
+                v-model:value="queryParams.tenantName"
+                allow-clear
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">

src/views/neUser/ue/index.vue

@@ -286,14 +286,6 @@ onMounted(() => {
       }
     })
     .finally(() => {
-      if (useUserStore().roles.includes('tenant')) {
-        const operateColumnIndex = tableColumns.findIndex(
-          column => column.key === 'tenantName'
-        );
-        if (operateColumnIndex !== -1) {
-          tableColumns.splice(operateColumnIndex, 1);
-        }
-      }
       // 获取列表数据
       fnGetList();
     });
@@ -330,7 +322,7 @@ onMounted(() => {
             </a-form-item>
           </a-col>
 
-          <a-col :lg="8" :md="12" :xs="24" :gutter="16" v-roles:has="['administrator']">
+          <a-col :lg="8" :md="12" :xs="24" :gutter="16">
             <a-form-item
               :label="t('views.neUser.sub.tenantName')"
               name="tenantName "