From 4806477a9ad84146f15a87067e13681b8ad8e478 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 9 Aug 2022 11:04:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=A0=A1=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 82 ++++++++++---------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 9b381a0fe..530ff93fb 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -249,14 +249,14 @@
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="24" >
+            <a-col :span="24" v-if='contentList != []'>
               <a-tabs>
-                <a-tab-pane v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
+                <a-tab-pane  v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                        <span class="Required">*</span>
+                        <span class="Required" v-if='required'>*</span>
                         <span class="title-text-text"
                               :title="$t('ParameterNo')">{{$t('ParameterNo')}}</span>
                         </div>
@@ -271,7 +271,7 @@
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                          <span class="Required">*</span>
+                          <span class="Required" v-if='required'>*</span>
                           <span class="title-text-text" :title="$t('NParameterName')">{{$t('NParameterName')}}</span>
                         </div>
                         <a-form-model-item class="itemModel">
@@ -448,7 +448,6 @@ export default {
     } else if (long && long == 'en-us') {
       this.cut = 'en'
     }
-    console.log(this.cut)
   },
   methods: {
     getcontentListedEdit() {
@@ -595,6 +594,7 @@ export default {
                 item1.description= '' // 描述
             }
           })
+          console.log(this.contentList)
         };
 
       })
@@ -644,6 +644,11 @@ export default {
       // } else {
       //   value.technologyTerritory = value.technologyTerritory.split(',')
       // }
+      if(this.formInline.controlType == 11){
+        this.required = false
+      }else{
+        this.required = true
+      }
       this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0
@@ -674,41 +679,44 @@ export default {
         return
       }
       let falg = 1
-      this.contentList.forEach((item,index) => {
-        let reg = /^[0-9a-zA-Z-/. ]{1,}$/
-        // 编号的限制
-        if(item.paramsNumber == '' || item.paramsNumber === undefined) {
-          this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))
-          falg = 0
-          return
-        } else if(item.paramsNumber.length > 15){
-          this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters'))
-          falg = 0
-          return
-        } else if(item.paramsNumber.match(reg) === null) {
-          this.$message.warning(this.$t('standard')+this.$t('onlyThree'))
-          falg = 0
-          return
-        }
-        // 参数名称的限制
-        if(item.paramsName == '' || item.paramsName === undefined) {
-          this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
-          falg = 0
-          return
-        } else if(item.paramsName.length > 100){
-          this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters'))
-          falg = 0
-          return
-        }
-        if(item.description !== undefined && item.description !== null){
-          // 参数说明的限制
-          if(item.description.length > 2000){
-            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters'))
+      if(this.formInline.controlType != 11){
+        this.contentList.forEach((item,index) => {
+          let reg = /^[0-9a-zA-Z-/. ]{1,}$/
+          // 编号的限制
+          if(item.paramsNumber == '' || item.paramsNumber === undefined ) {
+            this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))
+            falg = 0
+            return
+          } else if(item.paramsNumber.length > 15){
+            this.$message.warning(this.$t('standard')+this.$t('cantExeed')+'15'+this.$t('Characters'))
+            falg = 0
+            return
+          } else if(item.paramsNumber.match(reg) === null) {
+            this.$message.warning(this.$t('standard')+this.$t('onlyThree'))
             falg = 0
             return
           }
-        }
-      })
+          // 参数名称的限制
+          if(item.paramsNumber == '' || item.paramsNumber === undefined) {
+            this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
+            falg = 0
+            return
+          } else if(item.paramsName.length > 100){
+            this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters'))
+            falg = 0
+            return
+          }
+          if(item.description !== undefined && item.description !== null){
+            // 参数说明的限制
+            if(item.description.length > 2000){
+              this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters'))
+              falg = 0
+              return
+            }
+          }
+        })
+      }
+
       if(falg === 1) {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {