From 4c16888184138e35a33ab849f64e45a99f5aa0c7 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 29 May 2024 18:06:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=8E=88=E6=9D=83=E6=A3=80=E6=9F=A5=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8F=AF=E7=94=A8=E5=90=8E=E5=9C=A8=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NeInfoSoftwareLicense.vue      | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
index 7e1b7f80..3d9bf582 100644
--- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
+++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareLicense.vue
@@ -73,6 +73,7 @@ function fnModalOk(e: any) {
 /**对话框弹出关闭执行函数*/
 function fnModalCancel() {
   state.visibleByFile = false;
+  state.confirmLoading = false;
 }
 
 /**结束操作 */
@@ -91,7 +92,19 @@ onMounted(() => {
   if (neId) {
     state.from.neType = neType;
     state.from.neId = neId;
-    codeNeLicense(neType, neId);
+    state.confirmLoading = true;
+    stateNeLicense(neType, neId)
+      .then(res => {
+        if (res.code === RESULT_CODE_SUCCESS && res.data) {
+          state.from.sn = res.data.sn;
+          state.from.expire = res.data.expire;
+        } else {
+          return codeNeLicense(neType, neId);
+        }
+      })
+      .finally(() => {
+        state.confirmLoading = false;
+      });
   }
 });
 
@@ -117,14 +130,14 @@ onUnmounted(() => {
       <a-button
         type="primary"
         :disabled="state.from.sn !== ''"
-        :loading="state.timeCount < 30"
+        :loading="state.timeCount < 30 || state.confirmLoading"
         @click="() => (state.visibleByFile = !state.visibleByFile)"
       >
         {{ t('views.ne.neQuickSetup.licenseUpload') }}
       </a-button>
       <a-button
         type="default"
-        :disabled="state.timeCount < 30"
+        :disabled="state.timeCount < 30 || state.confirmLoading"
         @click="fnStepEnd()"
       >
         {{ t('views.ne.neQuickSetup.licenseEnd') }}
@@ -146,6 +159,8 @@ onUnmounted(() => {
       </a-space>
     </div>
     <div v-if="state.from.sn !== ''" style="font-size: 16px">
+      <p>{{ t('views.ne.common.neType') }}：{{ state.from.neType }}</p>
+      <p>{{ t('views.ne.common.neId') }}：{{ state.from.neId }}</p>
       <p>{{ t('views.ne.common.serialNum') }}：{{ state.from.sn }}</p>
       <p>{{ t('views.ne.common.expiryDate') }}：{{ state.from.expire }}</p>
     </div>