From 2a999a81fae36c03bc53548568919036b319d26c Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Mon, 6 Nov 2023 14:58:46 +0800
Subject: [PATCH] =?UTF-8?q?---=E9=92=88=E5=AF=B9UDM=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=9D=99=E6=80=81ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/neUser/sub/index.vue | 43 +++++++++++-----------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 2f48c710..27cc4554 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -252,7 +252,7 @@ let modalState: ModalStateType = reactive({
     epstpl: 'def_eps',
     contextId: '1',
     apnContext: '',
-    staticIp: '',
+    staticIp: '-',
   },
   BatchForm: {
     num: '',
@@ -275,7 +275,7 @@ let modalState: ModalStateType = reactive({
     epstpl: 'def_eps',
     contextId: '1',
     apnContext: '',
-    staticIp: '',
+    staticIp: '-',
   },
   BatchDelForm: {
     num: '',
@@ -415,6 +415,7 @@ const modalStateFrom = Form.useForm(
   modalState.from,
   reactive({
     imsi: [{ required: true, message: 'IMSI不能为空' }],
+    staticIp: [{ required: true, message: '静态IP不能为空' }],
     smData: [{ required: true, message: 'Subscribed SM Data不能为空' }],
   })
 );
@@ -424,7 +425,7 @@ const modalStateFrom = Form.useForm(
  * 进行表达规则校验
  */
 function fnModalOk() {
-  let validateNames = ['imsi'];
+  let validateNames = ['imsi', 'staticIp'];
 
   if (modalState.from.id === '') {
     validateNames.push('smData');
@@ -491,6 +492,7 @@ const modalStateBatchFrom = Form.useForm(
     num: [{ required: true, message: '放号数不能为空' }],
     imsi: [{ required: true, message: 'IMSI不能为空' }],
     msisdn: [{ required: true, message: 'MSISDN不能为空' }],
+    staticIp: [{ required: true, message: '静态IP不能为空' }],
     smData: [{ required: true, message: 'Subscribed SM Data不能为空' }],
   })
 );
@@ -1104,19 +1106,6 @@ onMounted(() => {
               </a-input>
             </a-form-item>
           </a-col>
-          <!-- <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              label="cn"
-              name="cn"
-              v-bind="modalStateFrom.validateInfos.cn"
-            >
-              <a-input
-                v-model:value="modalState.from.cn"
-                allow-clear
-                placeholder="请输入cn"
-              ></a-input>
-            </a-form-item>
-          </a-col> -->
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               label="MSISDN"
@@ -1356,7 +1345,7 @@ onMounted(() => {
               <template #suffixIcon>
                 <a-tooltip placement="topLeft">
                   <template #title>
-                    指定手机用户上网时使用的静态IP地址,为空时表示使用动态IP地址
+                    指定手机用户上网时使用的静态IP地址,为"-"时表示使用动态IP地址
                   </template>
                   <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
                 </a-tooltip>
@@ -1403,8 +1392,8 @@ onMounted(() => {
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               label="4G Static IP"
-              name="staticIp"
               v-bind="modalStateFrom.validateInfos.staticIp"
+              name="staticIp"
             >
               <a-input
                 v-model:value="modalState.from.staticIp"
@@ -1414,7 +1403,7 @@ onMounted(() => {
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
-                      指定手机用户上网时使用的静态IP地址,为空时表示使用动态IP地址
+                      指定手机用户上网时使用的静态IP地址,为"-"时表示使用动态IP地址
                     </template>
                     <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
                   </a-tooltip>
@@ -1700,14 +1689,6 @@ onMounted(() => {
               :options="modalStateFromOption.ardJson"
               @change=""
             >
-              <template #suffixIcon>
-                <a-tooltip placement="topLeft">
-                  <template #title>
-                    指定手机用户上网时使用的静态IP地址,为空时表示使用动态IP地址
-                  </template>
-                  <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
-                </a-tooltip>
-              </template>
             </a-select>
           </a-tooltip>
         </a-form-item>
@@ -1740,7 +1721,11 @@ onMounted(() => {
         </a-row>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item label="4G Static IP" name="staticIp">
+            <a-form-item
+              label="4G Static IP"
+              name="staticIp"
+              v-bind="modalStateBatchFrom.validateInfos.staticIp"
+            >
               <a-input
                 v-model:value="modalState.BatchForm.staticIp"
                 allow-clear
@@ -1749,7 +1734,7 @@ onMounted(() => {
                 <template #prefix>
                   <a-tooltip placement="topLeft">
                     <template #title>
-                      指定手机用户上网时使用的静态IP地址,为空时表示使用动态IP地址
+                      指定手机用户上网时使用的静态IP地址,为"-"时表示使用动态IP地址
                     </template>
                     <InfoCircleOutlined style="color: rgba(0, 0, 0, 0.45)" />
                   </a-tooltip>