Merge branch 'main' into multi-tenant

src/views/tenant/sub/index.vue

@@ -899,47 +899,27 @@ function fnRecordDelete(imsi: string) {
 function fnRecordExport(type: string = 'txt') {
   const selectLen = tableState.selectedRowKeys.length;
   if (selectLen <= 0) return;
-  const rows: Record<string, any>[] = tableState.data.filter(
-    (row: Record<string, any>) =>
-      tableState.selectedRowKeys.indexOf(row.imsi) >= 0
-  );
-
-  let content = '';
-  if (type == 'txt') {
-    for (const row of rows) {
-      debugger;
-      const epsDat = [
-        row.epsFlag,
-        row.epsOdb,
-        row.hplmnOdb,
-        row.ard,
-        row.epstpl,
-        row.contextId,
-        row.apnContext,
-        row.staticIp,
-      ].join(',');
-      content += `${row.imsi},${row.msisdn},${row.ambr},${row.nssai},${row.arfb},${row.sar},${row.rat},${row.cn},${row.smfSel},${row.smData},${epsDat}\r\n`;
-    }
-  }
-  if (type == 'csv') {
-    content = `imsi,msisdn,ambr,nssai,arfb,sar,rat,cn,smf_sel,sm_dat,eps_dat\r\n`;
-    for (const row of rows) {
-      const epsDat = [
-        row.epsFlag,
-        row.epsOdb,
-        row.hplmnOdb,
-        row.ard,
-        row.epstpl,
-        row.contextId,
-        row.apnContext,
-        row.staticIp,
-      ].join(',');
-      content += `${row.imsi},${row.msisdn},${row.ambr},${row.nssai},${row.arfb},${row.sar},${row.rat},${row.cn},${row.smfSel},${row.smData},${epsDat}\r\n`;
-    }
-  }
-
-  const blob = new Blob([content], { type: 'text/plain;charset=utf-8' });
-  saveAs(blob, `UDMSub_${Date.now()}.${type}`);
+  const neId = queryParams.neId;
+  if (!neId) return;
+  const hide = message.loading(t('common.loading'), 0);
+  exportUDMSub({ type: type, neId: neId, imsis: tableState.selectedRowKeys })
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        message.success({
+          content: t('common.msgSuccess', { msg: t('common.export') }),
+          duration: 2,
+        });
+        saveAs(res.data, `UDMSub_select_${Date.now()}.${type}`);
+      } else {
+        message.error({
+          content: `${res.msg}`,
+          duration: 2,
+        });
+      }
+    })
+    .finally(() => {
+      hide();
+    });
 }
 
 /**列表导出 */
@@ -953,7 +933,12 @@ function fnExportList(type: string) {
   if (!neID) return;
   const key = 'exportSub';
   message.loading({ content: t('common.loading'), key });
-  exportUDMSub({ ...queryParams, ...{ type, imsi: realImsi } }).then(res => {
+  Object.assign({ type: type }, queryParams);
+  exportUDMSub({
+    ...queryParams,
+    imsi: realImsi,
+    type: type,
+  }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       message.success({
         content: t('common.msgSuccess', { msg: t('common.export') }),
@@ -1028,7 +1013,10 @@ function fnGetList(pageNum?: number) {
     pageSize: queryParams.pageSize,
   };
 
-  listUDMSub(toBack).then(res => {
+  listUDMSub({
+    ...queryParams,
+    ismi: imsiMatchRule[queryParams.imsiMatch],
+  }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
@@ -1357,9 +1345,6 @@ onMounted(() => {
             ok-text="TXT"
             ok-type="default"
             @confirm="fnRecordExport('txt')"
-            :show-cancel="false"
-            cancel-text="CSV"
-            @cancel="fnRecordExport('csv')"
             :disabled="tableState.selectedRowKeys.length <= 0"
           >
             <a-button