From 678ff2d09ddfa84a36d7cf0ee156aed12aa630a1 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 19 Sep 2024 11:48:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20UDM=E7=AD=BE=E7=BA=A6=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?CAG=E5=8F=82=E6=95=B0=E5=92=8C=E5=A4=87=E6=B3=A8=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/sub/index.vue | 122 ++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 48 deletions(-)

diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 9eb63999..211ee727 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -275,6 +275,8 @@ let modalState: ModalStateType = reactive({
     staticIp: '-',
     rfsp: 1,
     ueType: 1,
+    cag: 'def_cag',
+    remark: '',
   },
   BatchDelForm: {
     num: 1,
@@ -591,13 +593,9 @@ function fnModalOk() {
     console.error(error.message);
     return false;
   }
-  let validateNames = ['imsi', 'msisdn', 'staticIp'];
 
-  if (from.id === '') {
-    validateNames.push('smData');
-  }
   modalStateFrom
-    .validate(validateNames)
+    .validate()
     .then(e => {
       modalState.confirmLoading = true;
       let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -1174,17 +1172,6 @@ onMounted(() => {
             {{ t('common.addText') }}
           </a-button>
 
-          <a-button
-            type="default"
-            danger
-            :disabled="tableState.selectedRowKeys.length <= 0"
-            :loading="modalState.loadDataLoading"
-            @click.prevent="fnRecordDelete('0')"
-          >
-            <template #icon><DeleteOutlined /></template>
-            {{ t('views.neUser.sub.checkDel') }}
-          </a-button>
-
           <a-button
             type="primary"
             danger
@@ -1242,6 +1229,17 @@ onMounted(() => {
             </a-button>
           </a-popconfirm>
 
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.loadDataLoading"
+            @click.prevent="fnRecordDelete('0')"
+          >
+            <template #icon><DeleteOutlined /></template>
+            {{ t('views.neUser.sub.checkDel') }}
+          </a-button>
+
           <a-popconfirm
             :title="t('views.neUser.sub.checkExportConfirm')"
             placement="topRight"
@@ -1468,6 +1466,20 @@ onMounted(() => {
           </a-col>
         </a-row>
 
+        <a-form-item
+          :label="t('common.remark')"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          <a-textarea
+            v-model:value="modalState.from.remark"
+            :auto-size="{ minRows: 1, maxRows: 6 }"
+            :maxlength="500"
+            :show-count="true"
+            :placeholder="t('common.inputPlease')"
+          />
+        </a-form-item>
+
         <!-- SM Data ---- S -->
         <a-divider orientation="left">
           Subscribed SM Data
@@ -1645,9 +1657,6 @@ onMounted(() => {
                   </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"
@@ -1691,9 +1700,30 @@ onMounted(() => {
                   </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 CAG Template"
+                  name="cag"
+                  v-bind="modalStateFrom.validateInfos.cag"
+                >
+                  <a-input
+                    v-model:value="modalState.from.cag"
+                    allow-clear
+                    :maxlength="50"
+                  >
+                    <template #prefix>
+                      <a-tooltip placement="topLeft">
+                        <template #title>
+                          {{ t('views.neUser.sub.inputTip', { num: '50' }) }}
+                        </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 Service Area Restriction Template"
@@ -1717,31 +1747,6 @@ onMounted(() => {
                   </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"
@@ -1758,7 +1763,6 @@ onMounted(() => {
                   </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
@@ -1781,6 +1785,28 @@ onMounted(() => {
                   </a-input-number>
                 </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-collapse-panel>