Merge branch 'main' into multi-tenant

src/views/neUser/sub/index.vue

@@ -8,7 +8,6 @@ import { ColumnsType } from 'ant-design-vue/lib/table';
 import UploadModal from '@/components/UploadModal/index.vue';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useNeInfoStore from '@/store/modules/neinfo';
-import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import saveAs from 'file-saver';
@@ -27,15 +26,6 @@ import {
 import { listTenant } from '@/api/system/tenant';
 import { uploadFile } from '@/api/tool/file';
 const { t } = useI18n();
-const { getDict } = useDictStore();
-
-/**字典数据 */
-let dict: {
-  /**CN Type可选类型 */
-  udmSubCNType: DictType[];
-} = reactive({
-  udmSubCNType: [],
-});
 
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
@@ -154,15 +144,16 @@ let tableColumns = ref<ColumnsType>([
     width: 100,
   },
   {
-    title: 'CN Type',
+    title: '5G',
     dataIndex: 'cn',
-    key: 'cn',
+    key: 'cnFlag',
     align: 'center',
     width: 100,
   },
   {
-    title: 'EPS',
+    title: '4G',
     dataIndex: 'epsFlag',
+    key: 'epsFlag',
     align: 'center',
     width: 100,
   },
@@ -1241,14 +1232,10 @@ function delBigRow(bigIndex: any) {
 onMounted(() => {
   // 初始字典数据
   Promise.allSettled([
-    getDict('udm_sub_cn_type'),
     listTenant({ parentId: 0 }),
   ]).then(resArr => {
     if (resArr[0].status === 'fulfilled') {
-      dict.udmSubCNType = resArr[0].value;
-    }
-    if (resArr[1].status === 'fulfilled') {
-      var tenantNameData = resArr[1].value;
+      var tenantNameData = resArr[0].value;
       if (
         tenantNameData.code === RESULT_CODE_SUCCESS &&
         Array.isArray(tenantNameData.data)
@@ -1559,8 +1546,19 @@ onMounted(() => {
         }"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'cn'">
-            <DictTag :options="dict.udmSubCNType" :value="record.cn" />
+          <template v-if="column.key === 'cnFlag'">
+            {{
+              record.cn === '3'
+                ? t('views.neUser.sub.enable')
+                : t('views.neUser.sub.disable')
+            }}
+          </template>
+          <template v-if="column.key === 'epsFlag'">
+            {{
+              record.epsFlag === '1'
+                ? t('views.neUser.sub.enable')
+                : t('views.neUser.sub.disable')
+            }}
           </template>
           <template v-if="column.key === 'imsi'">
             <a-space :size="8" align="center">
@@ -1639,17 +1637,6 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
-            <a-form-item
-              label="CN Type"
-              name="cn"
-              :help="t('views.neUser.sub.cnTypeTip')"
-            >
-              <a-select
-                v-model:value="modalState.from.cn"
-                :options="dict.udmSubCNType"
-                :placeholder="t('common.selectPlease')"
-              />
-            </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1788,6 +1775,22 @@ onMounted(() => {
               <a-divider orientation="left" style="margin: -2px">5G</a-divider>
             </template>
             <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5GC Flag"
+                  name="cnFlag"
+                  :help="t('views.neUser.sub.cnFlag')"
+                >
+                  <a-select v-model:value="modalState.from.cn">
+                    <a-select-option value="3">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <a-col :lg="24" :md="24" :xs="24">
                 <a-form-item
                   label="5G Subscribed UE AMBR Template"
@@ -2190,17 +2193,6 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
-            <a-form-item
-              label="CN Type"
-              name="cn"
-              :help="t('views.neUser.sub.cnTypeTip')"
-            >
-              <a-select
-                v-model:value="modalState.BatchForm.cn"
-                :options="dict.udmSubCNType"
-                :placeholder="t('common.selectPlease')"
-              />
-            </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -2340,6 +2332,22 @@ onMounted(() => {
             </template>
 
             <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5GC Flag"
+                  name="cnFlag"
+                  :help="t('views.neUser.sub.cnFlag')"
+                >
+                  <a-select v-model:value="modalState.BatchForm.cn">
+                    <a-select-option value="3">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <a-col :lg="24" :md="24" :xs="24">
                 <a-form-item
                   label="5G Subscribed UE AMBR Template"