From c3b46d0f0caffec0133a907ffe12f1202ef1048b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 9 Nov 2023 12:04:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E7=94=A8=E6=88=B7=E9=9A=90=E8=97=8Fc?=
 =?UTF-8?q?sv=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA/?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/auth/index.vue | 44 +++++++++++++++------------------
 src/views/neUser/sub/index.vue  | 41 ++++++++++++++----------------
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index fedc2b15..740b40ce 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -800,6 +800,7 @@ onMounted(() => {
             ok-text="TXT"
             ok-type="default"
             @confirm="fnExportList('txt')"
+            :show-cancel="false"
             cancel-text="CSV"
             @cancel="fnExportList('csv')"
           >
@@ -844,15 +845,15 @@ onMounted(() => {
                   :selected-keys="[tableState.size as string]"
                   @click="fnTableSize"
                 >
-                  <a-menu-item key="default">{{
-                    t('common.size.default')
-                  }}</a-menu-item>
-                  <a-menu-item key="middle">{{
-                    t('common.size.middle')
-                  }}</a-menu-item>
-                  <a-menu-item key="small">{{
-                    t('common.size.small')
-                  }}</a-menu-item>
+                  <a-menu-item key="default">
+                    {{ t('common.size.default') }}
+                  </a-menu-item>
+                  <a-menu-item key="middle">
+                    {{ t('common.size.middle') }}
+                  </a-menu-item>
+                  <a-menu-item key="small">
+                    {{ t('common.size.small') }}
+                  </a-menu-item>
                 </a-menu>
               </template>
             </a-dropdown>
@@ -1064,9 +1065,7 @@ onMounted(() => {
       @cancel="fnBatchModalCancel"
     >
       <a-form name="modalStateBatchFrom" layout="horizontal">
-
         <a-row :gutter="16">
-          
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.neUser.auth.num')"
@@ -1081,7 +1080,6 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1144,19 +1142,17 @@ onMounted(() => {
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-          label="OPC"
-          name="opc"
-          v-bind="modalStateBatchFrom.validateInfos.opc"
-        >
-          <a-input
-            v-model:value="modalState.BatchForm.opc"
-            allow-clear
-          ></a-input>
-        </a-form-item>
+              label="OPC"
+              name="opc"
+              v-bind="modalStateBatchFrom.validateInfos.opc"
+            >
+              <a-input
+                v-model:value="modalState.BatchForm.opc"
+                allow-clear
+              ></a-input>
+            </a-form-item>
           </a-col>
         </a-row>
-        
-      
       </a-form>
     </a-modal>
 
@@ -1219,7 +1215,7 @@ onMounted(() => {
       @upload="fnModalUploadImportUpload"
       @close="fnModalUploadImportClose"
       v-model:visible="uploadImportState.visible"
-      :ext="['.csv', '.txt']"
+      :ext="['.txt']"
     >
       <template #default>
         <a-textarea
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index cf6c6179..28312955 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -438,19 +438,20 @@ const modalStateFrom = Form.useForm(
  * 进行表达规则校验
  */
 function fnModalOk() {
+  const from = Object.assign({}, toRaw(modalState.from));
+
   let validateNames = ['imsi', 'staticIp'];
 
-  if (modalState.from.id === '') {
+  if (from.id === '') {
     validateNames.push('smData');
   }
   modalStateFrom
     .validate(validateNames)
     .then(e => {
       modalState.confirmLoading = true;
-      const from = toRaw(modalState.from);
       let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
       let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
-      let odbArr = [0, 0, 0, 0, 0, 0, 0, 0,0];
+      let odbArr = [0, 0, 0, 0, 0, 0, 0, 0, 0];
 
       from.ard.forEach((item: any) => {
         ardArr[item] = 1;
@@ -478,8 +479,6 @@ function fnModalOk() {
               content: t('common.msgSuccess', { msg: modalState.title }),
               duration: 3,
             });
-            modalState.visibleByEdit = false;
-            modalStateFrom.resetFields();
             fnGetList();
           } else {
             message.error({
@@ -490,6 +489,7 @@ function fnModalOk() {
         })
         .finally(() => {
           hide();
+          fnModalCancel();
           modalState.confirmLoading = false;
         });
     })
@@ -527,11 +527,12 @@ const modalStateBatchFrom = Form.useForm(
  * 进行表达规则校验
  */
 function fnBatchModalOk() {
+  const from = Object.assign({}, toRaw(modalState.BatchForm));
+
   modalStateBatchFrom
     .validate()
     .then(e => {
       modalState.confirmLoading = true;
-      const from = toRaw(modalState.BatchForm);
       let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
       let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
       let odbArr = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -564,8 +565,6 @@ function fnBatchModalOk() {
               content: t('common.msgSuccess', { msg: modalState.title }),
               duration: 3,
             });
-            modalState.visibleByBatch = false;
-            modalStateBatchFrom.resetFields();
             fnGetList();
           } else {
             message.error({
@@ -575,11 +574,8 @@ function fnBatchModalOk() {
           }
         })
         .finally(() => {
-          1;
           hide();
-          from.epsOdb = [];
-          from.hplmnOdb = [];
-          from.ard = [];
+          fnBatchModalCancel();
           modalState.confirmLoading = false;
         });
     })
@@ -981,6 +977,7 @@ onMounted(() => {
             ok-text="TXT"
             ok-type="default"
             @confirm="fnExportList('txt')"
+            :show-cancel="false"
             cancel-text="CSV"
             @cancel="fnExportList('csv')"
           >
@@ -1027,15 +1024,15 @@ onMounted(() => {
                   :selected-keys="[tableState.size as string]"
                   @click="fnTableSize"
                 >
-                  <a-menu-item key="default">{{
-                    t('common.size.default')
-                  }}</a-menu-item>
-                  <a-menu-item key="middle">{{
-                    t('common.size.middle')
-                  }}</a-menu-item>
-                  <a-menu-item key="small">{{
-                    t('common.size.small')
-                  }}</a-menu-item>
+                  <a-menu-item key="default">
+                    {{ t('common.size.default') }}
+                  </a-menu-item>
+                  <a-menu-item key="middle">
+                    {{ t('common.size.middle') }}
+                  </a-menu-item>
+                  <a-menu-item key="small">
+                    {{ t('common.size.small') }}
+                  </a-menu-item>
                 </a-menu>
               </template>
             </a-dropdown>
@@ -1751,7 +1748,7 @@ onMounted(() => {
       @upload="fnModalUploadImportUpload"
       @close="fnModalUploadImportClose"
       v-model:visible="uploadImportState.visible"
-      :ext="['.csv', '.txt']"
+      :ext="['.txt']"
     >
       <template #default>
         <a-textarea