From 9e5a00038303e7e53d31bdcac5b6384fcb5ec32c Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Fri, 5 Jul 2024 14:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=BC=80=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts      |  2 ++
 src/i18n/locales/zh-CN.ts      |  2 ++
 src/views/neUser/sub/index.vue | 37 +++++++++++++++++-----------------
 src/views/tenant/sub/index.vue | 25 ++++++++++++-----------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 96b73138..925b0ba6 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -898,6 +898,8 @@ export default {
         smDataArrTip:'SST,DNN/APN is required',
         tenantName:'Tenant Name',
         imsiMode:'IMSI Matching Mode',
+        fuzzyMatch:'Fuzzy Match',
+        prefixMatch:'Prefix Match',
       },
       pcf: {
         neType: 'PCF Object',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 7c35bd31..78598928 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -898,6 +898,8 @@ export default {
         smDataArrTip:'SST,DNN/APN为必填项',
         tenantName:'租户名称',
         imsiMode:'IMSI匹配模式',
+        fuzzyMatch:'模糊匹配',
+        prefixMatch:'前缀匹配',
       },
       pcf: {
         neType: 'PCF网元对象',
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 3bf450e7..9d6867eb 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -24,7 +24,7 @@ import {
   resetUDMSub,
   updateUDMSub,
 } from '@/api/neData/udm_sub';
-import { listDept } from '@/api/system/tenant';
+import { listTenant } from '@/api/system/tenant';
 import { uploadFile } from '@/api/tool/file';
 const { t } = useI18n();
 const { getDict } = useDictStore();
@@ -47,7 +47,7 @@ let queryParams = reactive({
   /**移动编号 */
   imsi: '',
   /**imsi匹配方式 */
-  imsiMatch: 'full',
+  imsiMatch: 'fuzzy',
   /**租户名 */
   tenantName: '',
   /**移动号 */
@@ -66,7 +66,7 @@ let queryParams = reactive({
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     imsi: '',
-    imsiMatch: 'full',
+    imsiMatch: 'fuzzy',
     msisdn: '',
     tenantName: '',
     sortField: 'imsi',
@@ -1093,7 +1093,7 @@ function fnGetList(pageNum?: number) {
 
   const imsiMatchRule: any = {
     prefix: queryParams.imsi ? `${queryParams.imsi}%` : '',
-    full: queryParams.imsi ? `%${queryParams.imsi}%` : '',
+    fuzzy: queryParams.imsi ? `%${queryParams.imsi}%` : '',
   };
 
   const toBack: any = {
@@ -1245,7 +1245,7 @@ onMounted(() => {
   // 初始字典数据
   Promise.allSettled([
     getDict('udm_sub_cn_type'),
-    listDept({ parentId: 0 }),
+    listTenant({ parentId: 0 }),
   ]).then(resArr => {
     if (resArr[0].status === 'fulfilled') {
       dict.udmSubCNType = resArr[0].value;
@@ -1319,19 +1319,7 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24" v-show="queryParams.imsi">
-            <a-form-item label="IMSI Match Mode" name="imsiMatch">
-              <a-select
-                :label="t('views.neUser.sub.imsiMode')"
-                style="width: 100%"
-                v-model:value="queryParams.imsiMatch"
-                :options="[
-                  { label: 'Prefix', value: 'prefix' },
-                  { label: 'Full', value: 'full' },
-                ]"
-              />
-            </a-form-item>
-          </a-col>
+
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi">
               <a-input
@@ -1341,6 +1329,19 @@ onMounted(() => {
               ></a-input>
             </a-form-item>
           </a-col>
+          <a-col :lg="3" :md="12" :xs="24" v-show="queryParams.imsi">
+            <a-form-item name="imsiMatch">
+              <a-select
+                :label="t('views.neUser.sub.imsiMode')"
+                style="width: 100%"
+                v-model:value="queryParams.imsiMatch"
+                :options="[
+                  { label: t('views.neUser.sub.fuzzyMatch'), value: 'fuzzy' },
+                  { label: t('views.neUser.sub.prefixMatch'), value: 'prefix' },
+                ]"
+              />
+            </a-form-item>
+          </a-col>
 
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="MSISDN" name="msisdn">
diff --git a/src/views/tenant/sub/index.vue b/src/views/tenant/sub/index.vue
index 5b22523a..db6542b4 100644
--- a/src/views/tenant/sub/index.vue
+++ b/src/views/tenant/sub/index.vue
@@ -37,7 +37,7 @@ let queryParams = reactive({
   /**移动编号 */
   imsi: '',
   /**imsi匹配方式 */
-  imsiMatch: 'full',
+  imsiMatch: 'fuzzy',
   /**移动号 */
   msisdn: '',
   /**排序字段 */
@@ -55,7 +55,7 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     imsi: '',
     msisdn: '',
-    imsiMatch: 'full',
+    imsiMatch: 'fuzzy',
     sortField: 'imsi',
     sortOrder: 'asc',
     pageNum: 1,
@@ -1021,7 +1021,7 @@ function fnGetList(pageNum?: number) {
 
   const imsiMatchRule: any = {
     prefix: queryParams.imsi ? `${queryParams.imsi}%` : '',
-    full: queryParams.imsi ? `%${queryParams.imsi}%` : '',
+    fuzzy: queryParams.imsi ? `%${queryParams.imsi}%` : '',
   };
 
   const toBack: any = {
@@ -1203,24 +1203,25 @@ onMounted(() => {
               <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-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" v-show="queryParams.imsi">
-            <a-form-item label="IMSI Match Mode" name="imsiMatch">
+          <a-col :lg="3" :md="12" :xs="24" v-show="queryParams.imsi">
+            <a-form-item name="imsiMatch">
               <a-select
                 :label="t('views.neUser.sub.imsiMode')"
                 style="width: 100%"
                 v-model:value="queryParams.imsiMatch"
                 :options="[
-                  { label: 'Prefix', value: 'prefix' },
-                  { label: 'Full', value: 'full' },
+                  { label: t('views.neUser.sub.fuzzyMatch'), value: 'fuzzy' },
+                  { label: t('views.neUser.sub.prefixMatch'), value: 'prefix' },
                 ]"
               />
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :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-form-item>
               <a-space :size="8">