diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 93934341..3bf450e7 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -46,6 +46,8 @@ let queryParams = reactive({ neId: undefined, /**移动编号 */ imsi: '', + /**imsi匹配方式 */ + imsiMatch: 'full', /**租户名 */ tenantName: '', /**移动号 */ @@ -64,6 +66,7 @@ let queryParams = reactive({ function fnQueryReset() { queryParams = Object.assign(queryParams, { imsi: '', + imsiMatch: 'full', msisdn: '', tenantName: '', sortField: 'imsi', @@ -1087,7 +1090,23 @@ function fnGetList(pageNum?: number) { queryParams.pageNum = pageNum; tablePagination.current = pageNum; } - listUDMSub(toRaw(queryParams)).then(res => { + + const imsiMatchRule: any = { + prefix: queryParams.imsi ? `${queryParams.imsi}%` : '', + full: queryParams.imsi ? `%${queryParams.imsi}%` : '', + }; + + const toBack: any = { + imsi: imsiMatchRule[queryParams.imsiMatch] || '', + msisdn: queryParams.msisdn, + tenantName: queryParams.tenantName, + sortField: queryParams.sortField, + sortOrder: queryParams.sortOrder, + pageNum: queryParams.pageNum, + pageSize: queryParams.pageSize, + }; + + listUDMSub(toBack).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 if (tableState.selectedRowKeys.length > 0) { @@ -1300,6 +1319,19 @@ onMounted(() => { /> + + + + + { > + { > + + + + + @@ -1337,20 +1382,6 @@ onMounted(() => { - - - - - - - diff --git a/src/views/tenant/sub/index.vue b/src/views/tenant/sub/index.vue index b33c70ef..5b22523a 100644 --- a/src/views/tenant/sub/index.vue +++ b/src/views/tenant/sub/index.vue @@ -36,6 +36,8 @@ let queryParams = reactive({ neId: undefined, /**移动编号 */ imsi: '', + /**imsi匹配方式 */ + imsiMatch: 'full', /**移动号 */ msisdn: '', /**排序字段 */ @@ -53,6 +55,7 @@ function fnQueryReset() { queryParams = Object.assign(queryParams, { imsi: '', msisdn: '', + imsiMatch: 'full', sortField: 'imsi', sortOrder: 'asc', pageNum: 1, @@ -695,10 +698,10 @@ function fnBatchModalOk() { .map((item: number) => `${item}`.padStart(2, '0')) .join(''); - const hide = message.loading(t('common.loading'), 0); from.neId = queryParams.neId || '-'; - batchAddUDMSub(from, from.num).then(res => { + batchAddUDMSub(from, from.num) + .then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('common.msgSuccess', { msg: modalState.title }), @@ -749,7 +752,8 @@ function fnBatchDelModalOk() { const from = toRaw(modalState.BatchDelForm); const hide = message.loading(t('common.loading'), 0); const neId = queryParams.neId || '-'; - batchDelUDMSub(neId, from.imsi, from.num).then(res => { + batchDelUDMSub(neId, from.imsi, from.num) + .then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success({ content: t('common.msgSuccess', { msg: modalState.title }), @@ -1015,9 +1019,21 @@ function fnGetList(pageNum?: number) { tablePagination.current = pageNum; } - const selectFrom = Object.assign({}, toRaw(queryParams)); + const imsiMatchRule: any = { + prefix: queryParams.imsi ? `${queryParams.imsi}%` : '', + full: queryParams.imsi ? `%${queryParams.imsi}%` : '', + }; - listUDMSub(selectFrom).then(res => { + const toBack: any = { + imsi: imsiMatchRule[queryParams.imsiMatch] || '', + msisdn: queryParams.msisdn, + sortField: queryParams.sortField, + sortOrder: queryParams.sortOrder, + pageNum: queryParams.pageNum, + pageSize: queryParams.pageSize, + }; + + listUDMSub(toBack).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { // 取消勾选 if (tableState.selectedRowKeys.length > 0) { @@ -1192,6 +1208,19 @@ onMounted(() => { + + + + +