From 3c39afd4ebad0645e48d752b17f7b7e3a662f696 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Wed, 8 Nov 2023 18:15:59 +0800
Subject: [PATCH] =?UTF-8?q?--=E8=B0=83=E6=8D=A2=E8=A1=A8=E5=8D=95=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/sub/index.vue | 116 ++++++++++++++-------------------
 1 file changed, 49 insertions(+), 67 deletions(-)

diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index dd5a23ed..e63fdd25 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1254,10 +1254,8 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-divider orientation="left">4G</a-divider>
-
         <a-row :gutter="16" v-if="!modalState.from.id">
-          <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="24" :md="24" :xs="24">
             <a-form-item
               label="Subscribed SM Data"
               name="smData"
@@ -1275,20 +1273,9 @@ onMounted(() => {
               </a-input>
             </a-form-item>
           </a-col>
-
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item label="4G EPS flag" name="epsFlag">
-              <a-tooltip :title="t('views.neUser.sub.epsFlagTip')">
-                <a-select v-model:value="modalState.from.epsFlag">
-                  <a-select-option value="1">Enable</a-select-option>
-                  <a-select-option value="0">Disable</a-select-option>
-                </a-select>
-              </a-tooltip>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row :gutter="16" v-else>
-          <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="24" :md="24" :xs="24">
             <a-form-item label="Subscribed SM Data" name="smData">
               <a-input v-model:value="modalState.from.smData" allow-clear>
                 <template #prefix>
@@ -1302,47 +1289,8 @@ onMounted(() => {
               </a-input>
             </a-form-item>
           </a-col>
-
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item label="4G EPS flag" name="epsFlag">
-              <a-tooltip :title="t('views.neUser.sub.epsFlagTip')">
-                <a-select v-model:value="modalState.from.epsFlag">
-                  <a-select-option value="1">Enable</a-select-option>
-                  <a-select-option value="0">Disable</a-select-option>
-                </a-select>
-              </a-tooltip>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              label="4G EPS User Template Name"
-              name="epstpl"
-              v-bind="modalStateFrom.validateInfos.epstpl"
-            >
-              <a-tooltip
-                :title="t('views.neUser.sub.msisdnTip', { msg: '16' })"
-              >
-                <a-input v-model:value="modalState.from.epstpl" allow-clear>
-                </a-input>
-              </a-tooltip>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              label="4G Context ID"
-              name="contextId"
-              v-bind="modalStateFrom.validateInfos.contextId"
-            >
-              <a-tooltip :title="t('views.neUser.sub.contextIdTip')">
-                <a-input v-model:value="modalState.from.contextId" allow-clear>
-                </a-input>
-              </a-tooltip>
-            </a-form-item>
-          </a-col>
         </a-row>
+        <a-divider orientation="left">4G</a-divider>
 
         <a-row :gutter="16">
           <a-col :lg="24" :md="24" :xs="24">
@@ -1365,6 +1313,45 @@ onMounted(() => {
           </a-col>
         </a-row>
 
+        <a-form-item
+          label="4G Context ID"
+          name="contextId"
+          v-bind="modalStateFrom.validateInfos.contextId"
+        >
+          <a-tooltip :title="t('views.neUser.sub.contextIdTip')">
+            <a-input v-model:value="modalState.from.contextId" allow-clear>
+            </a-input>
+          </a-tooltip>
+        </a-form-item>
+
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              label="4G EPS User Template Name"
+              name="epstpl"
+              v-bind="modalStateFrom.validateInfos.epstpl"
+            >
+              <a-tooltip
+                :title="t('views.neUser.sub.msisdnTip', { msg: '16' })"
+              >
+                <a-input v-model:value="modalState.from.epstpl" allow-clear>
+                </a-input>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item label="4G EPS flag" name="epsFlag">
+              <a-tooltip :title="t('views.neUser.sub.epsFlagTip')">
+                <a-select v-model:value="modalState.from.epsFlag">
+                  <a-select-option value="1">Enable</a-select-option>
+                  <a-select-option value="0">Disable</a-select-option>
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
         <a-form-item
           label="4G EPS ODB"
           name="epsOdb"
@@ -1614,7 +1601,7 @@ onMounted(() => {
 
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item label="4G EPS flag" name="epsFlag">
-              <a-tooltip  :title="t('views.neUser.sub.epsFlagTip')">
+              <a-tooltip :title="t('views.neUser.sub.epsFlagTip')">
                 <a-select v-model:value="modalState.BatchForm.epsFlag">
                   <a-select-option value="1">Enable</a-select-option>
                   <a-select-option value="0">Disable</a-select-option>
@@ -1627,7 +1614,9 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item label="4G EPS User Template Name" name="epstpl">
-              <a-tooltip  :title="t('views.neUser.sub.msisdnTip', { msg: '16' })">
+              <a-tooltip
+                :title="t('views.neUser.sub.msisdnTip', { msg: '16' })"
+              >
                 <a-input
                   v-model:value="modalState.BatchForm.epstpl"
                   allow-clear
@@ -1673,9 +1662,7 @@ onMounted(() => {
         </a-row>
 
         <a-form-item label="4G EPS ODB" name="epsOdb">
-          <a-tooltip
-          :title="t('views.neUser.sub.epsOdbTip')"
-          >
+          <a-tooltip :title="t('views.neUser.sub.epsOdbTip')">
             <a-select
               v-model:value="modalState.BatchForm.epsOdb"
               mode="multiple"
@@ -1688,10 +1675,7 @@ onMounted(() => {
         </a-form-item>
 
         <a-form-item label="4G HPLMN odb" name="hplmnOdb">
-          <a-tooltip
-          :title="t('views.neUser.sub.hplmnOdbTip')"
-
-          >
+          <a-tooltip :title="t('views.neUser.sub.hplmnOdbTip')">
             <a-select
               v-model:value="modalState.BatchForm.hplmnOdb"
               mode="multiple"
@@ -1704,9 +1688,7 @@ onMounted(() => {
         </a-form-item>
 
         <a-form-item label="4G Access Restriction Data" name="ard">
-          <a-tooltip
-          :title="t('views.neUser.sub.ardTip')"
-          >
+          <a-tooltip :title="t('views.neUser.sub.ardTip')">
             <a-select
               v-model:value="modalState.BatchForm.ard"
               mode="multiple"