From 21ab066761fef357edaef9eb10c6c4b65ecb857f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 30 Apr 2024 19:58:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BC=B9=E5=87=BA=E7=AA=97=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ne/neLicense.ts                       |  14 +++
 .../ne/neLicense/components/EditModal.vue     | 106 ++++++++++--------
 2 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/src/api/ne/neLicense.ts b/src/api/ne/neLicense.ts
index a35b148e..38277c07 100644
--- a/src/api/ne/neLicense.ts
+++ b/src/api/ne/neLicense.ts
@@ -26,6 +26,20 @@ export function getNeLicense(licenseId: string | number) {
   });
 }
 
+/**
+ * 网元neType和neID查询
+ * @param neType 网元类型
+ * @param neId 网元ID
+ * @returns object
+ */
+export function getNeLicenseByTypeAndID(neType: string, neId: string) {
+  return request({
+    url: `/ne/license/byTypeAndID`,
+    method: 'get',
+    params: { neType, neId },
+  });
+}
+
 /**
  * 网元授权激活授权申请码
  * @param neType 网元类型
diff --git a/src/views/ne/neLicense/components/EditModal.vue b/src/views/ne/neLicense/components/EditModal.vue
index 92149fd7..52b952c2 100644
--- a/src/views/ne/neLicense/components/EditModal.vue
+++ b/src/views/ne/neLicense/components/EditModal.vue
@@ -1,28 +1,13 @@
 <script setup lang="ts">
-import { reactive, ref, onMounted, toRaw, watch } from 'vue';
-import { PageContainer } from 'antdv-pro-layout';
-import {
-  Form,
-  Modal,
-  TableColumnsType,
-  Upload,
-  message,
-} from 'ant-design-vue/lib';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
-import useNeInfoStore from '@/store/modules/neinfo';
+import { reactive, onMounted, toRaw, watch } from 'vue';
+import { Form, Modal, Upload, message } from 'ant-design-vue/lib';
 import useI18n from '@/hooks/useI18n';
-import useDictStore from '@/store/modules/dict';
-
-import { NE_TYPE_LIST } from '@/constants/ne-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import {
   changeNeLicense,
   getNeLicense,
-  listNeLicense,
-  stateNeLicense,
+  getNeLicenseByTypeAndID,
 } from '@/api/ne/neLicense';
-import { parseDateToStr } from '@/utils/date-utils';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { uploadFile } from '@/api/tool/file';
@@ -30,17 +15,26 @@ import { useClipboard } from '@vueuse/core';
 import saveAs from 'file-saver';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
-const { getDict } = useDictStore();
 const emit = defineEmits(['ok', 'cancel', 'update:visible']);
 const props = defineProps({
   visible: {
     type: Boolean,
     default: false,
   },
+  /**记录ID 优先级高于neId */
   editId: {
     type: String,
     default: '',
   },
+  /**网元ID */
+  neId: {
+    type: String,
+    default: '',
+  },
+  neType: {
+    type: String,
+    default: '',
+  },
 });
 
 /**对话框对象信息状态类型 */
@@ -112,7 +106,7 @@ const modalStateFrom = Form.useForm(
  * 进行表达规则校验
  */
 function fnModalOk() {
-  if (modalState.confirmLoading) return;
+  if (modalState.confirmLoading || !modalState.from.id) return;
 
   modalStateFrom
     .validate()
@@ -225,40 +219,64 @@ function fnDownCode() {
   });
 }
 
+/**
+ * 对话框弹出显示为 ID编辑
+ * @param id id
+ */
+function fnModalVisibleById(id: string) {
+  const hide = message.loading(t('common.loading'), 0);
+  getNeLicense(id)
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        Object.assign(modalState.from, res.data);
+        modalState.from.licensePath = '';
+        modalState.title = 'Update License';
+        modalState.visibleByEdit = true;
+      } else {
+        message.error(res.msg, 3);
+      }
+    })
+    .finally(() => {
+      modalState.confirmLoading = false;
+      hide();
+    });
+}
+
 /**
  * 对话框弹出显示为 新增或者修改
  * @param id id
  */
-function fnModalVisibleByEdit(id?: string) {
-  if (id) {
-    const hide = message.loading(t('common.loading'), 0);
-    getNeLicense(id)
-      .then(res => {
-        if (res.code === RESULT_CODE_SUCCESS) {
-          Object.assign(modalState.from, res.data);
-          modalState.from.licensePath = '';
-          modalState.title = 'Update License';
-          modalState.visibleByEdit = true;
-        } else {
-          message.error(res.msg, 3);
-        }
-      })
-      .finally(() => {
-        modalState.confirmLoading = false;
-        hide();
-      });
-
-    return;
-  }
-  modalState.title = 'Upload License';
-  modalState.visibleByEdit = true;
+function fnModalVisibleByTypeAndId(neType: string, neId: string) {
+  const hide = message.loading(t('common.loading'), 0);
+  getNeLicenseByTypeAndID(neType, neId)
+    .then(res => {
+      if (res.code === RESULT_CODE_SUCCESS) {
+        Object.assign(modalState.from, res.data);
+        modalState.from.licensePath = '';
+        modalState.title = 'Update License';
+        modalState.visibleByEdit = true;
+      } else {
+        message.error(res.msg, 3);
+      }
+    })
+    .finally(() => {
+      modalState.confirmLoading = false;
+      hide();
+    });
 }
 
 /**监听是否显示，初始数据 */
 watch(
   () => props.visible,
   val => {
-    if (val) fnModalVisibleByEdit(props.editId);
+    if (val) {
+      if (props.editId) {
+        fnModalVisibleById(props.editId);
+      }
+      if (props.neType && props.neId) {
+        fnModalVisibleByTypeAndId(props.neType, props.neId);
+      }
+    }
   }
 );