diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 26ebcb5d..d5529254 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -888,8 +888,13 @@ function fnGetList(pageNum?: number) {
       if (tableState.selectedRowKeys.length > 0) {
         tableState.selectedRowKeys = [];
       }
+      
       tablePagination.total = res.total;
       tableState.data = res.rows;
+      if(tablePagination.total<=(queryParams.pageNum-1)*tablePagination.pageSize&&queryParams.pageNum!==1) {
+          tableState.loading = false;
+          fnGetList(queryParams.pageNum-1) 
+        }
     }
     tableState.loading = false;
   });
@@ -1316,296 +1321,22 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-divider orientation="left">5G</a-divider>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed UE AMBR Template"
-              name="ambr"
-              v-bind="modalStateFrom.validateInfos.ambr"
-            >
-              <a-input
-                v-model:value="modalState.from.ambr"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed SNSSAIs Template"
-              name="nssai"
-              v-bind="modalStateFrom.validateInfos.nssai"
-            >
-              <a-input
-                v-model:value="modalState.from.nssai"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed SMF Selection Data Template"
-              name="smfSel"
-            >
-              <a-input
-                v-model:value="modalState.from.smfSel"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item label="5G Forbidden Areas Template" name="arfb">
-              <a-input
-                v-model:value="modalState.from.arfb"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.arfbTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Service Area Restriction Template"
-              name="sar"
-            >
-              <a-input
-                v-model:value="modalState.from.sar"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.sarTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item label="5G RFSP Index" name="rfsp">
-              <a-input-number
-                v-model:value="modalState.from.rfsp"
-                style="width: 100%"
-                :min="0"
-                :max="127"
-                placeholder="0 ~ 127"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.rfspTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input-number>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G MICO Mode"
-              name="mico"
-              :help="t('views.neUser.sub.micoTip')"
-            >
-              <a-select value="1">
-                <a-select-option value="1">
-                  {{ t('views.neUser.sub.enable') }}
-                </a-select-option>
-                <a-select-option value="0">
-                  {{ t('views.neUser.sub.disable') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item label="5G UE Usage Type" name="ueType">
-              <a-input-number
-                v-model:value="modalState.from.ueType"
-                style="width: 100%"
-                :min="0"
-                :max="127"
-                placeholder="0 ~ 127"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.ueTypeTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input-number>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16" v-if="!modalState.from.id">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="Subscribed SM Data"
-              name="smData"
-              v-bind="modalStateFrom.validateInfos.smData"
-            >
-              <a-input
-                v-model:value="modalState.from.smData"
-                allow-clear
-                :maxlength="128"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '128' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="16" v-else>
-          <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
-                :maxlength="128"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '128' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </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">
-            <a-form-item
-              label="4G EPS Flag"
-              name="epsFlag"
-              :help="t('views.neUser.sub.epsFlagTip')"
-            >
-              <a-select v-model:value="modalState.from.epsFlag">
-                <a-select-option value="1">
-                  {{ t('views.neUser.sub.enable') }}
-                </a-select-option>
-                <a-select-option value="0">
-                  {{ t('views.neUser.sub.disable') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="4G EPS User Template Name"
-              name="epstpl"
-              v-bind="modalStateFrom.validateInfos.epstpl"
-            >
-              <a-input
-                v-model:value="modalState.from.epstpl"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="4G Static IP"
-              v-bind="modalStateFrom.validateInfos.staticIp"
-              name="staticIp"
-            >
-              <a-input v-model:value="modalState.from.staticIp" allow-clear>
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.staticIpTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-form-item label="4G Context ID" name="contextId">
-          <a-input v-model:value="modalState.from.contextId" allow-clear>
+        <a-form-item
+          v-if="!modalState.from.id"
+          label="Subscribed SM Data"
+          :label-col="{ span: 3 }"
+          name="smData"
+          v-bind="modalStateFrom.validateInfos.smData"
+        >
+          <a-input
+            v-model:value="modalState.from.smData"
+            allow-clear
+            :maxlength="128"
+          >
             <template #prefix>
               <a-tooltip placement="topLeft">
                 <template #title>
-                  {{ t('views.neUser.sub.contextIdTip') }}
+                  {{ t('views.neUser.sub.inputTip', { num: '128' }) }}
                 </template>
                 <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
               </a-tooltip>
@@ -1614,72 +1345,373 @@ onMounted(() => {
         </a-form-item>
 
         <a-form-item
-          label="4G APN Context List"
-          name="apnContext"
-          :help="t('views.neUser.sub.apnContextTip')"
+          label="Subscribed SM Data"
+          :label-col="{ span: 3 }"
+          name="smData"
+          v-else
         >
-          <a-input-group compact>
-            <a-input-number
-              v-for="(_, i) in modalState.from.apnContext"
-              :key="i"
-              :title="i"
-              style="width: 16.5%"
-              :min="0"
-              :max="99"
-              v-model:value="modalState.from.apnContext[i]"
-            ></a-input-number>
-          </a-input-group>
-        </a-form-item>
-
-        <a-form-item
-          label="4G EPS ODB"
-          name="epsOdb"
-          v-bind="modalStateFrom.validateInfos.epsOdb"
-        >
-          <a-tooltip
-            :title="t('views.neUser.sub.epsOdbTip')"
-            placement="topLeft"
+          <a-input
+            v-model:value="modalState.from.smData"
+            allow-clear
+            :maxlength="128"
           >
-            <a-select
-              v-model:value="modalState.from.epsOdb"
-              mode="multiple"
-              style="width: 100%"
-              placeholder="Please select"
-              :options="modalStateFromOption.odbJson"
-              @change=""
-            >
-            </a-select>
-          </a-tooltip>
+            <template #prefix>
+              <a-tooltip placement="topLeft">
+                <template #title>
+                  {{ t('views.neUser.sub.inputTip', { num: '128' }) }}
+                </template>
+                <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
+              </a-tooltip>
+            </template>
+          </a-input>
         </a-form-item>
 
-        <a-form-item label="4G HPLMN ODB" name="hplmnOdb">
-          <a-tooltip
-            :title="t('views.neUser.sub.hplmnOdbTip')"
-            placement="topLeft"
-          >
-            <a-select
-              v-model:value="modalState.from.hplmnOdb"
-              mode="multiple"
-              style="width: 100%"
-              :options="modalStateFromOption.hplmnOdb"
-              @change=""
-            >
-            </a-select>
-          </a-tooltip>
-        </a-form-item>
+        <a-collapse :bordered="false" ghost>
+          <a-collapse-panel key="5G">
+            <template #header>
+              <a-divider orientation="left" style="margin: -2px">5G</a-divider>
+            </template>
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed UE AMBR Template"
+                  name="ambr"
+                  v-bind="modalStateFrom.validateInfos.ambr"
+                >
+                  <a-input
+                    v-model:value="modalState.from.ambr"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed SNSSAIs Template"
+                  name="nssai"
+                  v-bind="modalStateFrom.validateInfos.nssai"
+                >
+                  <a-input
+                    v-model:value="modalState.from.nssai"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
 
-        <a-form-item label="4G Access Restriction Data" name="ard">
-          <a-tooltip :title="t('views.neUser.sub.ardTip')" placement="topLeft">
-            <a-select
-              v-model:value="modalState.from.ard"
-              mode="multiple"
-              style="width: 100%"
-              :options="modalStateFromOption.ardJson"
-              @change=""
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed SMF Selection Data Template"
+                  name="smfSel"
+                >
+                  <a-input
+                    v-model:value="modalState.from.smfSel"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item label="5G Forbidden Areas Template" name="arfb">
+                  <a-input
+                    v-model:value="modalState.from.arfb"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.arfbTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Service Area Restriction Template"
+                  name="sar"
+                >
+                  <a-input
+                    v-model:value="modalState.from.sar"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.sarTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item label="5G RFSP Index" name="rfsp">
+                  <a-input-number
+                    v-model:value="modalState.from.rfsp"
+                    style="width: 100%"
+                    :min="0"
+                    :max="127"
+                    placeholder="0 ~ 127"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.rfspTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input-number>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G MICO Mode"
+                  name="mico"
+                  :help="t('views.neUser.sub.micoTip')"
+                >
+                  <a-select value="1">
+                    <a-select-option value="1">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item label="5G UE Usage Type" name="ueType">
+                  <a-input-number
+                    v-model:value="modalState.from.ueType"
+                    style="width: 100%"
+                    :min="0"
+                    :max="127"
+                    placeholder="0 ~ 127"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.ueTypeTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input-number>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-collapse-panel>
+
+          <a-collapse-panel key="4G">
+            <template #header>
+              <a-divider orientation="left" style="margin: -2px">4G</a-divider>
+            </template>
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G EPS Flag"
+                  name="epsFlag"
+                  :help="t('views.neUser.sub.epsFlagTip')"
+                >
+                  <a-select v-model:value="modalState.from.epsFlag">
+                    <a-select-option value="1">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G EPS User Template Name"
+                  name="epstpl"
+                  v-bind="modalStateFrom.validateInfos.epstpl"
+                >
+                  <a-input
+                    v-model:value="modalState.from.epstpl"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G Static IP"
+                  v-bind="modalStateFrom.validateInfos.staticIp"
+                  name="staticIp"
+                >
+                  <a-input v-model:value="modalState.from.staticIp" allow-clear>
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.staticIpTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+            <a-form-item label="4G Context ID" name="contextId">
+              <a-input v-model:value="modalState.from.contextId" allow-clear>
+                <template #prefix>
+                  <a-tooltip placement="topLeft">
+                    <template #title>
+                      {{ t('views.neUser.sub.contextIdTip') }}
+                    </template>
+                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
+                  </a-tooltip>
+                </template>
+              </a-input>
+            </a-form-item>
+
+            <a-form-item
+              label="4G APN Context List"
+              name="apnContext"
+              :help="t('views.neUser.sub.apnContextTip')"
             >
-            </a-select>
-          </a-tooltip>
-        </a-form-item>
+              <a-input-group compact>
+                <a-input-number
+                  v-for="(_, i) in modalState.from.apnContext"
+                  :key="i"
+                  :title="i"
+                  style="width: 16.5%"
+                  :min="0"
+                  :max="99"
+                  v-model:value="modalState.from.apnContext[i]"
+                ></a-input-number>
+              </a-input-group>
+            </a-form-item>
+
+            <a-form-item
+              label="4G EPS ODB"
+              name="epsOdb"
+              v-bind="modalStateFrom.validateInfos.epsOdb"
+            >
+              <a-tooltip
+                :title="t('views.neUser.sub.epsOdbTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.from.epsOdb"
+                  mode="multiple"
+                  style="width: 100%"
+                  placeholder="Please select"
+                  :options="modalStateFromOption.odbJson"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+
+            <a-form-item label="4G HPLMN ODB" name="hplmnOdb">
+              <a-tooltip
+                :title="t('views.neUser.sub.hplmnOdbTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.from.hplmnOdb"
+                  mode="multiple"
+                  style="width: 100%"
+                  :options="modalStateFromOption.hplmnOdb"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+
+            <a-form-item label="4G Access Restriction Data" name="ard">
+              <a-tooltip
+                :title="t('views.neUser.sub.ardTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.from.ard"
+                  mode="multiple"
+                  style="width: 100%"
+                  :options="modalStateFromOption.ardJson"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+          </a-collapse-panel>
+        </a-collapse>
       </a-form>
     </DraggableModal>
 
@@ -1764,187 +1796,12 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-
-        <a-divider orientation="left">5G</a-divider>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed UE AMBR Template"
-              name="ambr"
-              v-bind="modalStateBatchFrom.validateInfos.ambr"
-            >
-              <a-input
-                v-model:value="modalState.BatchForm.ambr"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed SNSSAIs Template"
-              name="nssai"
-              v-bind="modalStateBatchFrom.validateInfos.nssai"
-            >
-              <a-input
-                v-model:value="modalState.BatchForm.nssai"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Subscribed SMF Selection Data Template"
-              name="smfSel"
-            >
-              <a-input
-                v-model:value="modalState.BatchForm.smfSel"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Forbidden Areas Template"
-              name="arfb"
-              :maxlength="16"
-            >
-              <a-input v-model:value="modalState.BatchForm.arfb" allow-clear>
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.arfbTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G Service Area Restriction Template"
-              name="sar"
-            >
-              <a-input
-                v-model:value="modalState.BatchForm.sar"
-                allow-clear
-                :maxlength="16"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.sarTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item label="5G RFSP Index" name="rfsp">
-              <a-input-number
-                v-model:value="modalState.BatchForm.rfsp"
-                style="width: 100%"
-                :min="0"
-                :max="127"
-                placeholder="0 ~ 127"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.rfspTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input-number>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="5G MICO Mode"
-              name="mico"
-              :help="t('views.neUser.sub.micoTip')"
-            >
-              <a-select value="1">
-                <a-select-option value="1">
-                  {{ t('views.neUser.sub.enable') }}
-                </a-select-option>
-                <a-select-option value="0">
-                  {{ t('views.neUser.sub.disable') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item label="5G UE Usage Type" name="ueType">
-              <a-input-number
-                v-model:value="modalState.BatchForm.ueType"
-                style="width: 100%"
-                :min="0"
-                :max="127"
-                placeholder="0 ~ 127"
-              >
-                <template #prefix>
-                  <a-tooltip placement="topLeft">
-                    <template #title>
-                      {{ t('views.neUser.sub.ueTypeTip') }}
-                    </template>
-                    <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                  </a-tooltip>
-                </template>
-              </a-input-number>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
         <a-row :gutter="16">
           <a-col :lg="24" :md="24" :xs="24">
             <a-form-item
               label="Subscribed SM Data"
               name="smData"
+              :label-col="{ span: 3 }"
               v-bind="modalStateBatchFrom.validateInfos.smData"
             >
               <a-input
@@ -1964,61 +1821,370 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
+        <a-collapse :bordered="false" ghost>
+          <a-collapse-panel key="5G">
+            <template #header>
+              <a-divider orientation="left" style="margin: -2px">5G</a-divider>
+            </template>
 
-        <a-divider orientation="left">4G</a-divider>
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed UE AMBR Template"
+                  name="ambr"
+                  v-bind="modalStateBatchFrom.validateInfos.ambr"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.ambr"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed SNSSAIs Template"
+                  name="nssai"
+                  v-bind="modalStateBatchFrom.validateInfos.nssai"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.nssai"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
 
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="4G EPS Flag"
-              name="epsFlag"
-              :help="t('views.neUser.sub.epsFlagTip')"
-            >
-              <a-select v-model:value="modalState.BatchForm.epsFlag">
-                <a-select-option value="1">
-                  {{ t('views.neUser.sub.enable') }}
-                </a-select-option>
-                <a-select-option value="0">
-                  {{ t('views.neUser.sub.disable') }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="24" :md="24" :xs="24">
-            <a-form-item
-              label="4G EPS User Template Name"
-              name="epstpl"
-              v-bind="modalStateFrom.validateInfos.epstpl"
-            >
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Subscribed SMF Selection Data Template"
+                  name="smfSel"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.smfSel"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Forbidden Areas Template"
+                  name="arfb"
+                  :maxlength="16"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.arfb"
+                    allow-clear
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.arfbTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G Service Area Restriction Template"
+                  name="sar"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.sar"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.sarTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item label="5G RFSP Index" name="rfsp">
+                  <a-input-number
+                    v-model:value="modalState.BatchForm.rfsp"
+                    style="width: 100%"
+                    :min="0"
+                    :max="127"
+                    placeholder="0 ~ 127"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.rfspTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input-number>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="5G MICO Mode"
+                  name="mico"
+                  :help="t('views.neUser.sub.micoTip')"
+                >
+                  <a-select value="1">
+                    <a-select-option value="1">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item label="5G UE Usage Type" name="ueType">
+                  <a-input-number
+                    v-model:value="modalState.BatchForm.ueType"
+                    style="width: 100%"
+                    :min="0"
+                    :max="127"
+                    placeholder="0 ~ 127"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.ueTypeTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input-number>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-collapse-panel>
+          <a-collapse-panel key="4G">
+            <template #header>
+              <a-divider orientation="left" style="margin: -2px">4G</a-divider>
+            </template>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G EPS Flag"
+                  name="epsFlag"
+                  :help="t('views.neUser.sub.epsFlagTip')"
+                >
+                  <a-select v-model:value="modalState.BatchForm.epsFlag">
+                    <a-select-option value="1">
+                      {{ t('views.neUser.sub.enable') }}
+                    </a-select-option>
+                    <a-select-option value="0">
+                      {{ t('views.neUser.sub.disable') }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G EPS User Template Name"
+                  name="epstpl"
+                  v-bind="modalStateFrom.validateInfos.epstpl"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.epstpl"
+                    allow-clear
+                    :maxlength="16"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-row :gutter="16">
+              <a-col :lg="24" :md="24" :xs="24">
+                <a-form-item
+                  label="4G Static IP"
+                  v-bind="modalStateFrom.validateInfos.staticIp"
+                  name="staticIp"
+                >
+                  <a-input
+                    v-model:value="modalState.BatchForm.staticIp"
+                    allow-clear
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.staticIpTip') }}
+                        </template>
+                        <InfoCircleOutlined
+                          style="color: rgba(0, 0, 0, 0.45)"
+                        />
+                      </a-tooltip>
+                    </template>
+                  </a-input>
+                </a-form-item>
+              </a-col>
+            </a-row>
+
+            <a-form-item label="4G Context ID" name="contextId">
               <a-input
-                v-model:value="modalState.BatchForm.epstpl"
+                v-model:value="modalState.BatchForm.contextId"
                 allow-clear
-                :maxlength="16"
               >
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
-                      {{ t('views.neUser.sub.inputTip', { num: '16' }) }}
+                      {{ t('views.neUser.sub.contextIdTip') }}
                     </template>
                     <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
                   </a-tooltip>
                 </template>
               </a-input>
             </a-form-item>
-          </a-col>
-        </a-row>
 
-        <a-row :gutter="16">
-          <a-col :lg="24" :md="24" :xs="24">
+            <a-form-item
+              label="4G APN Context List"
+              name="apnContext"
+              :help="t('views.neUser.sub.apnContextTip')"
+            >
+              <a-input-group compact>
+                <a-input-number
+                  v-for="(_, i) in modalState.BatchForm.apnContext"
+                  :key="i"
+                  :title="i"
+                  style="width: 16.5%"
+                  :min="0"
+                  :max="99"
+                  v-model:value="modalState.BatchForm.apnContext[i]"
+                ></a-input-number>
+              </a-input-group>
+            </a-form-item>
+
+            <a-form-item
+              label="4G EPS ODB"
+              name="epsOdb"
+              v-bind="modalStateFrom.validateInfos.epsOdb"
+            >
+              <a-tooltip
+                :title="t('views.neUser.sub.epsOdbTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.BatchForm.epsOdb"
+                  mode="multiple"
+                  style="width: 100%"
+                  placeholder="Please select"
+                  :options="modalStateFromOption.odbJson"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+
+            <a-form-item label="4G HPLMN ODB" name="hplmnOdb">
+              <a-tooltip
+                :title="t('views.neUser.sub.hplmnOdbTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.BatchForm.hplmnOdb"
+                  mode="multiple"
+                  style="width: 100%"
+                  :options="modalStateFromOption.hplmnOdb"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+
+            <a-form-item label="4G Access Restriction Data" name="ard">
+              <a-tooltip
+                :title="t('views.neUser.sub.ardTip')"
+                placement="topLeft"
+              >
+                <a-select
+                  v-model:value="modalState.BatchForm.ard"
+                  mode="multiple"
+                  style="width: 100%"
+                  :options="modalStateFromOption.ardJson"
+                  @change=""
+                >
+                </a-select>
+              </a-tooltip>
+            </a-form-item>
+
             <a-form-item
               label="4G Static IP"
+              :label-col="{ span: 3 }"
               v-bind="modalStateFrom.validateInfos.staticIp"
               name="staticIp"
             >
-              <a-input
-                v-model:value="modalState.BatchForm.staticIp"
-                allow-clear
-              >
+              <a-input v-model:value="modalState.from.staticIp" allow-clear>
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
@@ -2029,89 +2195,8 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-form-item label="4G Context ID" name="contextId">
-          <a-input v-model:value="modalState.BatchForm.contextId" allow-clear>
-            <template #prefix>
-              <a-tooltip placement="topLeft">
-                <template #title>
-                  {{ t('views.neUser.sub.contextIdTip') }}
-                </template>
-                <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-              </a-tooltip>
-            </template>
-          </a-input>
-        </a-form-item>
-
-        <a-form-item
-          label="4G APN Context List"
-          name="apnContext"
-          :help="t('views.neUser.sub.apnContextTip')"
-        >
-          <a-input-group compact>
-            <a-input-number
-              v-for="(_, i) in modalState.BatchForm.apnContext"
-              :key="i"
-              :title="i"
-              style="width: 16.5%"
-              :min="0"
-              :max="99"
-              v-model:value="modalState.BatchForm.apnContext[i]"
-            ></a-input-number>
-          </a-input-group>
-        </a-form-item>
-
-        <a-form-item
-          label="4G EPS ODB"
-          name="epsOdb"
-          v-bind="modalStateFrom.validateInfos.epsOdb"
-        >
-          <a-tooltip
-            :title="t('views.neUser.sub.epsOdbTip')"
-            placement="topLeft"
-          >
-            <a-select
-              v-model:value="modalState.BatchForm.epsOdb"
-              mode="multiple"
-              style="width: 100%"
-              placeholder="Please select"
-              :options="modalStateFromOption.odbJson"
-              @change=""
-            >
-            </a-select>
-          </a-tooltip>
-        </a-form-item>
-
-        <a-form-item label="4G HPLMN ODB" name="hplmnOdb">
-          <a-tooltip
-            :title="t('views.neUser.sub.hplmnOdbTip')"
-            placement="topLeft"
-          >
-            <a-select
-              v-model:value="modalState.BatchForm.hplmnOdb"
-              mode="multiple"
-              style="width: 100%"
-              :options="modalStateFromOption.hplmnOdb"
-              @change=""
-            >
-            </a-select>
-          </a-tooltip>
-        </a-form-item>
-
-        <a-form-item label="4G Access Restriction Data" name="ard">
-          <a-tooltip :title="t('views.neUser.sub.ardTip')" placement="topLeft">
-            <a-select
-              v-model:value="modalState.BatchForm.ard"
-              mode="multiple"
-              style="width: 100%"
-              :options="modalStateFromOption.ardJson"
-              @change=""
-            >
-            </a-select>
-          </a-tooltip>
-        </a-form-item>
+          </a-collapse-panel>
+        </a-collapse>
       </a-form>
     </DraggableModal>