From 3bb083fd36e450b82ec5c1e8aa27f08b9071e21f Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Fri, 13 May 2022 10:34:52 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParameterTemplate/components/addModel.vue |  6 +++
 .../parameter/ParameterTemplate/index.vue     | 46 +++++++++++--------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
index 606c7547f..6b00a5848 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue
@@ -109,6 +109,12 @@ export default {
         ],
         description:[
           { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+        ],
+        state: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        ],
+        region: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
         ]
       },
       disabled: false,
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index ecf6e07ce..c0427a782 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -92,14 +92,18 @@
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <a-row :gutter="24">
           <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('templateName')">{{$t('templateName')}}</span>
+              </div>
               <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                  <span class="title-text-text"
-                      :title="$t('templateName')">{{$t('templateName')}}
-                  </span>
                 <a-input class="box-input add-input"
-                         v-model="paramsTemplateName"
+                         v-model="formInline.paramsTemplateName"
                          :placeholder="$t('PleaseEnter')+$t('templateName')"/>
               </a-form-model-item>
+            </div>
           </a-col>
         </a-row>
       </a-form-model>
@@ -131,7 +135,11 @@ export default {
       selectedRowKeys: [],
       selectedRowKeysArray: '',
       formInline: {},
-      rules: {},
+      rules: {
+        paramsTemplateName:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('templateName'), trigger: 'change' },
+        ],
+      },
       visible: false,
       dataSource: [],
       confirmLoading: false,
@@ -203,20 +211,19 @@ export default {
       this.areaVisible=false
     },
     handleSubmit() {
-      if(this.paramsTemplateName.trim() === '') {
-        this.$message.warning(this.$t('templateName') + this.$t('cannotEmpty'))
-      } else {
-        getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.paramsTemplateName}`, {}).then((res) => {
-          if (res.success) {
-            this.areaVisible=false
-            this.$message.success(res.message)
-            this.getList()
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-      }
-      console.log(this.paramsTemplateName,'this.paramsTemplateName')
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+            getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+              if (res.success) {
+                this.areaVisible = false
+                this.$message.success(res.message)
+                this.getList()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+        }
+      })
     },
     handleToggleSearch() {
       this.toggleSearchStatus = !this.toggleSearchStatus
@@ -237,6 +244,7 @@ export default {
         this.$message.warning(this.$t('pleaseSelectData'))
       } else {
         this.areaVisible=true
+        this.formInline = {}
       }
     },
     hideModal(){